summaryrefslogtreecommitdiffstats
path: root/make_slackware_live.sh
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-05-09 21:12:17 +0200
committer Eric Hameleers <alien@slackware.com>2017-05-09 21:12:17 +0200
commitf42eb5d03f856af2cf57ef0c637ebd0476237a5b (patch)
tree5b5cc67beb3a306dbd73e2fa990ac8c335782c77 /make_slackware_live.sh
parente6b397148603121d6ff099c3a71746f1360d35da (diff)
downloadliveslak-f42eb5d03f856af2cf57ef0c637ebd0476237a5b.tar.gz
liveslak-f42eb5d03f856af2cf57ef0c637ebd0476237a5b.tar.xz
eliloconfig patch needs to be made release-specific
The script started to diverge in -current, and the patch would no longer apply.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-xmake_slackware_live.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 6f97b38..0309a47 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1419,10 +1419,20 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then
fi
done
if [ -f ${LIVE_ROOTDIR}/sbin/liloconfig ]; then
- patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/liloconfig.patch
+ if [ -f ${LIVE_TOOLDIR}/patches/liloconfig_${SL_VERSION}.patch ]; then
+ LILOPATCH=liloconfig_${SL_VERSION}.patch
+ else
+ LILOPATCH=liloconfig.patch
+ fi
+ patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/${LILOPATCH}
fi
if [ -f ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ]; then
- patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/eliloconfig.patch
+ if [ -f ${LIVE_TOOLDIR}/patches/eliloconfig_${SL_VERSION}.patch ]; then
+ ELILOPATCH=eliloconfig_${SL_VERSION}.patch
+ else
+ ELILOPATCH=eliloconfig.patch
+ fi
+ patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/${ELILOPATCH}
fi
# Fix some occurrences of '/usr/lib/setup/' that 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}/*