aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@kernel.org>2019-06-16 17:20:36 -0700
committerAndy Lutomirski <luto@kernel.org>2019-06-16 17:20:36 -0700
commit32b19d77fabc2406811af5d3d8f61d7dfe5337b3 (patch)
tree8710dcb539d6325044e043eaea2f4e43b3d14d43
parent48e60c02329cde624626599c5e71f5bae1074e61 (diff)
downloadvirtme-32b19d77fabc2406811af5d3d8f61d7dfe5337b3.tar.gz
Improve error handling if cgroup mounting fails
Signed-off-by: Andy Lutomirski <luto@kernel.org>
-rwxr-xr-xvirtme/guest/virtme-init7
1 files changed, 4 insertions, 3 deletions
diff --git a/virtme/guest/virtme-init b/virtme/guest/virtme-init
index d0456b3..b1159d0 100755
--- a/virtme/guest/virtme-init
+++ b/virtme/guest/virtme-init
@@ -123,9 +123,10 @@ mount -t configfs configfs /sys/kernel/config &>/dev/null
mount -t debugfs debugfs /sys/kernel/debug &>/dev/null
# Set up cgroup mount points (mount cgroupv2 hierarchy by default)
-mount -t tmpfs tmpfs /sys/fs/cgroup &>/dev/null
-mkdir /sys/fs/cgroup/unified
-mount -t cgroup2 cgroup2 /sys/fs/cgroup/unified &>/dev/null
+if mount -t tmpfs tmpfs /sys/fs/cgroup &>/dev/null; then
+ mkdir /sys/fs/cgroup/unified
+ mount -t cgroup2 cgroup2 /sys/fs/cgroup/unified
+fi
# Set up filesystems that live in /dev
mkdir -p -m 0755 /dev/shm /dev/pts