[projects/rc-scripts] - remove unknown `gid' mount option for sysfs, selinuxfs and securityfs
adwol
adwol at pld-linux.org
Sun Dec 1 20:06:00 CET 2019
commit 2843ac0cd9c3e7185709a752a2d3c52fd46e1e01
Author: Adam Osuchowski <adwol at pld-linux.org>
Date: Wed Nov 27 21:13:26 2019 +0100
- remove unknown `gid' mount option for sysfs, selinuxfs and securityfs
rc.d/init.d/sys-chroots | 4 ++--
rc.d/rc.sysinit | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rc.d/init.d/sys-chroots b/rc.d/init.d/sys-chroots
index b6e88efd..49453934 100755
--- a/rc.d/init.d/sys-chroots
+++ b/rc.d/init.d/sys-chroots
@@ -103,11 +103,11 @@ start() {
fi
# sysfs is also needed before any other things (under kernel > 2.5)
if grep -q sysfs /proc/filesystems ; then
- chroot $dir mount -o gid=17 -t sysfs sysfs /sys
+ chroot $dir mount -t sysfs sysfs /sys
fi
# selinux
if grep -q selinuxfs /proc/filesystems ; then
- chroot $dir mount -o gid=17 -t selinuxfs selinuxfs /selinux
+ chroot $dir mount -t selinuxfs selinuxfs /selinux
fi
chroot $dir mount -a
# network
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index b5fc94ff..936244ba 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -128,7 +128,7 @@ init_selinux() {
fi
if ! is_fsmounted selinuxfs $selinuxfsdir; then
- mount -n -o gid=17 -t selinuxfs selinuxfs $selinuxfsdir
+ mount -n -t selinuxfs selinuxfs $selinuxfsdir
fi
# Check SELinux status
@@ -426,10 +426,10 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
# sysfs is also needed before any other things (under kernel > 2.5)
if ! is_fsmounted sysfs /sys; then
- grep -Fq sysfs /proc/filesystems && mount -n -o gid=17 -t sysfs sysfs /sys
+ grep -Fq sysfs /proc/filesystems && mount -n -t sysfs sysfs /sys
fi
if grep -Fq securityfs /proc/filesystems; then
- mount -n -o gid=17 -t securityfs securityfs /sys/kernel/security
+ mount -n -t securityfs securityfs /sys/kernel/security
fi
if [ -d /sys/fs/selinux ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/rc-scripts.git/commitdiff/2843ac0cd9c3e7185709a752a2d3c52fd46e1e01
More information about the pld-cvs-commit
mailing list