Parse options earlier for live root

master
Jeremy Katz 2009-07-22 16:31:24 -04:00 committed by Harald Hoyer
parent 7f819d7041
commit cc0e7a369b
1 changed files with 8 additions and 8 deletions

View File

@ -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