From cc0e7a369b3db3a990aa5a3f4ee64fbb6854fe94 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 22 Jul 2009 16:31:24 -0400 Subject: [PATCH] Parse options earlier for live root --- modules.d/90dmsquash-live/dmsquash-live-root | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root index 9b03713..b8d3880 100755 --- a/modules.d/90dmsquash-live/dmsquash-live-root +++ b/modules.d/90dmsquash-live/dmsquash-live-root @@ -14,6 +14,14 @@ fi [ -z "$1" ] && exit 1 livedev="$1" +# parse various live image specific options that make sense to be +# specified as their own things +live_dir=$(getarg live_dir) +[ -z "$live_dir" ] && live_dir="LiveOS" +getarg live_ram && live_ram="yes" +getarg reset_overlay && reset_overlay="yes" +overlay=$(getarg overlay) + # FIXME: we need to be able to hide the plymouth splash for the check really [ -e $livedev ] & fs=$(blkid -s TYPE -o value $livedev) if [ "$fs" == "iso9660" -o "$fs" = "udf" ]; then @@ -39,14 +47,6 @@ if [ "$RES" != "0" ]; then exit 1 fi -# parse various live image specific options that make sense to be -# specified as their own things -live_dir=$(getarg live_dir) -[ -z "$live_dir" ] && live_dir="LiveOS" -getarg live_ram && live_ram="yes" -getarg reset_overlay && reset_overlay="yes" -overlay=$(getarg overlay) - # overlay setup helper function do_live_overlay() { # create a sparse file for the overlay -- 2.7.4