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