diff options
Diffstat (limited to 'scripts/build/binary_yaboot')
| -rwxr-xr-x | scripts/build/binary_yaboot | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot index 4ba0b27f1..44b0bde97 100755 --- a/scripts/build/binary_yaboot +++ b/scripts/build/binary_yaboot @@ -11,7 +11,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh +. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'installs yaboot into binary')" @@ -24,7 +24,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_BOOTLOADER}" != "yaboot" ] +if [ "${LB_BOOTLOADER}" != "yaboot" ] then exit 0 fi @@ -72,7 +72,7 @@ Yaboot_live_entry () LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n" + LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" } @@ -119,12 +119,12 @@ Yaboot_install_entry () LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n" LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${TYPE}${TYPE_SUFFIX}\n" LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\"\n" + LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LB_BOOTAPPEND_INSTALL}\"\n" LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n" done } -case "${LH_INITRAMFS}" in +case "${LB_INITRAMFS}" in casper) INITFS="casper" ;; @@ -135,9 +135,9 @@ case "${LH_INITRAMFS}" in esac # Setting destination directory -case "${LH_BINARY_IMAGES}" in +case "${LB_BINARY_IMAGES}" in iso*) - case "${LH_INITRAMFS}" in + case "${LB_INITRAMFS}" in casper) DESTDIR_LIVE="binary/casper" ;; @@ -162,63 +162,63 @@ Check_multiarchitecture mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters -case "${LH_ENCRYPTION}" in +case "${LB_ENCRYPTION}" in ""|false) ;; *) - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} encryption=${LB_ENCRYPTION}" ;; esac -if [ -n "${LH_USERNAME}" ] +if [ -n "${LB_USERNAME}" ] then - case "${LH_INITRAMFS}" in + case "${LB_INITRAMFS}" in casper) - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" ;; live-initramfs|live-boot) - if [ "${LH_USERNAME}" != "user" ] + if [ "${LB_USERNAME}" != "user" ] then - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}" fi ;; esac fi -if [ -n "${LH_HOSTNAME}" ] +if [ -n "${LB_HOSTNAME}" ] then - case "${LH_INITRAMFS}" in + case "${LB_INITRAMFS}" in casper) - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" ;; live-initramfs|live-boot) - if [ "${LH_HOSTNAME}" != "debian" ] + if [ "${LB_HOSTNAME}" != "debian" ] then - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} hostname=${LB_HOSTNAME}" fi ;; esac fi -if [ "${LH_UNION_FILESYSTEM}" != "aufs" ] +if [ "${LB_UNION_FILESYSTEM}" != "aufs" ] then - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}" fi -if [ -n "${LH_NET_COW_PATH}" ] +if [ -n "${LB_NET_COW_PATH}" ] then Echo_error "Net cow not yet supported on yaboot" exit 1 fi -if [ "${LH_EXPOSED_ROOT}" != "false" ] +if [ "${LB_EXPOSED_ROOT}" != "false" ] then - LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" + LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot" fi -LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')" +LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')" # Parameters are listed at: linux/Documentation/kernel-parameters.txt FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly" @@ -226,14 +226,14 @@ FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly" # Assembling kernel configuration # Default entries -DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')" +DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')" DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})" DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')" Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}" -if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ] +if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ] then for KERNEL in chroot/boot/vmlinux-* do @@ -249,7 +249,7 @@ fi LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')" # Assembling debian-installer configuration -if [ "${LH_DEBIAN_INSTALLER}" != "false" ] +if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then VMLINUZ_DI="vmlinuz" INITRD_DI="initrd.gz" @@ -272,12 +272,12 @@ fi LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')" -case "${LH_BINARY_IMAGES}" in +case "${LB_BINARY_IMAGES}" in iso*|usb*) # Copying yaboot mkdir -p binary/yaboot - case "${LH_BUILD_WITH_CHROOT}" in + case "${LB_BUILD_WITH_CHROOT}" in true) cp chroot/usr/lib/yaboot/yaboot binary/yaboot ;; @@ -289,7 +289,7 @@ case "${LH_BINARY_IMAGES}" in cp -r "${TEMPLATES}"/* binary/yaboot - case "${LH_BINARY_IMAGES}" in + case "${LB_BINARY_IMAGES}" in usb*) mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp echo "root=/dev/ram" > binary/yaboot/yaboot.conf @@ -300,8 +300,8 @@ case "${LH_BINARY_IMAGES}" in # Configure yaboot templates sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf - sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf - sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" -e "s|LH_VERSION|${VERSION}|" binary/yaboot/boot.msg + sed -i -e "s|LB_BOOTAPPEND_INSTALL|${LB_BOOTAPPEND_INSTALL}|" -e "s|LB_BOOTAPPEND_LIVE|${LB_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf + sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" -e "s|LB_VERSION|${VERSION}|" binary/yaboot/boot.msg ;; esac |