diff options
author | Eric Hameleers <alien@slackware.com> | 2016-12-16 08:45:16 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-12-16 08:45:16 +0100 |
commit | 9ab06cd37b8b41d9a5cf978cddc95a0e72abe0e7 (patch) | |
tree | 493d7f1927e47535fd46f6fc325a504592075c04 /make_slackware_live.sh | |
parent | 875f345a85e25e6fa1b29c2d096478bcd7a02bfd (diff) | |
download | liveslak-9ab06cd37b8b41d9a5cf978cddc95a0e72abe0e7.tar.gz liveslak-9ab06cd37b8b41d9a5cf978cddc95a0e72abe0e7.tar.xz |
(e)liloconfig: only try to patch these scripts if they are contained in the ISO.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-x | make_slackware_live.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 7cee8e3..d2856d6 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1348,8 +1348,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: |