X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=98129a5251ac313a98152fd17ad9c986e391ef3c;hb=d1191d52c1d77dc689135fb01119fe93e01a3855;hp=8be3942c94e599b73f2f8042e5b10630e3823c3b;hpb=54f4dad082e28f45b55d43c442dbfdd280410ba0;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 8be3942..98129a5 100755
--- a/scripts/live
+++ b/scripts/live
@@ -965,6 +965,16 @@ try_snap ()
 	snapdata="${1}"
 	snap_mount="${2}"
 	snap_type="${3}"
+	snap_relpath="${4}"
+
+	if [ -z "${snap_relpath}" ]
+	then
+		# root snapshot, default usage
+		snap_relpath="/"
+	else
+		# relative snapshot (actually used just for "/home" snapshots)
+		snap_mount="${2}${snap_relpath}"
+	fi
 
 	if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
 	then
@@ -1045,11 +1055,11 @@ try_snap ()
 			fi
 		fi
 	else
-		log_warning_msg "Impossible to include the ${snap_type} Snapshot"
+		log_warning_msg "Impossible to include the ${snap_type} Snapshot (o)"
 		return 1
 	fi
 
-	echo "export ${snap_type}SNAP="/cow${snap_mount#$rootmnt}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt
+	echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
 	return 0
 }
 
@@ -1387,7 +1397,7 @@ setup_unionfs ()
 		# Look for other snapshots to copy in
 		try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
 		# This second type should be removed when snapshot grow smarter
-		try_snap "${home_snapdata}" "${rootmnt}/home" "HOME"
+		try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
 	fi
 
 	if [ -n "${SHOWMOUNTS}" ]
@@ -1626,16 +1636,6 @@ find_livefs ()
 	return 1
 }
 
-set_usplash_timeout ()
-{
-	if [ -x /sbin/usplash_write ]
-	then
-		/sbin/usplash_write "TIMEOUT 120"
-	else if [ -x /sbin/splashy_update ] ; then
-		/sbin/splashy_update "TIMEOUT 120"
-	fi ; fi
-}
-
 integrity_check ()
 {
 	media_mountpoint="${1}"
@@ -1662,14 +1662,6 @@ integrity_check ()
 	fi
 }
 
-start_usplash_pulse ()
-{
-	if [ -x /sbin/usplash_write ]
-	then
-		/sbin/usplash_write "PULSELOGO"
-	fi
-}
-
 mountroot ()
 {
         if [ -x /scripts/local-top/cryptroot ]; then
@@ -1688,9 +1680,6 @@ mountroot ()
 
 	Arguments
 
-	set_usplash_timeout
-	start_usplash_pulse
-
 	maybe_break live-premount
 	log_begin_msg "Running /scripts/live-premount"
 	run_scripts /scripts/live-premount
@@ -1699,8 +1688,6 @@ mountroot ()
 	# Needed here too because some things (*cough* udev *cough*)
 	# changes the timeout
 
-	set_usplash_timeout
-
 	if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
 	then
 		if do_netmount
@@ -1819,6 +1806,18 @@ mountroot ()
 	# when booting FAI, this simple workaround solves it
 	ls /root/* >/dev/null 2>&1
 
+	# copy snapshot configuration if exists
+	if [ -f snapshot.conf ]
+	then
+		log_begin_msg "Copying snapshot.conf to ${rootmnt}/etc/live/boot.d"
+		if [ ! -d "${rootmnt}/etc/live/boot.d" ]
+		then
+			mkdir -p "${rootmnt}/etc/live/boot.d"
+		fi
+		cp snapshot.conf "${rootmnt}/etc/live/boot.d/"
+		log_end_msg
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"