[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH f17-branch 2/2] dracut: accept inst.updates or updates for live.updates



If the user passes 'updates=XXX' or 'inst.updates=XXX' we should accept
that like we do 'live.updates=XXX'. At least for now.

Also remove a comment about updates=XXX - it turns out that setting
updateSrc is necessary (the storage module puts it into disallowDrives).
---
 anaconda                         |    1 -
 dracut/parse-anaconda-options.sh |    7 +++++++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/anaconda b/anaconda
index 018884a..ad7a73f 100755
--- a/anaconda
+++ b/anaconda
@@ -258,7 +258,6 @@ def parseOptions(argv = None):
     # Miscellaneous
     op.add_option("--module", action="append", default=[])
     op.add_option("--nomount", dest="rescue_nomount", action="store_true", default=False)
-    # XXX updates should go away because dracut's gonna handle it
     op.add_option("--updates", dest="updateSrc", action="store", type="string")
     op.add_option("--dlabel", action="store_true", default=False)
     op.add_option("--image", action="append", dest="images", default=[])
diff --git a/dracut/parse-anaconda-options.sh b/dracut/parse-anaconda-options.sh
index 1a8f7b8..2da4e25 100755
--- a/dracut/parse-anaconda-options.sh
+++ b/dracut/parse-anaconda-options.sh
@@ -92,5 +92,12 @@ warn_renamed_arg "ksdevice" "inst.ks.device"
 warn_renamed_arg "kssendmac" "inst.ks.sendmac"
 warn_renamed_arg "kssendsn" "inst.ks.sendsn"
 
+# updates
+warn_renamed_arg "updates" "inst.updates"
+updates=$(getarg updates inst.updates)
+if [ -n "$updates" ]; then
+    echo "live.updates=$updates" >> /etc/cmdline.d/75anaconda-options.conf
+fi
+
 # re-read the commandline args
 unset CMDLINE
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]