summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live19
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/live b/scripts/live
index 5397837..35ba702 100755
--- a/scripts/live
+++ b/scripts/live
@@ -7,7 +7,7 @@ export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin
echo "/root/lib" >> /etc/ld.so.conf
echo "/root/usr/lib" >> /etc/ld.so.conf
-mountpoint=/live_media
+mountpoint=/live/image
root_persistence="live-rw"
home_persistence="home-rw"
@@ -49,6 +49,13 @@ parse_cmdline ()
export DEFCONFSOLE
;;
+ debug)
+ DEBUG="Yes"
+ export DEBUG
+
+ set -x
+ ;;
+
hostname=*)
HOSTNAME=${x#hostname=}
LIVECONF="changed"
@@ -143,7 +150,7 @@ parse_cmdline ()
export NETBOOT
;;
- nfsopts=)
+ nfsopts=*)
NFSOPTS=${x#nfsopts=}
export NFSOPTS
;;
@@ -201,7 +208,7 @@ parse_cmdline ()
export SHOWMOUNTS
;;
- timezone=*)
+ timezone=*)
TIMEZONE="${x#timezone=}"
export TIMEZONE
;;
@@ -659,8 +666,8 @@ setup_unionfs() {
fi
# shows cow fs on /cow for use by live-snapshot
- mkdir -p "${rootmnt}/cow"
- mount -o bind /cow "${rootmnt}/cow"
+ mkdir -p "${rootmnt}/live/cow"
+ mount -o bind /cow "${rootmnt}/live/cow"
}
check_dev ()
@@ -793,7 +800,7 @@ mountroot() {
live_dest="${TODISK}"
fi
if [ "${live_dest}" ]; then
- log_begin_msg "Copying live_media to ${live_dest}"
+ log_begin_msg "Copying live media to ${live_dest}"
copy_live_to "${livefs_root}" "${live_dest}"
log_end_msg
fi