[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-36-gdc311dd
Andreas B. Mundt
andi at debian.org
Sun Sep 2 10:27:21 UTC 2012
The following commit has been merged in the master branch:
commit dc311dd44e900a4318fd50f5f606577cc96aeea3
Author: Andreas B. Mundt <andi at debian.org>
Date: Sun Sep 2 11:50:35 2012 +0200
Rework disk configuration.
Add backup partition if no backup disk is used. Increase the size of
the root partition. (Not necessarily needed, but convenient).
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index cc1f0e9..21d789e 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -19,7 +19,8 @@
##
## LVM*_A | RAIDLVM*_A RAID --> RAID1 (mirroring)
##
-## *BAK_A --> extra backup disk
+## *BAK_A --> Extra backup disk, recommended. Setups without backup
+## disk are intended for testing only.
##
## Example classes that might be added:
##
diff --git a/fai/config/disk_config/LVM6BAK_A b/fai/config/disk_config/LVM6BAK_A
index b52761b..d585cf5 100644
--- a/fai/config/disk_config/LVM6BAK_A
+++ b/fai/config/disk_config/LVM6BAK_A
@@ -5,7 +5,7 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
vg_system-home /lan/mainserver/home0 2G-70% ext4 defaults
diff --git a/fai/config/disk_config/LVM6_A b/fai/config/disk_config/LVM6_A
index f9a3e40..a27f437 100644
--- a/fai/config/disk_config/LVM6_A
+++ b/fai/config/disk_config/LVM6_A
@@ -5,7 +5,8 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext4 defaults
+vg_system-home /lan/mainserver/home0 1G-40% ext4 defaults
+vg_system-backup /backup 1G-40% ext4 defaults
diff --git a/fai/config/disk_config/LVM7BAK_A b/fai/config/disk_config/LVM7BAK_A
index 2d968c4..5e6d442 100644
--- a/fai/config/disk_config/LVM7BAK_A
+++ b/fai/config/disk_config/LVM7BAK_A
@@ -5,7 +5,7 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
vg_system-opt /opt 4G-10G ext4 defaults
diff --git a/fai/config/disk_config/LVM7_A b/fai/config/disk_config/LVM7_A
index e6720d1..2bad592 100644
--- a/fai/config/disk_config/LVM7_A
+++ b/fai/config/disk_config/LVM7_A
@@ -5,8 +5,9 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
vg_system-opt /opt 4G-10G ext4 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext4 defaults
+vg_system-home /lan/mainserver/home0 1G-40% ext4 defaults
+vg_system-backup /backup 1G-40% ext4 defaults
diff --git a/fai/config/disk_config/RAIDLVM6BAK_A b/fai/config/disk_config/RAIDLVM6BAK_A
index a64da25..6ebd99f 100644
--- a/fai/config/disk_config/RAIDLVM6BAK_A
+++ b/fai/config/disk_config/RAIDLVM6BAK_A
@@ -16,7 +16,7 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
vg_system-home /lan/mainserver/home0 2G-70% ext4 defaults
diff --git a/fai/config/disk_config/RAIDLVM6_A b/fai/config/disk_config/RAIDLVM6_A
index 4efc6f3..d1e96a0 100644
--- a/fai/config/disk_config/RAIDLVM6_A
+++ b/fai/config/disk_config/RAIDLVM6_A
@@ -16,7 +16,8 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext4 defaults
+vg_system-home /lan/mainserver/home0 1G-40% ext4 defaults
+vg_system-backup /backup 1G-40% ext4 defaults
diff --git a/fai/config/disk_config/RAIDLVM7BAK_A b/fai/config/disk_config/RAIDLVM7BAK_A
index 80d0345..d50826b 100644
--- a/fai/config/disk_config/RAIDLVM7BAK_A
+++ b/fai/config/disk_config/RAIDLVM7BAK_A
@@ -16,7 +16,7 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
vg_system-opt /opt 4G-10G ext4 defaults
diff --git a/fai/config/disk_config/RAIDLVM7_A b/fai/config/disk_config/RAIDLVM7_A
index 79f8b94..c90801c 100644
--- a/fai/config/disk_config/RAIDLVM7_A
+++ b/fai/config/disk_config/RAIDLVM7_A
@@ -16,8 +16,9 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 1G-2G ext4 errors=remount-ro
+vg_system-root / 1G-5G ext4 errors=remount-ro
vg_system-usr /usr 2G-20G ext4 defaults
vg_system-var /var 1G-20G ext4 defaults
vg_system-opt /opt 4G-10G ext4 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext4 defaults
+vg_system-home /lan/mainserver/home0 1G-40% ext4 defaults
+vg_system-backup /backup 1G-40% ext4 defaults
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list