X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot.sh;h=67585f9c9558795a5bc2c6fb3cc9e4f3c01d43f9;hb=795263e539a2be0dab9903968d323bef223a1b7a;hp=e8b7626539669329aae8b60464e539c22550e7fc;hpb=e243babf191d5b42efe58e90e74a22bd8063be8d;p=live-boot-grml.git

diff --git a/scripts/boot.sh b/scripts/boot.sh
index e8b7626..67585f9 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -2,66 +2,19 @@
 
 # set -e
 
-if [ -e /scripts/functions ]
-then
-	# initramfs-tools specific (FIXME)
-	. /scripts/functions
-fi
+# Reading configuration file from filesystem and live-media
+for _FILE in /etc/live/boot.conf /etc/live/boot/*
+do
+	if [ -e "${_FILE}" ]
+	then
+		. "${_FILE}"
+	fi
+done
 
-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="custom-ov"
-persistence_list="live-persistence.conf"
-
-if [ ! -f /live.vars ]
-then
-	touch /live.vars
-fi