aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2024-01-10 22:28:30 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2024-01-10 22:45:18 +0100
commite47fbedd127bbdbffc4c74d31c29885e24a874fe (patch)
tree43af48d710eb99c8737a43928dbf46f28bc33505
parent671a73df68a2a23d5d824b804bfb9655ad5fc967 (diff)
downloaddebian-edu-fai+itzks-e47fbedd127bbdbffc4c74d31c29885e24a874fe.tar.gz
debian-edu-fai+itzks-e47fbedd127bbdbffc4c74d31c29885e24a874fe.tar.bz2
debian-edu-fai+itzks-e47fbedd127bbdbffc4c74d31c29885e24a874fe.zip
fai/config/disk_config/LVM_EDU*: Drop /dev/vg_system/usr volume. Causes conflicts with usr-merge initiative in Debian.
-rw-r--r--fai/config/disk_config/LVM_EDU3
-rw-r--r--fai/config/disk_config/LVM_EDU_MINIMAL3
-rw-r--r--fai/config/disk_config/LVM_EDU_ROAMING3
3 files changed, 3 insertions, 6 deletions
diff --git a/fai/config/disk_config/LVM_EDU b/fai/config/disk_config/LVM_EDU
index c8dae14..5a0fa1a 100644
--- a/fai/config/disk_config/LVM_EDU
+++ b/fai/config/disk_config/LVM_EDU
@@ -5,7 +5,6 @@ primary - 0- - -
disk_config lvm
vg vg_system disk1.3
-vg_system-root / 3G-5G ext4 errors=remount-ro
+vg_system-root / 35G-41G ext4 errors=remount-ro
vg_system-swap_1 swap RAM:150% swap sw
-vg_system-usr /usr 32G-36G ext4 defaults
vg_system-var /var 11G-14G ext4 defaults
diff --git a/fai/config/disk_config/LVM_EDU_MINIMAL b/fai/config/disk_config/LVM_EDU_MINIMAL
index d0f72bf..f164e79 100644
--- a/fai/config/disk_config/LVM_EDU_MINIMAL
+++ b/fai/config/disk_config/LVM_EDU_MINIMAL
@@ -5,8 +5,7 @@ primary - 0- - -
disk_config lvm
vg vg_system disk1.3
-vg_system-root / 2G-4G ext4 errors=remount-ro
+vg_system-root / 10G-16G ext4 errors=remount-ro
vg_system-swap_1 swap RAM:150% swap sw
-vg_system-usr /usr 8G-12G ext4 defaults
vg_system-var /var 8G-10G ext4 defaults
vg_system-srv /srv 4G-6G ext4 defaults
diff --git a/fai/config/disk_config/LVM_EDU_ROAMING b/fai/config/disk_config/LVM_EDU_ROAMING
index 2c8d52f..aca09e0 100644
--- a/fai/config/disk_config/LVM_EDU_ROAMING
+++ b/fai/config/disk_config/LVM_EDU_ROAMING
@@ -5,8 +5,7 @@ primary - 0- - -
disk_config lvm
vg vg_system disk1.3
-vg_system-root / 3G-5G ext4 errors=remount-ro
+vg_system-root / 35G-41G ext4 errors=remount-ro
vg_system-swap_1 swap RAM:150% swap sw
-vg_system-usr /usr 32G-36G ext4 defaults
vg_system-var /var 11G-14G ext4 defaults
vg_system-home /home 4G-70% ext4 defaults