[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-9-g47f0d7f
Andreas B. Mundt
andi.mundt at web.de
Wed Jul 11 09:04:45 UTC 2012
The following commit has been merged in the master branch:
commit 47f0d7f4695b152321990ae7764512fdb6cb2a4e
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Wed Jul 11 11:04:16 2012 +0200
Partitioning: Switch from ext3 to ext4, remove depreciated variable.
diff --git a/fai/config/class/CLIENT_A.var b/fai/config/class/CLIENT_A.var
index 38681f9..3cc9b34 100644
--- a/fai/config/class/CLIENT_A.var
+++ b/fai/config/class/CLIENT_A.var
@@ -26,6 +26,3 @@ MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
# erros in tasks greater than this value will cause the installation to stop
STOP_ON_ERROR=700
-
-# use the new partitioning tool
-USE_SETUP_STORAGE=1
diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index 3bb9100..173cbe8 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -66,6 +66,3 @@ MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
# erros in tasks greater than this value will cause the installation to stop
STOP_ON_ERROR=700
-
-# use the new partitioning tool
-USE_SETUP_STORAGE=1
diff --git a/fai/config/disk_config/LVM5_A b/fai/config/disk_config/LVM5_A
index 3f3ac78..5d379d9 100644
--- a/fai/config/disk_config/LVM5_A
+++ b/fai/config/disk_config/LVM5_A
@@ -1,10 +1,10 @@
disk_config disk1 fstabkey:uuid
-primary /boot 64-256 ext3 rw
+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 / 500M-10G ext3 errors=remount-ro
-vg_system-usr /usr 3G-20G ext3 defaults
-vg_system-var /var 1G-70% ext3 defaults
+vg_system-root / 500M-10G ext4 errors=remount-ro
+vg_system-usr /usr 3G-20G ext4 defaults
+vg_system-var /var 1G-70% ext4 defaults
diff --git a/fai/config/disk_config/LVM6_A b/fai/config/disk_config/LVM6_A
index 7654bb8..f9a3e40 100644
--- a/fai/config/disk_config/LVM6_A
+++ b/fai/config/disk_config/LVM6_A
@@ -1,11 +1,11 @@
disk_config disk1 fstabkey:uuid
-primary /boot 64-256 ext3 rw
+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-2G ext3 errors=remount-ro
-vg_system-usr /usr 2G-20G ext3 defaults
-vg_system-var /var 1G-20G ext3 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext3 defaults
+vg_system-root / 1G-2G 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/LVM7_A b/fai/config/disk_config/LVM7_A
index e8298f2..e6720d1 100644
--- a/fai/config/disk_config/LVM7_A
+++ b/fai/config/disk_config/LVM7_A
@@ -1,12 +1,12 @@
disk_config disk1 fstabkey:uuid
-primary /boot 64-256 ext3 rw
+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-2G ext3 errors=remount-ro
-vg_system-usr /usr 2G-20G ext3 defaults
-vg_system-var /var 1G-20G ext3 defaults
-vg_system-opt /opt 4G-10G ext3 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext3 defaults
+vg_system-root / 1G-2G 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
diff --git a/fai/config/disk_config/RAIDLVM6_A b/fai/config/disk_config/RAIDLVM6_A
index 694d970..035c794 100644
--- a/fai/config/disk_config/RAIDLVM6_A
+++ b/fai/config/disk_config/RAIDLVM6_A
@@ -9,14 +9,14 @@ disk_config disk2 sameas:disk1
disk_config raid
-raid1 /boot disk1.1,disk2.1 ext3 rw
+raid1 /boot disk1.1,disk2.1 ext4 rw
raid1 swap disk1.2,disk2.2 swap sw
raid1 - disk1.5,disk2.5 - -
disk_config lvm
vg vg_system md2
-vg_system-root / 1G-2G ext3 errors=remount-ro
-vg_system-usr /usr 2G-20G ext3 defaults
-vg_system-var /var 1G-20G ext3 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext3 defaults
+vg_system-root / 1G-2G 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/RAIDLVM7_A b/fai/config/disk_config/RAIDLVM7_A
index 2e008d1..20861cf 100644
--- a/fai/config/disk_config/RAIDLVM7_A
+++ b/fai/config/disk_config/RAIDLVM7_A
@@ -9,15 +9,15 @@ disk_config disk2 sameas:disk1
disk_config raid
-raid1 /boot disk1.1,disk2.1 ext3 rw
+raid1 /boot disk1.1,disk2.1 ext4 rw
raid1 swap disk1.2,disk2.2 swap sw
raid1 - disk1.5,disk2.5 - -
disk_config lvm
vg vg_system md2
-vg_system-root / 1G-2G ext3 errors=remount-ro
-vg_system-usr /usr 2G-20G ext3 defaults
-vg_system-var /var 1G-20G ext3 defaults
-vg_system-opt /opt 4G-10G ext3 defaults
-vg_system-home /lan/mainserver/home0 2G-70% ext3 defaults
+vg_system-root / 1G-2G 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
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list