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 /initramfs-tools/scripts/live-bottom | |
| parent | 23c2e9f4947a2d9be6b63f55cca8e633df3455a3 (diff) | |
| download | live-boot-27ebf6d2b60a0ce4acac11794203c9ddc20706e2.tar.gz live-boot-27ebf6d2b60a0ce4acac11794203c9ddc20706e2.zip | |
Moving out live-functions from initramfs-tools specifics.
Diffstat (limited to 'initramfs-tools/scripts/live-bottom')
4 files changed, 12 insertions, 4 deletions
diff --git a/initramfs-tools/scripts/live-bottom/08persistence_excludes b/initramfs-tools/scripts/live-bottom/08persistence_excludes index 633f6ac..04c685d 100755 --- a/initramfs-tools/scripts/live-bottom/08persistence_excludes +++ b/initramfs-tools/scripts/live-bottom/08persistence_excludes @@ -31,7 +31,9 @@ then exit 0 fi -. /scripts/live-functions +# FIXME: stop hardcoding overloading of initramfs-tools functions +. /scripts/functions +. /lib/live/boot/initramfs-tools.sh # live-boot script diff --git a/initramfs-tools/scripts/live-bottom/10validateroot b/initramfs-tools/scripts/live-bottom/10validateroot index 32fcea3..3946306 100755 --- a/initramfs-tools/scripts/live-bottom/10validateroot +++ b/initramfs-tools/scripts/live-bottom/10validateroot @@ -20,7 +20,9 @@ case "${1}" in ;; esac -. /scripts/live-functions +# FIXME: stop hardcoding overloading of initramfs-tools functions +. /scripts/functions +. /lib/live/boot/initramfs-tools.sh if ! [ -d "/root/usr/share/live-boot" ] then diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab index 7f43937..89f6e1e 100755 --- a/initramfs-tools/scripts/live-bottom/12fstab +++ b/initramfs-tools/scripts/live-bottom/12fstab @@ -21,7 +21,9 @@ esac # live-boot header -. /scripts/live-functions +# FIXME: stop hardcoding overloading of initramfs-tools functions +. /scripts/functions +. /lib/live/boot/initramfs-tools.sh if [ -n "${NOFSTAB}" ] then diff --git a/initramfs-tools/scripts/live-bottom/23networking b/initramfs-tools/scripts/live-bottom/23networking index 86d4562..7fca6ff 100755 --- a/initramfs-tools/scripts/live-bottom/23networking +++ b/initramfs-tools/scripts/live-bottom/23networking @@ -25,7 +25,9 @@ then exit 0 fi -. /scripts/live-functions +# FIXME: stop hardcoding overloading of initramfs-tools functions +. /scripts/functions +. /lib/live/boot/initramfs-tools.sh log_begin_msg "Preconfiguring networking" |