[SCM] live-boot branch, debian-next, updated. debian/3.0_a35-1-10-g31014e0

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 93f4e78a9d89781f0d39a07e7c1c59410c2d3173
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jul 2 17:40:11 2012 +0200

    Renaming boot scripts for refactoring them into numbered plugins.

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.sh b/scripts/boot/9990-aaa-fixme.sh
similarity index 91%
copy from scripts/boot.sh
copy to scripts/boot/9990-aaa-fixme.sh
index 9539496..77a291a 100755
--- a/scripts/boot.sh
+++ b/scripts/boot/9990-aaa-fixme.sh
@@ -1,21 +1,11 @@
 #!/bin/sh
 
-# set -e
-
 if [ -e /scripts/functions ]
 then
 	# initramfs-tools specific (FIXME)
 	. /scripts/functions
 fi
 
-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
diff --git a/scripts/boot/cmdline.sh b/scripts/boot/9990-cmdline.sh
similarity index 100%
rename from scripts/boot/cmdline.sh
rename to scripts/boot/9990-cmdline.sh
diff --git a/scripts/boot/fstab.sh b/scripts/boot/9990-fstab.sh
similarity index 100%
rename from scripts/boot/fstab.sh
rename to scripts/boot/9990-fstab.sh
diff --git a/scripts/boot/initramfs-tools.sh b/scripts/boot/9990-initramfs-tools.sh
similarity index 100%
rename from scripts/boot/initramfs-tools.sh
rename to scripts/boot/9990-initramfs-tools.sh
diff --git a/scripts/boot/misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
similarity index 100%
rename from scripts/boot/misc-helpers.sh
rename to scripts/boot/9990-misc-helpers.sh
diff --git a/scripts/boot/mount-cifs.sh b/scripts/boot/9990-mount-cifs.sh
similarity index 100%
rename from scripts/boot/mount-cifs.sh
rename to scripts/boot/9990-mount-cifs.sh
diff --git a/scripts/boot/mount-http.sh b/scripts/boot/9990-mount-http.sh
similarity index 100%
rename from scripts/boot/mount-http.sh
rename to scripts/boot/9990-mount-http.sh
diff --git a/scripts/boot/mount-iscsi.sh b/scripts/boot/9990-mount-iscsi.sh
similarity index 100%
rename from scripts/boot/mount-iscsi.sh
rename to scripts/boot/9990-mount-iscsi.sh
diff --git a/scripts/boot/mount-nfs.sh b/scripts/boot/9990-mount-nfs.sh
similarity index 100%
rename from scripts/boot/mount-nfs.sh
rename to scripts/boot/9990-mount-nfs.sh
diff --git a/scripts/boot/mountroot.sh b/scripts/boot/9990-mountroot.sh
similarity index 100%
rename from scripts/boot/mountroot.sh
rename to scripts/boot/9990-mountroot.sh
diff --git a/scripts/boot/netbase.sh b/scripts/boot/9990-netbase.sh
similarity index 100%
rename from scripts/boot/netbase.sh
rename to scripts/boot/9990-netbase.sh
diff --git a/scripts/boot/netboot.sh b/scripts/boot/9990-netboot.sh
similarity index 100%
rename from scripts/boot/netboot.sh
rename to scripts/boot/9990-netboot.sh
diff --git a/scripts/boot/networking.sh b/scripts/boot/9990-networking.sh
similarity index 100%
rename from scripts/boot/networking.sh
rename to scripts/boot/9990-networking.sh
diff --git a/scripts/boot/overlay.sh b/scripts/boot/9990-overlay.sh
similarity index 100%
rename from scripts/boot/overlay.sh
rename to scripts/boot/9990-overlay.sh
diff --git a/scripts/boot/read-only.sh b/scripts/boot/9990-read-only.sh
similarity index 100%
rename from scripts/boot/read-only.sh
rename to scripts/boot/9990-read-only.sh
diff --git a/scripts/boot/select-eth-device.sh b/scripts/boot/9990-select-eth-device.sh
similarity index 100%
rename from scripts/boot/select-eth-device.sh
rename to scripts/boot/9990-select-eth-device.sh
diff --git a/scripts/boot/swapon.sh b/scripts/boot/9990-swapon.sh
similarity index 100%
rename from scripts/boot/swapon.sh
rename to scripts/boot/9990-swapon.sh
diff --git a/scripts/boot/toram-todisk.sh b/scripts/boot/9990-toram-todisk.sh
similarity index 100%
rename from scripts/boot/toram-todisk.sh
rename to scripts/boot/9990-toram-todisk.sh
diff --git a/scripts/boot/verify-checksums.sh b/scripts/boot/9990-verify-checksums.sh
similarity index 100%
rename from scripts/boot/verify-checksums.sh
rename to scripts/boot/9990-verify-checksums.sh

-- 
live-boot