diff options
author | Eric Hameleers <alien@slackware.com> | 2016-08-13 00:54:00 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-08-13 00:54:00 +0200 |
commit | 9132ffa383d8685977b5eb1d90e4f715c551e895 (patch) | |
tree | 9fc7e820ed4626fd19cf257982eb6d451907f819 /make_slackware_live.sh | |
parent | 7e848953b075b72d43a19386e3a8ea10185e0ba9 (diff) | |
download | liveslak-9132ffa383d8685977b5eb1d90e4f715c551e895.tar.gz liveslak-9132ffa383d8685977b5eb1d90e4f715c551e895.tar.xz |
make_slackware_live.sh: Removing old stuff should happen at the beginning.
Diffstat (limited to 'make_slackware_live.sh')
-rwxr-xr-x | make_slackware_live.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 99a1a10..cddb699 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -880,6 +880,14 @@ if [ ! -d ${SL_REPO} ]; then exit 1 fi +# Cleanup if we are FORCEd to rebuild from scratch: +if [ "$FORCE" = "YES" ]; then + echo "-- Removing old files and directories!" + umount ${LIVE_ROOTDIR}/{proc,sys,dev} 2>${DBGOUT} || true + umount ${LIVE_ROOTDIR} 2>${DBGOUT} || true + rm -rf ${LIVE_STAGING}/${LIVEMAIN} ${LIVE_WORK} ${LIVE_ROOTDIR} +fi + # Create temporary directories for building the live filesystem: for LTEMP in $LIVE_OVLDIR $LIVE_BOOT $LIVE_MOD_SYS $LIVE_MOD_ADD $LIVE_MOD_OPT ; do umount ${LTEMP} 2>${DBGOUT} || true @@ -890,14 +898,6 @@ for LTEMP in $LIVE_OVLDIR $LIVE_BOOT $LIVE_MOD_SYS $LIVE_MOD_ADD $LIVE_MOD_OPT ; fi done -# Cleanup if we are FORCEd to rebuild from scratch: -if [ "$FORCE" = "YES" ]; then - echo "-- Removing old files and directories!" - umount ${LIVE_ROOTDIR}/{proc,sys,dev} 2>${DBGOUT} || true - umount ${LIVE_ROOTDIR} 2>${DBGOUT} || true - rm -rf ${LIVE_STAGING}/${LIVEMAIN} ${LIVE_WORK} ${LIVE_ROOTDIR} -fi - # Create the mount point for our Slackware filesystem: if [ ! -d ${LIVE_ROOTDIR} ]; then mkdir -p ${LIVE_ROOTDIR} |