summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-08-14 01:11:27 +0200
committerDaniel Baumann <daniel@debian.org>2012-08-14 01:11:27 +0200
commitba42304070c7104fbe526f6d166b8bbce36a3cd4 (patch)
tree7f14fc891bff0ae06ca7f64d20d8b5167cf0c8b7 /scripts
parent990d419eacf614710c838ef743aa10ec0612ed7a (diff)
downloadlive-boot-ba42304070c7104fbe526f6d166b8bbce36a3cd4.tar.gz
live-boot-ba42304070c7104fbe526f6d166b8bbce36a3cd4.zip
Moving reading of initramfs-tools functions to initramfs-tools script.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/boot/0020-initramfs-tools5
-rwxr-xr-xscripts/boot/9990-aaa-fixme.sh6
2 files changed, 5 insertions, 6 deletions
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