- PLD merge: remove unknown `gid' mount option for sysfs, selinuxfs

diff --git a/rc.d/init.d/sys-chroots b/rc.d/init.d/sys-chroots
index b6e88efdc2dac11d0213879ff5d623fd5360fb4b..494539346a7f45549c9482200a68bd31f346c62a 100755 (executable)
--- 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 b6bfb29827db80c7d8a9951c8de9964161673f3f..524fe973224954df24c2e4934c5eb36a14e44fb6 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -124,7 +124,7 @@ init_selinux() {
                # no support in kernel, no chance
                SELINUX=no
        elif ! is_fsmounted selinuxfs /selinux; then
-               mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
+               mount -n -t selinuxfs selinuxfs /selinux
        fi
 
        # Check SELinux status
@@ -369,7 +369,7 @@ if [[ "$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 -t securityfs securityfs /sys/kernel/security