cgroup/cpuset can exist in fstab but be commented out. Handle that.

svn-id: @12019

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ba6948374c5b2add61a8059ee1e41da39fc1cb73..fa164fda6844362f5a049e02fd043cb561d6d51a 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -272,7 +272,7 @@ if ! is_yes "$VSERVER"; then
 
        # cgroup/cpuset support
        if grep -q cgroup /proc/filesystems 2>/dev/null ; then
-               if ! grep -q cgroup /etc/fstab 2>/dev/null ; then
+               if ! grep -q "^[^#].*cgroup" /etc/fstab 2>/dev/null ; then
                        # creating is more convenient than artificial conflict with older udev
                        mkdir -p /dev/cgroup
                        # mount w/o options enables all available cgroup subsystems
@@ -280,7 +280,7 @@ if ! is_yes "$VSERVER"; then
                        mount -n -t cgroup none /dev/cgroup
                fi
        elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
-               if ! grep -q cpuset /etc/fstab 2>/dev/null ; then
+               if ! grep -q "^[^#].*cpuset" /etc/fstab 2>/dev/null ; then
                        mount -n -t cpuset none /dev/cpuset
                fi
        fi