diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-06-05 15:45:40 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-06-05 16:11:16 +0200 |
| commit | 27ebf6d2b60a0ce4acac11794203c9ddc20706e2 (patch) | |
| tree | e0d2d95923f6e27d1153c7c0eab54d233393eccc /scripts/boot.sh | |
| parent | 23c2e9f4947a2d9be6b63f55cca8e633df3455a3 (diff) | |
| download | live-boot-27ebf6d2b60a0ce4acac11794203c9ddc20706e2.tar.gz live-boot-27ebf6d2b60a0ce4acac11794203c9ddc20706e2.zip | |
Moving out live-functions from initramfs-tools specifics.
Diffstat (limited to 'scripts/boot.sh')
| -rwxr-xr-x | scripts/boot.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/boot.sh b/scripts/boot.sh index 0b18a9c..5a64d70 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -2,6 +2,12 @@ # set -e +if [ -e /scripts/functions ] +then + # initramfs-tools specific (FIXME) + . /scripts/functions +fi + for _SCRIPT in /lib/live/boot/* do if [ -e "${_SCRIPT}" ] @@ -462,8 +468,7 @@ mountroot () tail -f boot.log >&7 & tailpid="${!}" - # Ensure 'panic' function is overridden - . /scripts/live-functions + . /live.vars Arguments |