1 |
vip-ire |
1.1 |
From 371c2b4b8e2f438c748b7fb9eb3ce3f6f99cf3c6 Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Lukas Nykryn <lnykryn@redhat.com> |
3 |
|
|
Date: Thu, 13 Aug 2015 15:35:02 +0200 |
4 |
|
|
Subject: [PATCH] rc.sysinit: apply quotas after system is relabeled |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
rc.d/rc.sysinit | 18 +++++++++--------- |
8 |
|
|
1 file changed, 9 insertions(+), 9 deletions(-) |
9 |
|
|
|
10 |
|
|
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit |
11 |
|
|
index a81c0bc..2521ab5 100755 |
12 |
|
|
--- a/rc.d/rc.sysinit |
13 |
|
|
+++ b/rc.d/rc.sysinit |
14 |
|
|
@@ -519,15 +519,6 @@ else |
15 |
|
|
action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs -O no_netdev |
16 |
|
|
fi |
17 |
|
|
|
18 |
|
|
-# Update quotas if necessary |
19 |
|
|
-if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then |
20 |
|
|
- action $"Checking local filesystem quotas: " /sbin/quotacheck -anug |
21 |
|
|
-fi |
22 |
|
|
- |
23 |
|
|
-if [ -x /sbin/quotaon ]; then |
24 |
|
|
- action $"Enabling local filesystem quotas: " /sbin/quotaon -aug |
25 |
|
|
-fi |
26 |
|
|
- |
27 |
|
|
# Check to see if a full relabel is needed |
28 |
|
|
if [ -n "$SELINUX_STATE" -a "$READONLY" != "yes" ]; then |
29 |
|
|
if [ -f /.autorelabel ] || strstr "$cmdline" autorelabel ; then |
30 |
|
|
@@ -539,6 +530,15 @@ else |
31 |
|
|
fi |
32 |
|
|
fi |
33 |
|
|
|
34 |
|
|
+# Update quotas if necessary |
35 |
|
|
+if [ X"$_RUN_QUOTACHECK" = X1 -a -x /sbin/quotacheck ]; then |
36 |
|
|
+ action $"Checking local filesystem quotas: " /sbin/quotacheck -anug |
37 |
|
|
+fi |
38 |
|
|
+ |
39 |
|
|
+if [ -x /sbin/quotaon ]; then |
40 |
|
|
+ action $"Enabling local filesystem quotas: " /sbin/quotaon -aug |
41 |
|
|
+fi |
42 |
|
|
+ |
43 |
|
|
# Initialize pseudo-random number generator |
44 |
|
|
if [ -f "/var/lib/random-seed" ]; then |
45 |
|
|
cat /var/lib/random-seed > /dev/urandom |
46 |
|
|
-- |
47 |
|
|
2.4.3 |
48 |
|
|
|