[debian-lan-devel] [debian-lan] 01/06: Remove separate /usr partition.
Andreas B. Mundt
andi at moszumanska.debian.org
Fri Aug 5 10:45:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
andi pushed a commit to branch master
in repository debian-lan.
commit c036293ad09629b35329a200f7dd56a06af48a53
Author: Andreas B. Mundt <andi at debian.org>
Date: Thu Aug 4 18:11:32 2016 +0200
Remove separate /usr partition.
---
fai/config/disk_config/FAIBASE | 3 +--
fai/config/disk_config/FAISERVER | 3 +--
fai/config/disk_config/GATEWAY_A | 3 +--
fai/config/disk_config/LVM5_A | 3 +--
fai/config/disk_config/LVM6BAK_A | 3 +--
fai/config/disk_config/LVM7BAK_A | 3 +--
fai/config/disk_config/LVM7_A | 3 +--
fai/config/disk_config/LVM8_A | 3 +--
fai/config/disk_config/RAIDLVM6BAK_A | 3 +--
fai/config/disk_config/RAIDLVM7BAK_A | 3 +--
fai/config/disk_config/RAIDLVM7_A | 3 +--
fai/config/disk_config/RAIDLVM8_A | 3 +--
fai/config/disk_config/ROAMING | 3 +--
13 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/fai/config/disk_config/FAIBASE b/fai/config/disk_config/FAIBASE
index 7815fe4..e9d326f 100644
--- a/fai/config/disk_config/FAIBASE
+++ b/fai/config/disk_config/FAIBASE
@@ -4,9 +4,8 @@
disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
-primary / 250 ext4 rw,noatime,errors=remount-ro
+primary / 2G-8G ext4 rw,noatime,errors=remount-ro
logical swap 200-1000 swap sw
logical /var 600-1300 ext4 rw,noatime createopts="-L var -m 5" tuneopts="-c 0 -i 0"
logical /tmp 100-1G ext4 rw,noatime,nosuid,nodev createopts="-L tmp -m 0" tuneopts="-c 0 -i 0"
-logical /usr 1G-8G ext4 rw,noatime,nodev createopts="-L usr"
logical /home 100-50% ext4 rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0"
diff --git a/fai/config/disk_config/FAISERVER b/fai/config/disk_config/FAISERVER
index ff5ae40..67a4152 100644
--- a/fai/config/disk_config/FAISERVER
+++ b/fai/config/disk_config/FAISERVER
@@ -4,10 +4,9 @@
disk_config disk1 disklabel:msdos fstabkey:uuid
-primary / 300 ext4 rw,noatime,errors=remount-ro
+primary / 2G-7G ext4 rw,noatime,errors=remount-ro
logical swap 200-1000 swap sw
logical /var 600-5G ext4 rw,noatime,nosuid,nodev createopts="-m15" tuneopts="-c 0 -i 0"
logical /tmp 100-1000 ext4 rw,noatime,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0"
-logical /usr 1G-6G ext4 rw,noatime
logical /home 100-40% ext4 rw,noatime,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"
logical /srv 1G-50% ext4 rw,noatime createopts="-m 1" tuneopts="-c 0 -i 0"
diff --git a/fai/config/disk_config/GATEWAY_A b/fai/config/disk_config/GATEWAY_A
index 67ae992..4ada1e8 100644
--- a/fai/config/disk_config/GATEWAY_A
+++ b/fai/config/disk_config/GATEWAY_A
@@ -1,7 +1,6 @@
disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
-primary / 500-1G ext4 errors=remount-ro
+primary / 2G-5G ext4 errors=remount-ro
logical swap 200-1000 swap sw
logical /var 1G- ext4 defaults
logical /tmp 100-1G ext4 defaults
-logical /usr 1G-4G ext4 defaults
diff --git a/fai/config/disk_config/LVM5_A b/fai/config/disk_config/LVM5_A
index 187bc62..2a53b81 100644
--- a/fai/config/disk_config/LVM5_A
+++ b/fai/config/disk_config/LVM5_A
@@ -5,6 +5,5 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 500M-10G ext4 errors=remount-ro
-vg_system-usr /usr 3G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 1G-70% ext4 defaults
diff --git a/fai/config/disk_config/LVM6BAK_A b/fai/config/disk_config/LVM6BAK_A
index 502552e..d34d182 100644
--- a/fai/config/disk_config/LVM6BAK_A
+++ b/fai/config/disk_config/LVM6BAK_A
@@ -5,8 +5,7 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-home /lan/mainserver/home0 2G-70% ext4 usrquota
diff --git a/fai/config/disk_config/LVM7BAK_A b/fai/config/disk_config/LVM7BAK_A
index 2df15f9..610ef96 100644
--- a/fai/config/disk_config/LVM7BAK_A
+++ b/fai/config/disk_config/LVM7BAK_A
@@ -5,8 +5,7 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-opt /opt 5G-10G ext4 defaults
vg_system-home /lan/mainserver/home0 2G-70% ext4 usrquota
diff --git a/fai/config/disk_config/LVM7_A b/fai/config/disk_config/LVM7_A
index 01c9e83..6e77607 100644
--- a/fai/config/disk_config/LVM7_A
+++ b/fai/config/disk_config/LVM7_A
@@ -5,8 +5,7 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-home /lan/mainserver/home0 1G-40% ext4 usrquota
vg_system-backup /backup 1G-40% ext4 defaults
diff --git a/fai/config/disk_config/LVM8_A b/fai/config/disk_config/LVM8_A
index fbd5473..da2c563 100644
--- a/fai/config/disk_config/LVM8_A
+++ b/fai/config/disk_config/LVM8_A
@@ -5,8 +5,7 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-opt /opt 5G-10G ext4 defaults
vg_system-home /lan/mainserver/home0 1G-40% ext4 usrquota
diff --git a/fai/config/disk_config/RAIDLVM6BAK_A b/fai/config/disk_config/RAIDLVM6BAK_A
index 6464946..aee992c 100644
--- a/fai/config/disk_config/RAIDLVM6BAK_A
+++ b/fai/config/disk_config/RAIDLVM6BAK_A
@@ -16,8 +16,7 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-home /lan/mainserver/home0 2G-70% ext4 usrquota
diff --git a/fai/config/disk_config/RAIDLVM7BAK_A b/fai/config/disk_config/RAIDLVM7BAK_A
index 7a34152..e45e761 100644
--- a/fai/config/disk_config/RAIDLVM7BAK_A
+++ b/fai/config/disk_config/RAIDLVM7BAK_A
@@ -16,8 +16,7 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-opt /opt 5G-10G ext4 defaults
vg_system-home /lan/mainserver/home0 2G-70% ext4 usrquota
diff --git a/fai/config/disk_config/RAIDLVM7_A b/fai/config/disk_config/RAIDLVM7_A
index 51e2e35..1f66b5c 100644
--- a/fai/config/disk_config/RAIDLVM7_A
+++ b/fai/config/disk_config/RAIDLVM7_A
@@ -16,8 +16,7 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-home /lan/mainserver/home0 1G-40% ext4 usrquota
vg_system-backup /backup 1G-40% ext4 defaults
diff --git a/fai/config/disk_config/RAIDLVM8_A b/fai/config/disk_config/RAIDLVM8_A
index 57ded0b..6e62c19 100644
--- a/fai/config/disk_config/RAIDLVM8_A
+++ b/fai/config/disk_config/RAIDLVM8_A
@@ -16,8 +16,7 @@ raid1 - disk1.5,disk2.5 - -
disk_config lvm fstabkey:uuid
vg vg_system md2
-vg_system-root / 2G-6G ext4 errors=remount-ro
-vg_system-usr /usr 2G-20G ext4 defaults
+vg_system-root / 4G-25G ext4 errors=remount-ro
vg_system-var /var 2G-40G ext4 defaults
vg_system-opt /opt 5G-10G ext4 defaults
vg_system-home /lan/mainserver/home0 1G-40% ext4 usrquota
diff --git a/fai/config/disk_config/ROAMING b/fai/config/disk_config/ROAMING
index 8936627..bffdfd5 100644
--- a/fai/config/disk_config/ROAMING
+++ b/fai/config/disk_config/ROAMING
@@ -5,7 +5,6 @@ logical - 0- - -
disk_config lvm
vg vg_system disk1.5
-vg_system-root / 500M-10G ext4 errors=remount-ro
-vg_system-usr /usr 3G-20G ext4 defaults
+vg_system-root / 4G-30G ext4 errors=remount-ro
vg_system-var /var 1G-30% ext4 defaults
vg_system-home /home 1G-50% ext4 defaults
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git
More information about the debian-lan-devel
mailing list