From 3bb48a9c945dbafbbc912ef8d65234d88cb65794 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 24 Oct 2020 22:29:54 +0200 Subject: setup2hd fixes and enhancements DAW configuration is now properly copied Extracting the Live OS to hard disk is roughly 10 times faster now, after abandoning the fancy progress bar and just showing the rsync status. Use an enhanced Slackware SeTpasswd to add a non-root user and set the root password. Various syntax and logic errors removed. --- make_slackware_live.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'make_slackware_live.sh') diff --git a/make_slackware_live.sh b/make_slackware_live.sh index d3f104a..b25416f 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1825,11 +1825,12 @@ if [ -f ${DEF_SL_PKGROOT}/../isolinux/initrd.img ]; then 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}/* - # Overwrite Slackware's SeTpasswd script with our enhanceded version: - cat ${LIVE_TOOLDIR}/setup2hd/SeTpasswd \ - > ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/SeTpasswd + # Prevent SeTconfig from asking redundant questions after a Live OS install: + sed -i ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/SeTconfig \ + -e '/.\/var\/log\/setup\/$SCRIPT $T_PX $ROOT_DEVICE/i # Skip stuff that was taken care of by liveslak\nif [ -f $TMP/SeTlive ] && echo $SCRIPT |grep -qE "(make-bootdisk|mouse|setconsolefont|xwmconfig)"; then true; else' \ + -e '/.\/var\/log\/setup\/$SCRIPT $T_PX $ROOT_DEVICE/a fi' # Add the Slackware Live HD installer scripts: - for USCRIPT in SeTuacct SeTudiskpart SeTumedia SeTupass setup.liveslak setup.slackware ; do + for USCRIPT in SeTuacct SeTudiskpart SeTumedia SeTupass SeTpasswd setup.liveslak setup.slackware ; do cat ${LIVE_TOOLDIR}/setup2hd/${USCRIPT}.tpl | sed \ -e "s/@DIRSUFFIX@/$DIRSUFFIX/g" \ -e "s/@DISTRO@/$DISTRO/g" \ -- cgit v1.2.3