From: Harald Hoyer <harald@redhat.com>
Date: Mon, 15 Jun 2015 13:28:52 +0000 (+0200)
Subject: rootfs-generator: check for rootok, before doing any action
X-Git-Tag: 044~177
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=231b3dd4327e011285636e73459c3d139baba661;p=thirdparty%2Fdracut.git

rootfs-generator: check for rootok, before doing any action
---

diff --git a/modules.d/98dracut-systemd/rootfs-generator.sh b/modules.d/98dracut-systemd/rootfs-generator.sh
index 5910ce75f..670613e5c 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