[Pkg-sysvinit-commits] r158 - in sysvinit/trunk/debian: .
initscripts/etc/init.d
Petter Reinholdtsen
pere at costa.debian.org
Sat Nov 19 12:22:35 UTC 2005
Author: pere
Date: 2005-11-19 12:22:34 +0000 (Sat, 19 Nov 2005)
New Revision: 158
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Log:
Add new function selinux_enabled(). Use it before running /sbin/restorecon.
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2005-11-19 11:44:51 UTC (rev 157)
+++ sysvinit/trunk/debian/changelog 2005-11-19 12:22:34 UTC (rev 158)
@@ -21,8 +21,8 @@
* Add link to alioth project page in the Debian README.
* Created new file /lib/init/functions.sh for functions common to
scripts in initscripts. Moved dir_writable() into it.
- * Only use /sbin/restorecon if /usr/sbin/selinuxenabled return true,
- to limit it to systems with SELinux enabled.
+ * Add new function selinux_enabled(). Use it before running
+ /sbin/restorecon.
[ Thomas Hood ]
* Improve update-rc.d man page text.
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh 2005-11-19 11:44:51 UTC (rev 157)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh 2005-11-19 12:22:34 UTC (rev 158)
@@ -14,3 +14,10 @@
fi
return 1
}
+
+#
+# Return true if SELinux is enabled, false otherwise.
+#
+selinux_enabled () {
+ return [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled
+}
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2005-11-19 11:44:51 UTC (rev 157)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2005-11-19 12:22:34 UTC (rev 158)
@@ -151,8 +151,7 @@
:> /etc/mtab
fi
- if /usr/sbin/selinuxenabled &&
- [ -x /sbin/restorecon ] && [ -r /etc/mtab ]; then
+ if selinux_enabled && [ -x /sbin/restorecon ] && [ -r /etc/mtab ]; then
/sbin/restorecon /etc/mtab
fi
More information about the Pkg-sysvinit-commits
mailing list