summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-01-23 14:33:46 +0100
committer Eric Hameleers <alien@slackware.com>2017-01-23 14:33:46 +0100
commitdce5d0d1da24641670b607933804b524e2347980 (patch)
tree2d69e96114c382892ef0b9699fc7b813cf12267c
parent02530a4248ef80cf09681159e5c00daa4d49ed05 (diff)
downloadliveslak-dce5d0d1da24641670b607933804b524e2347980.tar.gz
liveslak-dce5d0d1da24641670b607933804b524e2347980.tar.xz
Make it obvious that some scripts are templates and cannot be used as-is.
This affects: - pxeserver - setup2hd Both have been renamed with extension '.tpl' as indication that they are templates. The 'make_slackware_live.sh' script performs a series of substitutions on them to produce the actual scripts inside the ISO.
Diffstat (limited to '')
-rwxr-xr-xmake_slackware_live.sh4
-rwxr-xr-xpxeserver.tpl (renamed from pxeserver)0
-rwxr-xr-xsetup2hd.tpl (renamed from setup2hd)0
3 files changed, 2 insertions, 2 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 30e5ea6..1164691 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1320,7 +1320,7 @@ mkdir -p ${LIVE_ROOTDIR}/var/lib/tftpboot/pxelinux.cfg
cp -ia /usr/share/syslinux/pxelinux.0 ${LIVE_ROOTDIR}/var/lib/tftpboot/
ln -s /mnt/livemedia/boot/generic ${LIVE_ROOTDIR}/var/lib/tftpboot/
ln -s /mnt/livemedia/boot/initrd.img ${LIVE_ROOTDIR}/var/lib/tftpboot/
-cat ${LIVE_TOOLDIR}/pxeserver | sed \
+cat ${LIVE_TOOLDIR}/pxeserver.tpl | sed \
-e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \
-e "s/@DISTRO@/$DISTRO/g" \
-e "s/@CDISTRO@/${DISTRO^}/g" \
@@ -1372,7 +1372,7 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then
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:
mkdir -p ${LIVE_ROOTDIR}/usr/local/sbin
- cat ${LIVE_TOOLDIR}/setup2hd | sed \
+ cat ${LIVE_TOOLDIR}/setup2hd.tpl | sed \
-e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \
-e "s/@DISTRO@/$DISTRO/g" \
-e "s/@CDISTRO@/${DISTRO^}/g" \
diff --git a/pxeserver b/pxeserver.tpl
index 1fcadcf..1fcadcf 100755
--- a/pxeserver
+++ b/pxeserver.tpl
diff --git a/setup2hd b/setup2hd.tpl
index 8bd7eed..8bd7eed 100755
--- a/setup2hd
+++ b/setup2hd.tpl