Browse Source

Support old syntax

livecd-creator previously added 'liveimg' and used root=CDLABEL=;
it's easy enough to support that old syntax for now at least
and it will make it easier to get people testing
master
Jeremy Katz 16 years ago committed by Harald Hoyer
parent
commit
fa9d7304bf
  1. 11
      modules.d/90dmsquash-live/parse-dmsquash-live.sh

11
modules.d/90dmsquash-live/parse-dmsquash-live.sh

@ -1,9 +1,13 @@ @@ -1,9 +1,13 @@
# live images are specified with
# root=live:backingdev

echo "parsing for live"
[ -z "$root" ] && root=$(getarg root=)

# support legacy syntax of passing liveimg and then just the base root
if getarg liveimg; then
liveroot="live:$root"
fi

if [ "${root%%:*}" = "live" ] ; then
liveroot=$root
fi
@ -16,6 +20,11 @@ case "$liveroot" in @@ -16,6 +20,11 @@ case "$liveroot" in
root="$(echo $root | sed 's,/,\\x2f,g')"
root="live:/dev/disk/by-label/${root#LABEL=}"
rootok=1 ;;
live:CDLABEL=*|CDLABEL=*)
root="${root#live:}"
root="$(echo $root | sed 's,/,\\x2f,g')"
root="live:/dev/disk/by-label/${root#CDLABEL=}"
rootok=1 ;;
live:UUID=*|UUID=*)
root="${root#live:}"
root="live:/dev/disk/by-uuid/${root#UUID=}"

Loading…
Cancel
Save