summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmake_slackware_live.sh1
-rwxr-xr-xsetup2hd2
2 files changed, 3 insertions, 0 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index e1d0102..4f668be 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1062,6 +1062,7 @@ if [ -f ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* ]; then
-e "s/@KVER@/$KVER/g" \
-e "s/@LIVEDE@/$LIVEDE/g" \
-e "s/@LIVEMAIN@/$LIVEMAIN/g" \
+ -e "s/@MARKER@/$MARKER/g" \
-e "s/@SL_VERSION@/$SL_VERSION/g" \
-e "s/@VERSION@/$VERSION/g" \
> ${LIVE_ROOTDIR}/usr/local/sbin/setup2hd
diff --git a/setup2hd b/setup2hd
index a639e45..ee0b655 100755
--- a/setup2hd
+++ b/setup2hd
@@ -227,6 +227,8 @@ Press ENTER to return to the main menu." 16 68
/etc/X11/xdm/liveslak-xdm
# Point xdm to the custom /etc/X11/xdm/liveslak-xdm/xdm-config:
sed -i ${T_PX}/etc/rc.d/rc.4 -e 's,bin/xdm -nodaemon,& -config /etc/X11/xdm/liveslak-xdm/xdm-config,'
+ # Remove the marker file from the filesystem root:
+ rm -f ${T_PX}/@MARKER@
cat << EOF > $TMP/tempmsg