X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot.sh;h=0b18a9c0dd21843c8c4887910fabad05231e805d;hb=6d3f4fd5557f5efc83c42374417f4a05e99d3744;hp=5d4a20dfd7f604251e6e3f85460febabe17a5ce0;hpb=c48696a0ebe9ffc938b84b921db90ac620339a52;p=live-boot-grml.git diff --git a/scripts/boot.sh b/scripts/boot.sh index 5d4a20d..0b18a9c 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -35,7 +35,28 @@ then touch /etc/mtab fi -. /scripts/live-helpers +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="custom-ov" +root_snapshot_label="live-sn" +old_root_snapshot_label="live-sn" +home_snapshot_label="home-sn" +persistence_list="live-persistence.conf" if [ ! -f /live.vars ] then