diff options
author | Daniel Baumann <daniel@debian.org> | 2012-07-02 17:40:11 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2012-07-18 23:34:15 +0200 |
commit | 2e70d7be610c9e45787c37352d36241de3c155d7 (patch) | |
tree | 907ee7a7f6f49d4a3e3ece474a270b09b1bfd2e6 | |
parent | 4640db7ffcef9dbc7e335d4c0323a7920a178b04 (diff) | |
download | live-boot-2e70d7be610c9e45787c37352d36241de3c155d7.tar.gz live-boot-2e70d7be610c9e45787c37352d36241de3c155d7.zip |
Renaming boot scripts for refactoring them into numbered plugins.
-rwxr-xr-x | scripts/boot.sh | 58 | ||||
-rwxr-xr-x | scripts/boot/9990-aaa-fixme.sh | 57 | ||||
-rwxr-xr-x | scripts/boot/9990-cmdline.sh (renamed from scripts/boot/cmdline.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-fstab.sh (renamed from scripts/boot/fstab.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-initramfs-tools.sh (renamed from scripts/boot/initramfs-tools.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-misc-helpers.sh (renamed from scripts/boot/misc-helpers.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-mount-cifs.sh (renamed from scripts/boot/mount-cifs.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-mount-http.sh (renamed from scripts/boot/mount-http.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-mount-iscsi.sh (renamed from scripts/boot/mount-iscsi.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-mount-nfs.sh (renamed from scripts/boot/mount-nfs.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-mountroot.sh (renamed from scripts/boot/mountroot.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-netbase.sh (renamed from scripts/boot/netbase.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-netboot.sh (renamed from scripts/boot/netboot.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-networking.sh (renamed from scripts/boot/networking.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-overlay.sh (renamed from scripts/boot/overlay.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-read-only.sh (renamed from scripts/boot/read-only.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-select-eth-device.sh (renamed from scripts/boot/select-eth-device.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-swapon.sh (renamed from scripts/boot/swapon.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-toram-todisk.sh (renamed from scripts/boot/toram-todisk.sh) | 0 | ||||
-rwxr-xr-x | scripts/boot/9990-verify-checksums.sh (renamed from scripts/boot/verify-checksums.sh) | 0 |
20 files changed, 58 insertions, 57 deletions
diff --git a/scripts/boot.sh b/scripts/boot.sh index 9539496..c031f00 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -2,66 +2,10 @@ # set -e -if [ -e /scripts/functions ] -then - # initramfs-tools specific (FIXME) - . /scripts/functions -fi - -for _SCRIPT in /lib/live/boot/* +for _SCRIPT in /lib/live/boot/????-* do if [ -e "${_SCRIPT}" ] then . ${_SCRIPT} fi done - -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 -echo "/root/usr/lib" >> /etc/ld.so.conf - -mountpoint="/live/image" -alt_mountpoint="/media" -LIVE_MEDIA_PATH="live" - -HOSTNAME="host" - -mkdir -p "${mountpoint}" -tried="/tmp/tried" - -# Create /etc/mtab for debug purpose and future syncs -if [ ! -d /etc ] -then - mkdir /etc/ -fi - -if [ ! -f /etc/mtab ] -then - touch /etc/mtab -fi - -if [ ! -x "/bin/fstype" ] -then - # klibc not in path -> not in initramfs - export PATH="${PATH}:/usr/lib/klibc/bin" -fi - -# handle upgrade path from old udev (using udevinfo) to -# recent versions of udev (using udevadm info) -if [ -x /sbin/udevadm ] -then - udevinfo='/sbin/udevadm info' -else - udevinfo='udevinfo' -fi - -old_root_overlay_label="live-rw" -old_home_overlay_label="home-rw" -custom_overlay_label="persistence" -persistence_list="live-persistence.conf" - -if [ ! -f /live.vars ] -then - touch /live.vars -fi diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh new file mode 100755 index 0000000..77a291a --- /dev/null +++ b/scripts/boot/9990-aaa-fixme.sh @@ -0,0 +1,57 @@ +#!/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 +echo "/root/usr/lib" >> /etc/ld.so.conf + +mountpoint="/live/image" +alt_mountpoint="/media" +LIVE_MEDIA_PATH="live" + +HOSTNAME="host" + +mkdir -p "${mountpoint}" +tried="/tmp/tried" + +# Create /etc/mtab for debug purpose and future syncs +if [ ! -d /etc ] +then + mkdir /etc/ +fi + +if [ ! -f /etc/mtab ] +then + touch /etc/mtab +fi + +if [ ! -x "/bin/fstype" ] +then + # klibc not in path -> not in initramfs + export PATH="${PATH}:/usr/lib/klibc/bin" +fi + +# handle upgrade path from old udev (using udevinfo) to +# recent versions of udev (using udevadm info) +if [ -x /sbin/udevadm ] +then + udevinfo='/sbin/udevadm info' +else + udevinfo='udevinfo' +fi + +old_root_overlay_label="live-rw" +old_home_overlay_label="home-rw" +custom_overlay_label="persistence" +persistence_list="live-persistence.conf" + +if [ ! -f /live.vars ] +then + touch /live.vars +fi diff --git a/scripts/boot/cmdline.sh b/scripts/boot/9990-cmdline.sh index a3781da..a3781da 100755 --- a/scripts/boot/cmdline.sh +++ b/scripts/boot/9990-cmdline.sh diff --git a/scripts/boot/fstab.sh b/scripts/boot/9990-fstab.sh index 7f5459f..7f5459f 100755 --- a/scripts/boot/fstab.sh +++ b/scripts/boot/9990-fstab.sh diff --git a/scripts/boot/initramfs-tools.sh b/scripts/boot/9990-initramfs-tools.sh index 37aa0c3..37aa0c3 100755 --- a/scripts/boot/initramfs-tools.sh +++ b/scripts/boot/9990-initramfs-tools.sh diff --git a/scripts/boot/misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index cc39fcb..cc39fcb 100755 --- a/scripts/boot/misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh diff --git a/scripts/boot/mount-cifs.sh b/scripts/boot/9990-mount-cifs.sh index a8ef3f4..a8ef3f4 100755 --- a/scripts/boot/mount-cifs.sh +++ b/scripts/boot/9990-mount-cifs.sh diff --git a/scripts/boot/mount-http.sh b/scripts/boot/9990-mount-http.sh index 1b718c0..1b718c0 100755 --- a/scripts/boot/mount-http.sh +++ b/scripts/boot/9990-mount-http.sh diff --git a/scripts/boot/mount-iscsi.sh b/scripts/boot/9990-mount-iscsi.sh index fd29d91..fd29d91 100755 --- a/scripts/boot/mount-iscsi.sh +++ b/scripts/boot/9990-mount-iscsi.sh diff --git a/scripts/boot/mount-nfs.sh b/scripts/boot/9990-mount-nfs.sh index 6a3ae55..6a3ae55 100755 --- a/scripts/boot/mount-nfs.sh +++ b/scripts/boot/9990-mount-nfs.sh diff --git a/scripts/boot/mountroot.sh b/scripts/boot/9990-mountroot.sh index 2d14e4d..2d14e4d 100755 --- a/scripts/boot/mountroot.sh +++ b/scripts/boot/9990-mountroot.sh diff --git a/scripts/boot/netbase.sh b/scripts/boot/9990-netbase.sh index 3f5f7af..3f5f7af 100755 --- a/scripts/boot/netbase.sh +++ b/scripts/boot/9990-netbase.sh diff --git a/scripts/boot/netboot.sh b/scripts/boot/9990-netboot.sh index 5054fb8..5054fb8 100755 --- a/scripts/boot/netboot.sh +++ b/scripts/boot/9990-netboot.sh diff --git a/scripts/boot/networking.sh b/scripts/boot/9990-networking.sh index 8c8d840..8c8d840 100755 --- a/scripts/boot/networking.sh +++ b/scripts/boot/9990-networking.sh diff --git a/scripts/boot/overlay.sh b/scripts/boot/9990-overlay.sh index cb12c4b..cb12c4b 100755 --- a/scripts/boot/overlay.sh +++ b/scripts/boot/9990-overlay.sh diff --git a/scripts/boot/read-only.sh b/scripts/boot/9990-read-only.sh index 48aa06c..48aa06c 100755 --- a/scripts/boot/read-only.sh +++ b/scripts/boot/9990-read-only.sh diff --git a/scripts/boot/select-eth-device.sh b/scripts/boot/9990-select-eth-device.sh index ed1da6f..ed1da6f 100755 --- a/scripts/boot/select-eth-device.sh +++ b/scripts/boot/9990-select-eth-device.sh diff --git a/scripts/boot/swapon.sh b/scripts/boot/9990-swapon.sh index 158d81b..158d81b 100755 --- a/scripts/boot/swapon.sh +++ b/scripts/boot/9990-swapon.sh diff --git a/scripts/boot/toram-todisk.sh b/scripts/boot/9990-toram-todisk.sh index 2643eb8..2643eb8 100755 --- a/scripts/boot/toram-todisk.sh +++ b/scripts/boot/9990-toram-todisk.sh diff --git a/scripts/boot/verify-checksums.sh b/scripts/boot/9990-verify-checksums.sh index 7dd5da3..7dd5da3 100755 --- a/scripts/boot/verify-checksums.sh +++ b/scripts/boot/9990-verify-checksums.sh |