[Debian-live-changes] r1058 - in dists/trunk/live-helper: functions helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-13 22:55:57 +0000 (Fri, 13 Apr 2007)
New Revision: 1058

Modified:
   dists/trunk/live-helper/functions/exit.sh
   dists/trunk/live-helper/helpers/lh_binary_encryption
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_iso
   dists/trunk/live-helper/helpers/lh_binary_memtest
   dists/trunk/live-helper/helpers/lh_binary_syslinux
   dists/trunk/live-helper/helpers/lh_binary_yaboot
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
Log:


Modified: dists/trunk/live-helper/functions/exit.sh
===================================================================
--- dists/trunk/live-helper/functions/exit.sh	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/functions/exit.sh	2007-04-13 22:55:57 UTC (rev 1058)
@@ -15,4 +15,6 @@
 	then
 		set | grep -e ^LH -e ^LIVE
 	fi
+
+	# FIXME: Add /proc et al cleanup on failure
 }

Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption	2007-04-13 22:55:57 UTC (rev 1058)
@@ -57,7 +57,7 @@
 		;;
 
 	plain)
-		echo "W: encryption not supported on plain filesystem."
+		Echo_warning "encryption not supported on plain filesystem."
 		exit 0
 		;;
 

Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-13 22:55:57 UTC (rev 1058)
@@ -94,7 +94,8 @@
 		;;
 
 	net)
-		Echo_error "not supported, FIXME"
+		Echo_error "not supported, aborting (FIXME)."
+		exit 1
 	;;
 esac
 
@@ -171,9 +172,11 @@
 	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
 fi
 
+# Copying templates
 mkdir -p binary/boot/grub
 cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
 
+# Copyring grub
 case ${LIVE_BINARY_IMAGE} in
 	iso)
 		cp chroot/usr/lib/grub/i386-pc/stage2_eltorito binary/boot/grub

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-13 22:55:57 UTC (rev 1058)
@@ -91,7 +91,7 @@
 					;;
 			esac
 		else
-			echo "W: Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+			Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
 			sleep 5
 			#Chroot "${LH_GENISOIMAGE} -A 'Debian Live' -p 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
 			Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l binary"

Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest	2007-04-13 22:55:57 UTC (rev 1058)
@@ -52,7 +52,7 @@
 
 if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
 then
-	echo "W: skipping binary_memtest, foreign architecture."
+	Echo_warning "skipping binary_memtest, foreign architecture."
 	exit 0
 fi
 

Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-04-13 22:55:57 UTC (rev 1058)
@@ -52,7 +52,7 @@
 
 if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
 then
-	echo "W: skipping binary_syslinux, foreign architecture."
+	Echo_warning "skipping binary_syslinux, foreign architecture."
 	exit 0
 fi
 

Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-04-13 22:55:57 UTC (rev 1058)
@@ -52,7 +52,7 @@
 
 if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
 then
-	echo "W: skipping binary_yaboot, foreign architecture."
+	Echo_warning "skipping binary_yaboot, foreign architecture."
 	exit 0
 fi
 

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-13 22:55:57 UTC (rev 1058)
@@ -157,6 +157,6 @@
 	# Creating stage file
 	Create_stagefile .stage/bootstrap
 else
-	echo "E: Can't process file /usr/bin/cdebootstrap (FIXME)"
+	Echo_error "Can't process file /usr/bin/cdebootstrap (FIXME)"
 	exit 1
 fi

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-13 08:57:51 UTC (rev 1057)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-13 22:55:57 UTC (rev 1058)
@@ -131,6 +131,6 @@
 	# Creating stage file
 	Create_stagefile .stage/bootstrap
 else
-	echo "E: Can't process file /usr/bin/debootstrap (FIXME)"
+	Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
 	exit 1
 fi