[PATCH f17-branch 1/5] dracut: don't do kickstart twice, don't use root.info

[Will Woods <wwoods@xxxxxxxxxx>]

Empty "$kickstart" in run_kickstart, so we don't end up looking for the
kickstart again - and don't run fetch-kickstart-disk if it already ran.

Also, newer dracut doesn't bother with root.info so neither should we.
---
 dracut/anaconda-lib.sh      |    5 +++--
 dracut/anaconda-netroot.sh  |    3 +--
 dracut/fetch-kickstart-disk |    1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dracut/anaconda-lib.sh b/dracut/anaconda-lib.sh
index 2709a42..d4c9953 100755
--- a/dracut/anaconda-lib.sh
+++ b/dracut/anaconda-lib.sh
@@ -135,6 +135,9 @@ run_kickstart() {
     # kickstart's done - time to find a real root device
     [ "$root" = "anaconda-kickstart" ] && root=""
 
+    # don't look for the kickstart again
+    kickstart=""
+
     # re-parse new cmdline stuff from the kickstart
     . $hookdir/cmdline/*parse-anaconda-repo.sh
     # TODO: parse for other stuff ks might set (updates, dd, etc.)
@@ -145,8 +148,6 @@ run_kickstart() {
     [ "$root" = "anaconda-auto-cd" ] && do_disk=1
 
     # replay udev events to trigger actions
-    # NOTE: this line is deprecated and unnecessary in dracut 018
-    [ -f /tmp/root.info ] && echo "root='$root'" >> /tmp/root.info
     if [ "$do_disk" ]; then
         . $hookdir/pre-udev/*repo-genrules.sh
         udevadm control --reload
diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh
index 2486e30..a7bdb15 100755
--- a/dracut/anaconda-netroot.sh
+++ b/dracut/anaconda-netroot.sh
@@ -4,8 +4,7 @@
 
 command -v getarg >/dev/null || . /lib/dracut-lib.sh
 
-# get repo and root info
-[ -e /tmp/root.info ] && . /tmp/root.info
+# get repo info
 repo=$(getarg repo= inst.repo=)
 
 # no repo? non-net root? we're not needed here.
diff --git a/dracut/fetch-kickstart-disk b/dracut/fetch-kickstart-disk
index 52d753b..ee4f226 100755
--- a/dracut/fetch-kickstart-disk
+++ b/dracut/fetch-kickstart-disk
@@ -7,6 +7,7 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh
 dev="$1"
 path="${2:-/ks.cfg}"
 
+[ -e /tmp/ks.cfg.done ] && exit 1
 [ -b "$dev" ] || exit 1
 
 info "anaconda: fetching kickstart from $dev:$path"
-- 
1.7.7.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list