From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 21 May 2024 19:18:54 +0000 (+0200)
Subject: - PLD merge: skip cgroup/cgroup2 fs, too
X-Git-Tag: 0.5.4~4
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=db7b01aaedc9a70a5c7f349eb438fd9387d2f5ad;p=rc-scripts.git

- PLD merge: skip cgroup/cgroup2 fs, too
---

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index 02246c3..db226b5 100755
--- 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