dracut/0002-rootfs-generator-check-for-rootok-before-doing-any-a.patch
Harald Hoyer 0840a3b62c dracut-043-40.git20150710
- git snapshot
2015-07-10 11:31:14 +02:00

23 lines
885 B
Diff

From 231b3dd4327e011285636e73459c3d139baba661 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mon, 15 Jun 2015 15:28:52 +0200
Subject: [PATCH] rootfs-generator: check for rootok, before doing any action
---
modules.d/98dracut-systemd/rootfs-generator.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/98dracut-systemd/rootfs-generator.sh b/modules.d/98dracut-systemd/rootfs-generator.sh
index 5910ce7..670613e 100755
--- a/modules.d/98dracut-systemd/rootfs-generator.sh
+++ b/modules.d/98dracut-systemd/rootfs-generator.sh
@@ -93,7 +93,7 @@ esac
GENERATOR_DIR="$1"
-if [ "${root%%:*}" = "block" ]; then
+if [ "$rootok" = "1" ]; then
generator_wait_for_dev "${root#block:}" "$RDRETRY"
strstr "$(cat /proc/cmdline)" 'root=' || generator_mount_rootfs "${root#block:}" "$(getarg rootfstype=)" "$(getarg rootflags=)"
fi