[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-52-g84c6598
Andreas B. Mundt
andi at debian.org
Mon Oct 29 12:16:26 UTC 2012
The following commit has been merged in the master branch:
commit 3f9141933367e64c592d5cda5fbeb39a7a5b54ac
Author: Andreas B. Mundt <andi at debian.org>
Date: Mon Oct 15 20:18:51 2012 +0200
Implement disk quotas for the home directory.
Activate quotas for a user by defining limits with:
"edquota -u <USER>".
For other users with identical limits use:
"edquota -p <USER> -u <ANOTHERUSER> ....".
diff --git a/fai/config/disk_config/LVM6BAK_A b/fai/config/disk_config/LVM6BAK_A
index d585cf5..640ee83 100644
--- a/fai/config/disk_config/LVM6BAK_A
+++ b/fai/config/disk_config/LVM6BAK_A
@@ -8,7 +8,7 @@ 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 2G-70% ext4 defaults
+vg_system-home /lan/mainserver/home0 2G-70% ext4 usrquota
disk_config disk2 fstabkey:uuid
diff --git a/fai/config/disk_config/LVM7BAK_A b/fai/config/disk_config/LVM7BAK_A
index 5e6d442..a8ff9fe 100644
--- a/fai/config/disk_config/LVM7BAK_A
+++ b/fai/config/disk_config/LVM7BAK_A
@@ -9,7 +9,7 @@ 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 2G-70% ext4 usrquota
disk_config disk2 fstabkey:uuid
diff --git a/fai/config/disk_config/LVM7_A b/fai/config/disk_config/LVM7_A
index a27f437..6b80362 100644
--- a/fai/config/disk_config/LVM7_A
+++ b/fai/config/disk_config/LVM7_A
@@ -8,5 +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-home /lan/mainserver/home0 1G-40% 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 2bad592..9cfb2f2 100644
--- a/fai/config/disk_config/LVM8_A
+++ b/fai/config/disk_config/LVM8_A
@@ -9,5 +9,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-home /lan/mainserver/home0 1G-40% ext4 usrquota
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 6ebd99f..cdf2eb0 100644
--- a/fai/config/disk_config/RAIDLVM6BAK_A
+++ b/fai/config/disk_config/RAIDLVM6BAK_A
@@ -19,7 +19,7 @@ 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 2G-70% ext4 defaults
+vg_system-home /lan/mainserver/home0 2G-70% ext4 usrquota
disk_config disk3 fstabkey:uuid
diff --git a/fai/config/disk_config/RAIDLVM7BAK_A b/fai/config/disk_config/RAIDLVM7BAK_A
index d50826b..e6c923f 100644
--- a/fai/config/disk_config/RAIDLVM7BAK_A
+++ b/fai/config/disk_config/RAIDLVM7BAK_A
@@ -20,7 +20,7 @@ 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 2G-70% ext4 usrquota
disk_config disk3 fstabkey:uuid
diff --git a/fai/config/disk_config/RAIDLVM7_A b/fai/config/disk_config/RAIDLVM7_A
index d1e96a0..2f3c3be 100644
--- a/fai/config/disk_config/RAIDLVM7_A
+++ b/fai/config/disk_config/RAIDLVM7_A
@@ -19,5 +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-home /lan/mainserver/home0 1G-40% 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 c90801c..41ed558 100644
--- a/fai/config/disk_config/RAIDLVM8_A
+++ b/fai/config/disk_config/RAIDLVM8_A
@@ -20,5 +20,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-home /lan/mainserver/home0 1G-40% ext4 usrquota
vg_system-backup /backup 1G-40% ext4 defaults
diff --git a/fai/config/package_config/CLIENT_A b/fai/config/package_config/CLIENT_A
index 0f871dd..3063506 100644
--- a/fai/config/package_config/CLIENT_A
+++ b/fai/config/package_config/CLIENT_A
@@ -1,4 +1,5 @@
## Here are all default packages for the given setup that do not fit
## another class.
-PACKAGES aptitude
+PACKAGES aptitude
sudo-ldap
+quota
diff --git a/fai/config/package_config/NFS_SERVER b/fai/config/package_config/NFS_SERVER
index 1615789..a51e943 100644
--- a/fai/config/package_config/NFS_SERVER
+++ b/fai/config/package_config/NFS_SERVER
@@ -2,3 +2,4 @@
## Put all setup-dependent packages in the SETUP_* class.
PACKAGES aptitude
nfs-kernel-server
+quota
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list