- PLD merge: skip cgroup/cgroup2 fs, too

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index 02246c314a99fc7ec282fd22bab61ca846e8ad12..db226b5001768b4af2e9f91e5786bb2188eccc98 100755 (executable)
--- a/rc.d/rc.shutdown
+++ b/rc.d/rc.shutdown
@@ -76,7 +76,7 @@ else
        UMOUNT_IGNORE="/ $UMOUNT_IGNORE"
 fi
 remaining=$(awk -v ig="^($UMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
-               $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \
+               $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|cgroup|cgroup2|sysfs|securityfs|squashfs)$/ \
                && $1 !~ /^(none|\/dev\/root)$/ \
                && $2 !~ ig {print $2}' /proc/mounts)
 while [ -n "$remaining" -a "$retry" -gt 0 ]; do
@@ -100,7 +100,7 @@ while [ -n "$remaining" -a "$retry" -gt 0 ]; do
 
        sleep 2
        remaining=$(awk -v ig="^($UMOUNT_IGNORE)$" 'BEGIN { gsub(/[\t ]+/, "|", ig); } \
-                       $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|sysfs|securityfs|squashfs)$/ \
+                       $3 !~ /^(proc|loopfs|devpts|devtmpfs|shm|iso9660|ramfs|tmpfs|cgroup|cgroup2|sysfs|securityfs|squashfs)$/ \
                        && $1 !~ /^(none|\/dev\/root)$/ \
                        && $2 !~ ig {print $2}' /proc/mounts)
        [ -z "$remaining" ] && break