[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-38-gc256321

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit c25632124e0d7e2fd812f26ab31106713bb2e5b7
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Sep 2 22:30:27 2012 +0200

    Rename disk configuration files consistently.
    
    The number in the class name equals the number of partitions on the
    system disk.

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 21d789e..df3658e 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -15,7 +15,7 @@
 ##     The network configuration (cf. 'class/SERVER_A.var') determines
 ##     if the mainserver acts as gateway to the external network.
 ##
-##     *LVM6_A | *LVM7_A DISKLESS_SERVER  -->  diskless client server
+##     *LVM7_A | *LVM8_A DISKLESS_SERVER  -->  diskless client server
 ##
 ##     LVM*_A | RAIDLVM*_A RAID -->  RAID1 (mirroring)
 ##
@@ -29,13 +29,13 @@
 ##     GERMAN     localization class
 ##
 
-FLAVOR="LVM6_A"
+FLAVOR="LVM7_A"
 #FLAVOR="LVM6BAK_A"  ## backup disk
-#FLAVOR="RAIDLVM6_A RAID"  ## RAID1
+#FLAVOR="RAIDLVM7_A RAID"  ## RAID1
 #FLAVOR="RAIDLVM6BAK_A RAID"  ## RAID1, backup disk
-#FLAVOR="LVM7_A DISKLESS_SERVER"  ## diskless
+#FLAVOR="LVM8_A DISKLESS_SERVER"  ## diskless
 #FLAVOR="LVM7BAK_A DISKLESS_SERVER"  ## diskless, backup disk
-#FLAVOR="RAIDLVM7_A RAID DISKLESS_SERVER"  ## diskless, RAID1
+#FLAVOR="RAIDLVM8_A RAID DISKLESS_SERVER"  ## diskless, RAID1
 #FLAVOR="RAIDLVM7BAK_A RAID DISKLESS_SERVER"  ## diskless, RAID1, backup disk
 
 MAINSERVER_A="$FLAVOR LOG_SERVER PROXY NTP_SERVER DNS_SERVER NFS_SERVER \
diff --git a/fai/config/disk_config/LVM6_A b/fai/config/disk_config/LVM6_A
deleted file mode 100644
index a27f437..0000000
--- a/fai/config/disk_config/LVM6_A
+++ /dev/null
@@ -1,12 +0,0 @@
-disk_config  disk1  fstabkey:uuid
-primary  /boot       64-256    ext4    rw
-primary  swap        64-2096   swap    sw
-logical  -           0-        -       -
-
-disk_config lvm
-vg  vg_system  disk1.5
-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  1G-40%  ext4  defaults
-vg_system-backup /backup 1G-40%  ext4  defaults
diff --git a/fai/config/disk_config/LVM7_A b/fai/config/disk_config/LVM7_A
index 2bad592..a27f437 100644
--- a/fai/config/disk_config/LVM7_A
+++ b/fai/config/disk_config/LVM7_A
@@ -8,6 +8,5 @@ vg  vg_system  disk1.5
 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  1G-40%  ext4  defaults
 vg_system-backup /backup 1G-40%  ext4  defaults
diff --git a/fai/config/disk_config/LVM7_A b/fai/config/disk_config/LVM8_A
similarity index 100%
copy from fai/config/disk_config/LVM7_A
copy to fai/config/disk_config/LVM8_A
diff --git a/fai/config/disk_config/RAIDLVM6_A b/fai/config/disk_config/RAIDLVM6_A
deleted file mode 100644
index d1e96a0..0000000
--- a/fai/config/disk_config/RAIDLVM6_A
+++ /dev/null
@@ -1,23 +0,0 @@
-## RAID1 on two identical disks.
-
-disk_config  disk1
-primary  -  64-256    -  -
-primary  -  64-2096   -  -
-logical  -   0-       -  -
-
-disk_config  disk2  sameas:disk1
-
-
-disk_config  raid  fstabkey:uuid
-raid1  /boot  disk1.1,disk2.1  ext4  rw
-raid1  swap   disk1.2,disk2.2  swap  sw
-raid1  -      disk1.5,disk2.5  -     -
-
-
-disk_config  lvm  fstabkey:uuid
-vg  vg_system  md2
-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  1G-40%  ext4  defaults
-vg_system-backup /backup 1G-40%  ext4  defaults
diff --git a/fai/config/disk_config/RAIDLVM7_A b/fai/config/disk_config/RAIDLVM7_A
index c90801c..d1e96a0 100644
--- a/fai/config/disk_config/RAIDLVM7_A
+++ b/fai/config/disk_config/RAIDLVM7_A
@@ -19,6 +19,5 @@ vg  vg_system  md2
 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  1G-40%  ext4  defaults
 vg_system-backup /backup 1G-40%  ext4  defaults
diff --git a/fai/config/disk_config/RAIDLVM7_A b/fai/config/disk_config/RAIDLVM8_A
similarity index 100%
copy from fai/config/disk_config/RAIDLVM7_A
copy to fai/config/disk_config/RAIDLVM8_A

-- 
Debian-LAN development and packaging