diff options
Diffstat (limited to 'scripts/build')
-rwxr-xr-x | scripts/build/lb_binary_grub | 8 | ||||
-rwxr-xr-x | scripts/build/lb_binary_grub2 | 8 | ||||
-rwxr-xr-x | scripts/build/lb_binary_linux-image | 8 | ||||
-rwxr-xr-x | scripts/build/lb_binary_manifest | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_memtest | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_net | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_rootfs | 2 | ||||
-rwxr-xr-x | scripts/build/lb_binary_silo | 6 | ||||
-rwxr-xr-x | scripts/build/lb_binary_yaboot | 8 | ||||
-rwxr-xr-x | scripts/build/lb_chroot_hacks | 4 | ||||
-rwxr-xr-x | scripts/build/lb_chroot_linux-image | 2 | ||||
-rwxr-xr-x | scripts/build/lb_config | 2 |
12 files changed, 27 insertions, 27 deletions
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index e6662fa28..d75b800db 100755 --- a/scripts/build/lb_binary_grub +++ b/scripts/build/lb_binary_grub @@ -122,7 +122,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac @@ -135,7 +135,7 @@ case "${LB_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -163,7 +163,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -179,7 +179,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 34043cadf..5db05fe43 100755 --- a/scripts/build/lb_binary_grub2 +++ b/scripts/build/lb_binary_grub2 @@ -96,7 +96,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac @@ -109,7 +109,7 @@ case "${LB_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -137,7 +137,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -153,7 +153,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image index ff82c8686..6fd43113b 100755 --- a/scripts/build/lb_binary_linux-image +++ b/scripts/build/lb_binary_linux-image @@ -48,7 +48,7 @@ case "${LB_INITRAMFS}" in DESTDIR="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR="binary/live" ;; @@ -77,10 +77,10 @@ cp chroot/boot/"${LINUX}"-* "${DESTDIR}" cp chroot/boot/initrd.img-* "${DESTDIR}" case "${LB_INITRAMFS}" in - live-initramfs|live-boot) - if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ] + live-boot) + if [ -e chroot/usr/share/doc/live-boot/parameters.txt ] then - cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt + cp chroot/usr/share/doc/live-boot/parameters.txt "${DESTDIR}"/parameters fi ;; esac diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest index 1c50f5804..ffa46b184 100755 --- a/scripts/build/lb_binary_manifest +++ b/scripts/build/lb_binary_manifest @@ -49,7 +49,7 @@ case "${LB_INITRAMFS}" in SUFFIX="manifest" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" SUFFIX="packages" ;; diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest index fade917b8..4572a5f99 100755 --- a/scripts/build/lb_binary_memtest +++ b/scripts/build/lb_binary_memtest @@ -84,7 +84,7 @@ case "${LB_INITRAMFS}" in DESTDIR="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR="binary/live" ;; esac diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_net index fd2770ebe..9d5e01cef 100755 --- a/scripts/build/lb_binary_net +++ b/scripts/build/lb_binary_net @@ -66,7 +66,7 @@ then ORIGDIR="binary/casper" ;; - live-initramfs|live-boot) + live-boot) ORIGDIR="binary/live" ;; esac diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index b2dabe4ce..22aa430d1 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -53,7 +53,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index 653e0f405..104d864c5 100755 --- a/scripts/build/lb_binary_silo +++ b/scripts/build/lb_binary_silo @@ -113,7 +113,7 @@ case "${LB_INITRAMFS}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" DESTDIR_LIVE="binary/live" ;; @@ -130,7 +130,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -146,7 +146,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index bfbb58a30..1e54e0c26 100755 --- a/scripts/build/lb_binary_yaboot +++ b/scripts/build/lb_binary_yaboot @@ -129,7 +129,7 @@ case "${LB_INITRAMFS}" in INITFS="casper" ;; - live-initramfs|live-boot) + live-boot) INITFS="live" ;; esac @@ -142,7 +142,7 @@ case "${LB_BINARY_IMAGES}" in DESTDIR_LIVE="binary/casper" ;; - live-initramfs|live-boot) + live-boot) DESTDIR_LIVE="binary/live" ;; esac @@ -169,7 +169,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_USERNAME}" != "user" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" @@ -185,7 +185,7 @@ then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; - live-initramfs|live-boot) + live-boot) if [ "${LB_HOSTNAME}" != "debian" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index d5a7d7fbc..47524dbdc 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -163,7 +163,7 @@ case "${LB_INITRAMFS}" in UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1" ;; - live-initramfs|live-boot) + live-boot) #UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1" ;; esac @@ -198,7 +198,7 @@ case "${LB_INITRAMFS}" in ID="999" ;; - live-initramfs|live-boot) + live-boot) ID="1000" ;; esac diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 507f3859d..b72ffb6b2 100755 --- a/scripts/build/lb_chroot_linux-image +++ b/scripts/build/lb_chroot_linux-image @@ -55,7 +55,7 @@ EOF # Diverting update-initramfs #case "${LB_INITRAMFS}" in - # live-initramfs|live-boot) + # live-boot) # mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build # ;; #esac diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 484b3a330..e61c86550 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -76,7 +76,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--hostname NAME]\n\ \t [--ignore-system-defaults]\n\ \t [--includes PATH|none]\n\ -\t [--initramfs auto|none|live-boot|live-initramfs|casper]\n\ +\t [--initramfs auto|none|live-boot|casper]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ \t [--iso-application NAME]\n\ |