[SCM] live-boot branch, debian-next, updated. debian/3.0_a38-1-5-gba42304

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit ba42304070c7104fbe526f6d166b8bbce36a3cd4
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 14 01:11:27 2012 +0200

    Moving reading of initramfs-tools functions to initramfs-tools script.

diff --git a/scripts/boot/0020-initramfs-tools b/scripts/boot/0020-initramfs-tools
index 175488e..c251443 100755
--- a/scripts/boot/0020-initramfs-tools
+++ b/scripts/boot/0020-initramfs-tools
@@ -2,6 +2,11 @@
 
 #set -e
 
+if [ -e /scripts/functions ]
+then
+	. /scripts/functions
+fi
+
 mountroot ()
 {
 	# initramfs-tools entry point for live-boot is mountroot(); function
diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh
index 77a291a..6530cc1 100755
--- a/scripts/boot/9990-aaa-fixme.sh
+++ b/scripts/boot/9990-aaa-fixme.sh
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-if [ -e /scripts/functions ]
-then
-	# initramfs-tools specific (FIXME)
-	. /scripts/functions
-fi
-
 export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 
 echo "/root/lib" >> /etc/ld.so.conf

-- 
live-boot