diff options
author | Daniel Baumann <daniel@debian.org> | 2010-09-04 12:52:01 +0200 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2010-09-04 12:52:01 +0200 |
commit | 09c9c6b8a1abce5c0c4400b2933ca2f6cde0ae2e (patch) | |
tree | 101a64feed0d65f0148c96694403d50093bc2f6b | |
parent | 256a7cffea2d898bab52e71f1b0bbf9a7e77c2de (diff) | |
download | vyos-live-build-09c9c6b8a1abce5c0c4400b2933ca2f6cde0ae2e.tar.gz vyos-live-build-09c9c6b8a1abce5c0c4400b2933ca2f6cde0ae2e.zip |
Adding support for standalone live-boot as initramfs generator.
-rwxr-xr-x | scripts/build/binary_encryption | 2 | ||||
-rwxr-xr-x | scripts/build/binary_grub | 8 | ||||
-rwxr-xr-x | scripts/build/binary_grub2 | 8 | ||||
-rwxr-xr-x | scripts/build/binary_linux-image | 4 | ||||
-rwxr-xr-x | scripts/build/binary_manifest | 2 | ||||
-rwxr-xr-x | scripts/build/binary_memtest | 2 | ||||
-rwxr-xr-x | scripts/build/binary_net | 2 | ||||
-rwxr-xr-x | scripts/build/binary_rootfs | 2 | ||||
-rwxr-xr-x | scripts/build/binary_silo | 6 | ||||
-rwxr-xr-x | scripts/build/binary_syslinux | 6 | ||||
-rwxr-xr-x | scripts/build/binary_yaboot | 8 | ||||
-rwxr-xr-x | scripts/build/chroot_hacks | 10 | ||||
-rwxr-xr-x | scripts/build/chroot_linux-image | 9 |
13 files changed, 35 insertions, 34 deletions
diff --git a/scripts/build/binary_encryption b/scripts/build/binary_encryption index 02732fa76..79b556d48 100755 --- a/scripts/build/binary_encryption +++ b/scripts/build/binary_encryption @@ -70,7 +70,7 @@ case "${LH_INITRAMFS}" in INITFS="casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" ;; esac diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub index b58b189c9..1597b3cf1 100755 --- a/scripts/build/binary_grub +++ b/scripts/build/binary_grub @@ -122,7 +122,7 @@ case "${LH_INITRAMFS}" in INITFS="casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" ;; esac @@ -135,7 +135,7 @@ case "${LH_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -171,7 +171,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_USERNAME}" != "user" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" @@ -187,7 +187,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_HOSTNAME}" != "debian" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2 index 33f7ebb6e..3813c7629 100755 --- a/scripts/build/binary_grub2 +++ b/scripts/build/binary_grub2 @@ -96,7 +96,7 @@ case "${LH_INITRAMFS}" in INITFS="casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" ;; esac @@ -109,7 +109,7 @@ case "${LH_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -145,7 +145,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_USERNAME}" != "user" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" @@ -161,7 +161,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_HOSTNAME}" != "debian" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index 70dd60b42..e6b162902 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -48,7 +48,7 @@ case "${LH_INITRAMFS}" in DESTDIR="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) DESTDIR="binary/live" ;; @@ -77,7 +77,7 @@ cp chroot/boot/"${LINUX}"-* "${DESTDIR}" cp chroot/boot/initrd.img-* "${DESTDIR}" case "${LH_INITRAMFS}" in - live-initramfs) + live-initramfs|live-boot) if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ] then cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest index 126931a8c..2c57cfd1d 100755 --- a/scripts/build/binary_manifest +++ b/scripts/build/binary_manifest @@ -49,7 +49,7 @@ case "${LH_INITRAMFS}" in SUFFIX="manifest" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" SUFFIX="packages" ;; diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 1aec885e0..a1dad4550 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -84,7 +84,7 @@ case "${LH_INITRAMFS}" in DESTDIR="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) DESTDIR="binary/live" ;; esac diff --git a/scripts/build/binary_net b/scripts/build/binary_net index 33cbb10d8..6f7f94bd0 100755 --- a/scripts/build/binary_net +++ b/scripts/build/binary_net @@ -66,7 +66,7 @@ then ORIGDIR="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) ORIGDIR="binary/live" ;; esac diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 7b44be550..65cec1869 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -53,7 +53,7 @@ case "${LH_INITRAMFS}" in INITFS="casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" ;; esac diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo index 293066bb9..b187c2c67 100755 --- a/scripts/build/binary_silo +++ b/scripts/build/binary_silo @@ -113,7 +113,7 @@ case "${LH_INITRAMFS}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" DESTDIR_LIVE="binary/live" ;; @@ -138,7 +138,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_USERNAME}" != "user" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" @@ -154,7 +154,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_HOSTNAME}" != "debian" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 5379c50e7..ae74641f1 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -357,7 +357,7 @@ case "${LH_INITRAMFS}" in INITFS="casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" ;; esac @@ -424,7 +424,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_USERNAME}" != "user" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" @@ -440,7 +440,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_HOSTNAME}" != "debian" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot index 98cab4313..4ba0b27f1 100755 --- a/scripts/build/binary_yaboot +++ b/scripts/build/binary_yaboot @@ -129,7 +129,7 @@ case "${LH_INITRAMFS}" in INITFS="casper" ;; - live-initramfs) + live-initramfs|live-boot) INITFS="live" ;; esac @@ -142,7 +142,7 @@ case "${LH_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs) + live-initramfs|live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -177,7 +177,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_USERNAME}" != "user" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" @@ -193,7 +193,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" ;; - live-initramfs) + live-initramfs|live-boot) if [ "${LH_HOSTNAME}" != "debian" ] then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks index 4417e332a..eb89021bc 100755 --- a/scripts/build/chroot_hacks +++ b/scripts/build/chroot_hacks @@ -159,13 +159,13 @@ esac # Update initramfs (always, because of udev rules in initrd) case "${LH_INITRAMFS}" in - live-initramfs) - #UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1" - ;; - casper) UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1" ;; + + live-initramfs|live-boot) + #UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1" + ;; esac Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u" @@ -198,7 +198,7 @@ case "${LH_INITRAMFS}" in ID="999" ;; - *) + live-initramfs|live-boot) ID="1000" ;; esac diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image index 7b20232b2..da8229f71 100755 --- a/scripts/build/chroot_linux-image +++ b/scripts/build/chroot_linux-image @@ -54,10 +54,11 @@ warn_initrd = No EOF # Diverting update-initramfs - #if [ "${LH_INITRAMFS}" = "live-initramfs" ] - #then - # mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build - #fi + #case "${LH_INITRAMFS}" in + # live-initramfs|live-boot) + # mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build + # ;; + #esac if [ "${LH_LINUX_PACKAGES}" != "none" ] then |