From: Daniel Baumann <daniel@debian.org>
Date: Mon, 13 Aug 2012 23:11:27 +0000 (+0200)
Subject: Moving reading of initramfs-tools functions to initramfs-tools script.
X-Git-Tag: debian/3.0_b1-1~12
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=ba42304070c7104fbe526f6d166b8bbce36a3cd4

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