From 7b8b1e3dfebefe6afe5ddaf28e7b4a36afb0d4ea Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 16 Dec 2016 08:45:16 +0100 Subject: (e)liloconfig: only try to patch these scripts if they are contained in the ISO. --- make_slackware_live.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make_slackware_live.sh b/make_slackware_live.sh index a2817e9..260359d 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1353,8 +1353,12 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then cd - 1>/dev/null # Fix some occurrences of '/mnt' that should not be used in the Live ISO: sed -i -e 's, /mnt, ${T_PX},g' -e 's,=/mnt/,=${T_PX}/,g' -e 's,T_PX=/mnt,T_PX=/setup2hd,g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* - patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/liloconfig.patch - patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/eliloconfig.patch + if [ -f ${LIVE_ROOTDIR}/sbin/liloconfig ]; then + patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/liloconfig.patch + fi + if [ -f ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ]; then + patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/eliloconfig.patch + fi # Fix some occurrences of '/usr/lib/setup/' are covered by $PATH: sed -i -e 's,/usr/lib/setup/,,g' -e 's,:/usr/lib/setup,:/usr/share/${LIVEMAIN},g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* # Add the Slackware Live HD installer: -- cgit v1.2.3