syslinux splash bug, probable cause
Hello all,
live-helper-1.0-a37 allowed for provision of a custom syslinux splash. The
current git version, and I believe a38, do not allow for this. A diff
between lh_binary_syslinux from live-helper-1.0-a37 and current git shows
the following. I believe that the current version has problems with the way
sed is being used.
Michael
90c90
< MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
---
> MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's#//#/#g')"
185c185
< MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed
's|default\s*.*/\(.*menu.c32\)$|\1|g')
---
> MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/header.cfg | sed
's,default\s*.*/\(.*menu.c32\)$,\1,g')
257,269c257,269
< sed -i -e "s|{\$LINUX_LIVE}|${LINUX_LIVE}|" \
< -e "s|{\$LINUX_INSTALL}|${LINUX_INSTALL}|" \
< -e "s|{\$MEMTEST}|${MEMTEST}|" \
< -e "s|{\$LIVE_SCREEN_PATH}|${LIVE_SCREEN_PATH}|" \
< -e "s|{\$LIVE_DATA_PATH}|${LIVE_DATA_PATH}|" \
< -e "s|{\$LIVE_KERNEL_PATH}|${LIVE_KERNEL_PATH}|" \
< -e "s|{\$SPLASH}@|{SPLASH}|" \
< -e "s|{\$LH_DISTRIBUTION}|${LH_DISTRIBUTION}|" \
< -e "s|{\$LH_DATE}|$(date +%Y%m%d)|" \
< -e "s|{\$LH_MEDIA}|${MEDIA}|" \
< -e "s|{\$LH_VERSION}|${VERSION}|" \
< -e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
< -e 's|\ $||g' \
---
> sed -i -e "s@{\$LINUX_LIVE}@${LINUX_LIVE}@" \
> -e "s@{\$LINUX_INSTALL}@${LINUX_INSTALL}@" \
> -e "s@{\$MEMTEST}@${MEMTEST}@" \
> -e "s@{\$LIVE_SCREEN_PATH}@${LIVE_SCREEN_PATH}@" \
> -e "s@{\$LIVE_DATA_PATH}@${LIVE_DATA_PATH}@" \
> -e "s@{\$LIVE_KERNEL_PATH}@${LIVE_KERNEL_PATH}@" \
> -e "s@{\$SPLASH}@${SPLASH}@" \
> -e "s/{\$LH_DISTRIBUTION}/${LH_DISTRIBUTION}/" \
> -e "s/{\$LH_DATE}/$(date +%Y%m%d)/" \
> -e "s/{\$LH_MEDIA}/${MEDIA}/" \
> -e "s/{\$LH_VERSION}/${VERSION}/" \
> -e "s/{\$LH_SYSLINUX_TIMEOUT}/${LH_SYSLINUX_TIMEOUT}0/" \
> -e 's/\ $//g' \
303c303
< sed -i -e 's|/||' ${FILE}
---
> sed -i -e 's@/@@' ${FILE}
471c471
< LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's| ||')"
---
> LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's/ //')"
487c487
< DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e
's|vmlinuz-||')"
---
> DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e
's/vmlinuz-//')"
498c498
< FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e
's|vmlinuz-||')"
---
> FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e
's/vmlinuz-//')"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.alioth.debian.org/pipermail/debian-live-devel/attachments/20080227/c35ec274/attachment.htm
Reply to: