5 files changed, 12 insertions, 115 deletions
diff --git a/initramfs-tools/scripts/live-bottom/08persistence_excludes b/initramfs-tools/scripts/live-bottom/08persistence_excludes
index 633f6ac..04c685d 100755
--- a/initramfs-tools/scripts/live-bottom/08persistence_excludes
+++ b/initramfs-tools/scripts/live-bottom/08persistence_excludes
@@ -31,7 +31,9 @@ then
 	exit 0
 fi
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 # live-boot script
 
diff --git a/initramfs-tools/scripts/live-bottom/10validateroot b/initramfs-tools/scripts/live-bottom/10validateroot
index 32fcea3..3946306 100755
--- a/initramfs-tools/scripts/live-bottom/10validateroot
+++ b/initramfs-tools/scripts/live-bottom/10validateroot
@@ -20,7 +20,9 @@ case "${1}" in
 		;;
 esac
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 if ! [ -d "/root/usr/share/live-boot" ]
 then
diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab
index 7f43937..89f6e1e 100755
--- a/initramfs-tools/scripts/live-bottom/12fstab
+++ b/initramfs-tools/scripts/live-bottom/12fstab
@@ -21,7 +21,9 @@ esac
 
 # live-boot header
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 if [ -n "${NOFSTAB}" ]
 then
diff --git a/initramfs-tools/scripts/live-bottom/23networking b/initramfs-tools/scripts/live-bottom/23networking
index 86d4562..7fca6ff 100755
--- a/initramfs-tools/scripts/live-bottom/23networking
+++ b/initramfs-tools/scripts/live-bottom/23networking
@@ -25,7 +25,9 @@ then
 	exit 0
 fi
 
-. /scripts/live-functions
+# FIXME: stop hardcoding overloading of initramfs-tools functions
+. /scripts/functions
+. /lib/live/boot/initramfs-tools.sh
 
 log_begin_msg "Preconfiguring networking"
 
diff --git a/initramfs-tools/scripts/live-functions b/initramfs-tools/scripts/live-functions
deleted file mode 100644
index f3668f1..0000000
--- a/initramfs-tools/scripts/live-functions
+++ /dev/null
@@ -1,111 +0,0 @@
-
-. /scripts/functions
-. /live.vars
-
-log_wait_msg ()
-{
-	# Print a message and wait for enter
-	if [ -x /bin/plymouth ] && plymouth --ping
-	then
-		plymouth message --text="$@"
-		plymouth watch-keystroke | read nunya
-	fi
-
-	_log_msg "Waiting: ${@} ... \n"
-}
-
-really_export ()
-{
-	STRING="${1}"
-	VALUE="$(eval echo -n \${$STRING})"
-
-	if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars
-	then
-		sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
-	else
-		echo "export ${STRING}=\"${VALUE}\"" >> /live.vars
-	fi
-
-	eval export "${STRING}"="${VALUE}"
-}
-
-lang2locale() {
-	langpart="${1%%_*}"
-	if [ "$1" != "C" ]; then
-		# Match the language code with 3rd field in languagelist
-		line=$(grep -v "^#" /usr/share/live-boot/languagelist | cut -f1,3,6 -d\; | grep -v ';C$' | grep "^$langpart;")
-		if [ -n "$line" ]; then
-			if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
-				# More than one match; try matching the
-				# country as well.
-				countrypart="${1#*_}"
-				if [ "$countrypart" = "$1" ]; then
-					countryline="$(echo "$line" | head -n1)"
-					echo "${countryline##*;}"
-					return
-				fi
-				countrypart="${countrypart%%[@.]*}"
-				countryline="$(echo "$line" | grep ";$countrypart;" | head -n1 || true)"
-				if [ "$countryline" ]; then
-					echo "${countryline##*;}"
-					return
-				fi
-			fi
-			echo "${line##*;}"
-		fi
-	else
-		echo "C"
-	fi
-}
-
-# Override maybe_break from scripts/functions
-maybe_break()
-{
-	if [ "${break}" = "$1" ]; then
-		# Call original panic
-		. /scripts/functions
-		panic "Spawning shell within the initramfs"
-	fi
-}
-
-# Override panic from scripts/functions
-panic() {
-
-	DEB_1="\033[1;31m .''\`.  \033[0m"
-	DEB_2="\033[1;31m: :'  : \033[0m"
-	DEB_3="\033[1;31m\`. \`'\`  \033[0m"
-	DEB_4="\033[1;31m  \`-    \033[0m"
-
-	LIVELOG="\033[1;37m/boot.log\033[0m"
-	DEBUG="\033[1;37mdebug\033[0m"
-
-	# Reset redirections to avoid buffering
-	exec 1>&6 6>&-
-	exec 2>&7 7>&-
-	kill ${tailpid}
-
-	printf "\n\n"
-	printf "     ${DEB_1}\n"
-	printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
-	printf "     ${DEB_3}\n"
-	printf "     ${DEB_4}  This Debian Live image failed to boot.\n\n"
-
-	printf "  Please file a bug against the 'live-boot' package or email the Debian\n"
-	printf "  Live mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
-	printf "  exact version, name and distribution of the image you were attempting to boot.\n\n"
-
-	printf "  The file ${LIVELOG} contains some debugging information but booting with the\n"
-	printf "  ${DEBUG} command-line parameter will greatly increase its verbosity which is\n"
-	printf "  extremely useful when diagnosing issues.\n\n"
-
-	if [ -n "${panic}" ]; then
-		printf "  live-boot will now restart your system. "
-	else
-		printf "  live-boot will now start a shell. "
-	fi
-	printf "The error message was:\n\n    "
-
-	# Call original panic
-	. /scripts/functions
-	panic "$@"
-}