diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-01-15 08:25:29 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:35:39 +0100 |
| commit | 342d2870ebe66fc987bbb6523c67885631eb0e00 (patch) | |
| tree | 6d9332db2197bb7b54e3e3b97f83474cd2430e56 /helpers/lh_binary_yaboot | |
| parent | e8e4001524ee6fa47ce7ffe06da39b6d43e065d2 (diff) | |
| download | vyos-live-build-342d2870ebe66fc987bbb6523c67885631eb0e00.tar.gz vyos-live-build-342d2870ebe66fc987bbb6523c67885631eb0e00.zip | |
Consistently using the pipe as seperator in sed commands now.
Diffstat (limited to 'helpers/lh_binary_yaboot')
| -rwxr-xr-x | helpers/lh_binary_yaboot | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index b02b2210e..2c51a662f 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -197,7 +197,7 @@ then LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot" fi -LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //')" +LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')" # Parameters are listed at: linux/Documentation/kernel-parameters.txt FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly" @@ -207,7 +207,7 @@ FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=ofonly" # Default entries DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')" DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})" -DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's/vmlinux-//')" +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}" @@ -217,7 +217,7 @@ then for KERNEL in chroot/boot/vmlinux-* do KERNEL_IMAGE="$(basename ${KERNEL})" - KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's/vmlinux-//')" + KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinux-||')" INITRD="initrd.img-${KERNEL_VERSION}" Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}" @@ -225,7 +225,7 @@ then done fi -LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g')" +LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')" # Assembling debian-installer configuration if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] @@ -249,7 +249,7 @@ then Yaboot_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}" fi -LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g')" +LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')" case "${LH_BINARY_IMAGES}" in iso|usb-hdd) @@ -277,9 +277,9 @@ case "${LH_BINARY_IMAGES}" in fi # 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|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 ;; esac |