remasterpup2

#!/bin/sh
#simple script to remaster the puppy live-cd.
#(c) Copyright 2006 Barry Kauler, www.puppyos.com
#2007 Lesser GPL licence v2 (http://www.fsf.org/licensing/licenses/lgpl.html)
#v411 update what gets copied from /root and /etc.
#v412 /etc/DISTRO_SPECS, renamed pup_xxx.sfs, pup_save.2fs etc.
# 22jun09 by Masaki Shinomiya <shino@pos.to> bugfix in cd drive selection
# 01jul09 needed space calculation
# 08jul09 loop mounted iso file usable
# 7aug09 grub4dos support
#w482 shinobar: exclude /lib/modules/${KERNELVER}/initrd.
#v431JP mkisofs with Joliet option, volume id, what copied from cd, remove slmodems
#091212 weird bug, no processes but when run this, x restarts...
# 28dec09 remove /modules/${KERNELVER}/modules.*
#110505 support sudo for non-root user.
#110808 PANZERKOPF: bug fix. 110822 reverted.
#120605 rerwin: omit /dev/snd content, /dev/.udev subdirectory and modem daemons from new master (because daemons reinstalled from firmware if needed).
#120606 rerwin: support users' replacement of stripped /root & /etc with complete directories (for "boot disk").
#120607 rerwin: Remove indicators/files for integrated user-installed packages.
#120721 revert 'wildcards' option (from 120605); improve /dev/snd file exclusion; exclude /usr/share/icons/hicolor/icon-theme.cache (shinobar).
#121021 rerwin: revert 120605 modem daemon removals (because daemons no longer copied from firmware directory).
#130222 convert internationalization from "technosaurus method" to gettext method.
#130222 virtual-CD detection was broken.
#130223 various fixes. note, also fixed /usr/sbin/filemnt. now can retain files between remasters.
#130301 o/p of "losetup" (BB), shows all in use, but "losetup-FULL -a" needs param, also o/p format different.
#130302 L18L: moved m_09 m_10 m_11 top and made another use of it.
#130306 gettext translation fixed, line 354. 130307 again.
#130308 npierce: filter out wrong CDs from choices offered to user; remove CD drive from VIRTUALCD list.
#130527 /etc/.XLOADED has been moved to /root, refer /usr/bin/xwin.

[ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505

#NOTE: rename to avoid clash with 'remasterpup2.mo' used by previous i18n method.
export TEXTDOMAIN=remasterpup2x
export OUTPUT_CHARSET=UTF-8
. gettext.sh

Yes_lbl="$(gettext 'Yes')"
No_lbl="$(gettext 'No')"
m_01="$(gettext 'Puppy simple CD remaster')" #window title.
m_02="$(gettext 'ERROR')"
m_07="$(gettext 'currently mounted')"
m_08="$(gettext 'not mounted')"
m_09="$(gettext 'Filesystem')" #130302
m_10="$(gettext 'Size')" #130302
m_11="$(gettext 'Free')" #130302

choice_cdd () {
	#copy files off live-cd.... w018 use probedisk2...
	SELECTIONS="`probedisk 2>&1 | grep '^/dev/' | grep "|optical|" | cut -f 1,3 -d "|" | tr " " "_" | tr "|" " " | tr '$' "_"`"
	SELECTIONS="$SELECTIONS $VIRTUALCD"
	if [ "$(echo "$SELECTIONS"|tr -d ' ')" = "" ]; then
		m_14_2="$(gettext 'NO CD/DVD drives found.')"
		Xdialog --wrap --left --title "$m_01: $m_02" --msgbox "$m_14_2
$MSG" 0 80
		exit 1
	fi
	if [ "$1" = "filter" ];then #130308 Filter out devices with a missing file.
		FILT_SELECTIONS=""
		i="0"
		for ASELECTION in $SELECTIONS
		do
			if [ "$((i++&1))" -eq "0"  ];then
				BLKDEV="$ASELECTION"
			else
				DEVNAME="$ASELECTION"
				MNTPNT="`mount | grep "$BLKDEV" | tr -s " " | cut -f 3 -d " "`"
				[ -z "$MNTPNT" -o -f "$MNTPNT/initrd.gz" -a -f "$MNTPNT/$PUPPYSFS" ] && FILT_SELECTIONS="$FILT_SELECTIONS $BLKDEV $DEVNAME"
			fi
		done
		SELECTIONS="$FILT_SELECTIONS"
		if [ -z "$SELECTIONS" ];then
			m_14_3="$(gettext 'Puppy live-CD or virtual CD was not found.')
$(eval_gettext "(No CD or .iso file has both 'initrd.gz' and '${PUPPYSFS}'.)")"
			Xdialog --wrap --left  --title "$m_01: $m_02" --msgbox "$m_14_3" 0 0
			exit
		fi
	fi #130308 end of filter
	m_14_1="$(gettext 'Choose the CD/DVD drive...')"
	DIALOG="Xdialog --wrap --left --title \"$m_01\" --stdout --menubox \"$MSG\n\n$m_14_1\" 0 56 4 $SELECTIONS 2> /dev/null"
	BURNERDRV=""
	RESULT=$(eval $DIALOG) #w018	# 22jun09
	[ $? -ne 0 ] && exit
	BURNERDRV=$RESULT
	[ "$BURNERDRV" = "" ] && exit
	BURNERDRV="`echo -n "$BURNERDRV" | cut -f 3 -d '/'`"
}

#LANG=C #faster, plus Xdialog happier.
KERNELVER="`uname -r`"

#variables created at bootup by /initrd/usr/sbin/init...
. /etc/rc.d/PUPSTATE
[ "$PUP_LAYER" = "" ] && PUP_LAYER="/pup_ro2"

. /etc/DISTRO_SPECS
PUPPYSFS="$DISTRO_PUPPYSFS" #ex: puppy.sfs
ZDRVSFS="$DISTRO_ZDRVSFS"   #ex: zdrv.sfs
FDRVSFS="$DISTRO_FDRVSFS"   #ex: fdrv.sfs
SFSBASE="`basename $PUPPYSFS .sfs`" #ex: puppy

PPATTERN="/initrd${PUP_LAYER}"
if [ "`mount | grep "$PPATTERN"`" = "" ];then
	#no puppy.sfs file mounted on pup_ro2, probably h.d. install...
	m_03="$(eval_gettext 'This program requires a ${PUPPYSFS} file mounted on /initrd${PUP_LAYER}.')
$(gettext 'Which is not the case here, probably because this is a full hard drive installation?')
$(gettext 'Whatever, boot Puppy from live-CD and then you will be able to use this script.')

$(eval_gettext 'Note, I have not tried it, but if you setup the situation of ${PUPPYSFS} mounted on directory /initrd${PUP_LAYER}, that will be acceptable for this program.')
$(gettext 'You will also need a current live-CD, as the program gets files off it.')
$(gettext 'Anyone want to try it?')

$(gettext "Click 'Ok' button to quit...")"
	Xdialog --wrap --left --title "m_01: m_02"  --msgbox "$m_03" 0 80
	exit
fi

SAVEPART="$PDEV1" #from PUPSTATE.
CDR="/dev/$SAVEPART"

#Choose remaster options
xmsg="$(gettext 'Select Remaster Options') 
 
 $(gettext 'Remaster CD: Create a remastered Puppy CD (Good for booting from CD)')
 $(gettext 'Remaster SFS: Create a remastered SFS Files (Good for live usb setup)')
 " 
 
 lbl_41="$(gettext 'Remaster CD')"
 lbl_42="$(gettext 'Remaster SFS')"
 
 Xdialog --wrap --left --title "$m_01" --ok-label "$lbl_41" --cancel-label "$lbl_42" --yesno "$xmsg" 0 90
 retval=$?
 
 [ $retval -eq 0 ] && xCDREMASTER="yes"
 [ $retval -eq 1 ] && xCDREMASTER=""
 
 [ $retval -eq 255 ] && exit

#choose where to create isolinux-builds/ directory...
if [ "$xCDREMASTER" != "" ]; then

m_05="$(gettext 'Welcome! This little program takes a snapshot of your current system and create a ISO file.')

$(eval_gettext 'A Puppy live-CD has 4 main files: vmlinuz, isolinux.cfg, initrd.gz and ${PUPPYSFS}. Note, in some builds of Puppy there may also be a 5th file, ${ZDRVSFS}.')

$(eval_gettext "It is \${PUPPYSFS} that mainly interests us here: it has the entire Puppy filesystem, everything from '/' down. What this script does is rebuild this file \${PUPPYSFS}, with everything currently under '/' -- that is, all user-installed packages, all mounted .sfs extension files, everything, gets combined into one file, \${PUPPYSFS}.")

$(gettext 'Click OK button to continue (or close window to quit)...')"

else

m_05="$(gettext 'Welcome! This little program takes a snapshot of your current system and create a SFS modules.')

$(eval_gettext "It is \${PUPPYSFS} that mainly interests us here: it has the entire Puppy filesystem, everything from '/' down. What this script does is rebuild this file \${PUPPYSFS}, with everything currently under '/' -- that is, all user-installed packages, all mounted .sfs extension files, everything, gets combined into one file, \${PUPPYSFS}.")

$(gettext 'Click OK button to continue (or close window to quit)...')"

fi


Xdialog --wrap --left --title "$m_01" --msgbox "$m_05" 0 80

[ $? -ne 0 ] && exit

#calc size needed...
m_06="$(gettext 'Calculating needed working space.')
$(gettext 'Please wait, this may take awhile...')"
Xdialog --wrap --left  --title "$m_01" --no-buttons --ignore-eof  --infobox "$m_06" 0 0 0 &
XPID=$!
SIZEOPT=0
SIZEBIN=`du -sk /bin | cut -f 1`
SIZESBIN=`du -sk /sbin | cut -f 1`
SIZELIB=`du -sk /lib | cut -f 1`
SIZEUSR=`du -sk /usr | cut -f 1`
SIZEOPT=0	# 01jul09
[ -d /opt ] && SIZEOPT=`du -sk /opt | cut -f 1`
sync
SIZETOTALK=`LANG=C dc $SIZEBIN $SIZESBIN + $SIZELIB + $SIZEUSR + $SIZEOPT + p`
SIZETOTALM=`LANG=C dc $SIZETOTALK 1024 \/ p| cut -d'.' -f1`	# 01jul09
[ "$SIZETOTALM" ] || SIZETOTALM=1
#estimate a compressed size...
SIZENEEDEDM=`expr $SIZETOTALM \/ 3`
SIZESLACKM=`expr $SIZENEEDEDM \/ 3` #guess
SIZENEEDEDM=`expr $SIZENEEDEDM + $SIZESLACKM`
SIZENEEDEDM=`expr $SIZENEEDEDM + 25` #space for vmlinuz, initrd.gz, zdrv, etc
#now choose working partition... v431 add ext4...  130216 add f2fs...
PARTSLIST="`probepart -m 2> /dev/null | grep '^/dev/' | grep -E 'f2fs|ext2|ext3|ext4|reiserfs|btrfs|minix|msdos|vfat|exfat|ntfs' | cut -f 1-3 -d '|'`"

echo -n "" > /tmp/schoices.txt
echo "$PARTSLIST" |
while read APART
do
	[ "$APART" = "" ] && continue #v3.01 preaution
	MNTSTATUS="($m_07)" #"currently mounted"
	ATAG="`echo -n "$APART" | cut -f 1 -d '|' | cut -f 3 -d '/'`"
	ASIZE="`echo -n "$APART" | cut -f 3 -d '|'`"
	AFS="`echo -n "$APART" | cut -f 2 -d '|'`"
	AFPATTERN="^/dev/$ATAG " #v3.01
	AFREE="`df -m | grep -m 1 "$AFPATTERN" | tr -s " " | cut -f 4 -d " "`"
	FLAG_RO='no' #v431
	if [ ! "$AFREE" ];then
		MNTSTATUS="($m_08)" #"not mounted"
		mkdir -p /mnt/$ATAG
		mount -t $AFS /dev/$ATAG /mnt/$ATAG > /dev/null 2>&1
		if [ $? -eq 0 ];then
			if [ "$ATAG" = "fd0" ];then
				FFREE=`df -k | grep -m 1 "$AFPATTERN" | tr -s " " | cut -f 4 -d " "`
				AFREE="`LANG=C dc $FFREE 1024 \/ p`"
			else
				AFREE="`df -m | grep -m 1 "$AFPATTERN" | tr -s " " | cut -f 4 -d " "`"
			fi
			[ "`mount | grep -m 1 "$AFPATTERN" | grep ' (rw'`" = "" ] && FLAG_RO='yes' #v431 make sure writable.
			umount /dev/$ATAG
		else #v431
			continue
		fi
	else
		[ "`mount | grep -m 1 "$AFPATTERN" | grep ' (rw'`" = "" ] && FLAG_RO='yes' #v431 make sure writable.
	fi
	[ "$FLAG_RO" = "yes" ] && continue #v431
	[ "$AFS" ] && echo "${ATAG} \"${m_09}: $AFS  ${m_10}: ${ASIZE}M  ${m_11}: ${AFREE}M ${MNTSTATUS}\" \\" >> /tmp/schoices.txt #v3.01 added precaution. #130302 L18L
done
SCHOICES="`cat /tmp/schoices.txt`"

#add tmpfs ramdisk choice...
SIZETMPFSM=`df -m | grep '^tmpfs' | grep -E "/initrd/pup_rw|/initrd/mnt/tmpfs" | tr -s " " | cut -f 4 -d " "`
TMPFSMSG=''

if [ "$SIZETMPFSM" != "" ];then
	TOTALTMPFSM=`df -m | grep '^tmpfs' | grep -E '/initrd/pup_rw|/initrd/mnt/tmpfs' | tr -s " " | cut -f 2 -d " "`
	if [ "$SCHOICES" = "" ];then #v3.01
		SCHOICES="ramdisk \"$m_09: tmpfs  $m_10: ${TOTALTMPFSM}M  $m_11: ${SIZETMPFSM}M ($m_07)\" \\"
	else
		SCHOICES="$SCHOICES
ramdisk \"$m_09: tmpfs  $m_10: ${TOTALTMPFSM}M  $m_11: ${SIZETMPFSM}M ($m_07)\" \\"
	fi
	m_12="$(gettext 'Note 2: you can use the tmpfs ramdisk, which is in RAM, if it has enough space.')"
	TMPFSMSG="$m_12
 "
fi

[ "$SCHOICES" = "" ] && exit #precaution.

if [ "$xCDREMASTER" != "" ]; then
 RFILE="live-CD iso"
else
 RFILE="puppy sfs"
fi

m_13="$(gettext 'A working area is required in which to create the new ${RFILE} file.')
$(eval_gettext 'Here are the available partitions. You must choose one that has at least ${SIZENEEDEDM}M free space on it.') $(gettext 'You will need an extra 100 - 300MB space (whatever the size of ISO file is going to be).')

$(eval_gettext 'If the partition that you would like to use has less than ${SIZENEEDEDM}M free space on it, you will need to quit this script and delete some files.')

$(gettext 'Note 1: you can use a usb drive, but it needs to have been plugged in before running this script, so that it will get detected.')
${TMPFSMSG}
$(gettext 'Highlight desired choice then click OK button...')"


echo '#!/bin/sh' > /tmp/savedlg
echo -n "Xdialog --wrap --left --stdout --title \"$m_01\" --menubox \"$m_13\" 0 80 5 " >> /tmp/savedlg
echo "$SCHOICES"  >> /tmp/savedlg
echo ' > /tmp/tag.txt' >> /tmp/savedlg
chmod 755 /tmp/savedlg

kill $XPID
/tmp/savedlg
[ $? -ne 0 ] && exit #130223
WKGPART="`cat /tmp/tag.txt`"
echo "WKGPART=$WKGPART"
[ "$WKGPART" = "" ] && exit

#now get the files off it...
#firstly need working place to write to...
[ "$WKGPART" = "ramdisk" ] && WKGMNTPT="/"
WPATTERN="/dev/$WKGPART "
if [ "$WKGMNTPT" = "" ] ; then
	WKGMNTPT="`mount | grep "$WPATTERN" | head -n 1 | tr -s " " | cut -f 3 -d " "`"
fi
if [ "$WKGMNTPT" = "" ];then
	PPATTERN="^$WKGPART "
	WKGFS="`echo "$SCHOICES" | grep "$PPATTERN" | cut -f 2 -d ':' | cut -f 2 -d " "`"
	[ "$WKGFS" = "msdos" ] && WKGFS="vfat"
	mkdir -p /mnt/$WKGPART
	mount -t $WKGFS /dev/$WKGPART /mnt/$WKGPART
	[ $? -ne 0 ] && exit #precaution.
	WKGMNTPT="/mnt/$WKGPART"
fi
[ "$WKGMNTPT" = "/" ] && WKGMNTPT=""

# reuse if sfs file already exists
NEW="yes"
SFSPATH=$(ls -1 $WKGMNTPT/puppylivecdbuild/$PUPPYSFS 2>/dev/null)
if [ "$SFSPATH" != "" -a $(echo "$SFSPATH" | wc -l) -eq 1 ]; then
	m_35="$(eval_gettext '${SFSPATH} found.')
$(gettext 'Do you want to reuse it without any change?')
$(gettext "If uncertain, click the 'No' button")"
	Xdialog --wrap --left --title "$m_01" --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_35" 0 0 && NEW="no"
fi
SFSPATH=""

#=================================================================

if [ "$NEW" = "yes" ]; then  ###### long skip if, cleating new sfs
	#130223 i think should wipe contents of $WKGMNTPT/puppylivecdbuild?
	if [ -d $WKGMNTPT/puppylivecdbuild ];then
		[ -f $WKGMNTPT/puppylivecdbuild/$PUPPYSFS ] && rm -f $WKGMNTPT/puppylivecdbuild/$PUPPYSFS
		[ -f $WKGMNTPT/puppylivecdbuild/$ZDRVSFS ] && rm -f $WKGMNTPT/puppylivecdbuild/$ZDRVSFS
        	
		CDMSG=""
		[ "$xCDREMASTER" != "" ] && CDMSG="
		
		$(gettext 'Note, if you choose to retain the files: The next operation is this script will will read files from a CD, however they will not over-write existing files. Therefore, any customised files will be retained.')
		
		"
		
		m_41="$(eval_gettext 'Directory ${WKGMNTPT}/puppylivecdbuild already exists.')

$(gettext "Normally, this would be created fresh, empty. However, it exists from a previous execution of 'remasterpup2' script (this program), with files in it. You may choose to leave these files in-place, for the current remaster. If uncertain, click the 'Erase' button.")
$CDMSG
$(gettext "WARNING: If the files in 'puppylivecdbuild' are for a different version of Puppy, click the 'Erase' button.")
$(gettext "Again, warning, if at all uncertain, click the 'Erase' button.")

$(gettext "Click 'Keep' button to retain the files...")
$(gettext "Click 'Erase' button to delete the files...")"
		lbl_41="$(gettext 'Keep')"
		lbl_42="$(gettext 'Erase')"
		Xdialog --wrap --left --title "$m_01" --ok-label "$lbl_41" --cancel-label "$lbl_42" --yesno "$m_41" 0 80
		[ $? -ne 0 ] && rm -rf $WKGMNTPT/puppylivecdbuild
	fi

	#130222
	#130307 notice, line 356 "WARNING:....", the $ is not backslashed, which is confusing...
	m_42=""
	if [ -d $WKGMNTPT/puppylivecdbuild ];then
		m_42="

$(gettext 'NOTICE:')
$(eval_gettext 'Directory ${WKGMNTPT}/puppylivecdbuild already exists.')
$(gettext 'If you want to re-use the files in it, and not re-read files from the CD (or virtual-CD), just click the window close-box to bypass this operation.')
$(gettext '(You may view the directory contents with a file-manager to satisfy yourself whether these files should be re-used)')"
	fi
	
	
if [ "$xCDREMASTER" != "" ]; then

	m_40="$(gettext 'This remaster program needs to read some files off the current live-CD.')

	$(gettext "However, if a CD-image file (which has filename extension .iso) is mounted, the files may be read from that. We refer to this as a 'virtual CD'. To mount a virtual CD, just click on a .iso file.")

	$(eval_gettext "WARNING: Be sure that the live-CD or .iso file is the correct one for the currently running Puppy, which is '\${DISTRO_NAME}', version \${DISTRO_VERSION}. As a check, it must have in it the file '\${DISTRO_PUPPYSFS}'")

	$(gettext "If you want to read the files off a .iso file rather than a CD/DVD, please click on the .iso file right now (before clicking the 'OK' button below)")
	$(gettext "Alternatively, if you want to read the files off a Puppy live-CD, insert it in drive, then click 'OK' button.")${m_42}"
		Xdialog --wrap --left  --title "$m_01" --msgbox "$m_40" 0 80

		if [ $? -eq 0 ];then #130223 big if "BIGIF2"
			#130222 fix this...
			VIRTUALCD=""
			#130301 crap, earlier was using losetup-FULL from util-linux git, now using older 2.21.1, it needs -a param,
			#but also truncates long lines (same as bb losetup) -- what a nuisance...
			for ONELOOP in `cat /proc/mounts | grep -E '(^/dev/loop.*)( udf | iso9660 )' | cut -f 1 -d ' ' | tr '\n' ' '` #130308 /dev/loop only
			do
				oPTN="^${ONELOOP} "
				ONEISO="$(cat /proc/mounts | grep "$oPTN" | cut -f 2 -d ' ' | rev | cut -f 1 -d '+' | cut -f 1 -d '/' | rev)" #130301
				[ "$ONEISO" = "" ] && continue #130301 precaution.
				ONELOOP=$(echo "$ONELOOP" | sed 's|/loop/|/loop|')
				VIRTUALCD="${VIRTUALCD} ${ONELOOP} ${ONEISO}"
			done
			m_14="$(gettext 'This remaster program needs to read some files off the current live-CD.')
	$(gettext 'You can also use a .iso file if it is already mounted as a virtual CD (you would need to have previously clicked on a .iso file to mount it).')"
			MSG="$m_14"
			choice_cdd filter #130308 Use filtering.

			CDPATTERN="/dev/$BURNERDRV "
			CDMNTPT="`mount | grep "$CDPATTERN" | tr -s " " | cut -f 3 -d " "`"
			if [ "$CDMNTPT" != "" ];then
				if [ ! -f $CDMNTPT/initrd.gz ];then #130308 In theory, this will now never be true.
					#091212 weird bug, no processes but when run this, x restarts...
					xFUSER="`fuser -m /dev/$BURNERDRV 2>/dev/null`" #do this first, seems to fix it.
					[ "$xFUSER" != "" ] && fuser -k -m /dev/$BURNERDRV
					sync
					umount /dev/$BURNERDRV 2> /dev/null
					if [ $? -ne 0 ];then
						m_15="$(gettext 'Mounted CD, get rid of it before running this program!')"
						Xdialog --wrap --left  --title "$m_02" --msgbox "$m_15" 0 0
						exit
					fi
					CDMNTPT=""
				fi
			fi

			if [ "$CDMNTPT" = "" ];then
				m_16="$(eval_gettext 'Please insert the current Puppy live-CD into drive ${BURNERDRV}.')
	$(gettext 'Then click OK...')"
				while [ 1 ];do
					Xdialog --wrap --left  --title "$m_01" --msgbox "$m_16" 0 0
					[ $? -eq 0  ] || exit	# 22jun09
					case $BURNERDRV in
						loop*) #ISO.. already mounted
							CDMNTPT=$(mount | grep "^/dev/$BURNERDRV " | cut -f 3 -d ' ')
							;;
						*) #CD
							#now mount it...
							CDMNTPT="/mnt/$BURNERDRV"
							mkdir -p /mnt/$BURNERDRV
							mount -t iso9660 /dev/$BURNERDRV /mnt/$BURNERDRV
							[ $? -eq 0 ] && break
							;;
					esac
				done
			fi

			#now get the files off it...
			m_17="$(eval_gettext 'Copying files from CD to ${WKGMNTPT}/puppylivecdbuild/, please wait...')"
			Xdialog --wrap --left  --title "$m_01" --no-buttons --ignore-eof   --infobox "$m_17" 0 0 0 &
			XPID=$!
			mkdir -p $WKGMNTPT/puppylivecdbuild
			#now copy the files... # v431JP HTM, ICO, INF
			sync
			(
			cd $CDMNTPT
			for F in ${ZDRVSFS} vmlinuz initrd.*z  grldr *efi* *EFI* *.c32 *.sh *.lst *.xpm *.jpg *.png *.bin *.cfg *.msg *.16 *.HTM* *.ICO *.INF help boot
			do
				#130223 -n means do not override an existing file... 130304 hmmm, -n not supported, use -u ...
				[ -e "$F" ] && cp -a -u $F $WKGMNTPT/puppylivecdbuild/
				sync
			done
			)
			umount /dev/$BURNERDRV 2> /dev/null
			kill $XPID

		fi #end "BIGIF2"
	fi

	if [ "$xCDREMASTER" != "" ]; then

		m_16_1="$(eval_gettext 'Do you like to make ${ZDRVSFS}, the separate driver file?')"
		Xdialog --wrap --left  --title "$m_01" --default-no --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_16_1" 0 0
		[ $? -eq 0 ] && MKZDRV="yes" || MKZDRV=""
		[ $? -eq 255 ] && exit #130223

		m_16_1="$(eval_gettext 'Include depmod files on remastered CD?')
		$(eval_gettext 'The puppy will boot faster if included')"

		Xdialog --wrap --left  --title "$m_01" --default-no --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_16_1" 0 0
		retval=$?

		if [ $retval -eq 0 ]; then
		  ANOTHER_REMOVE="/lib/modules/$KERNELVER/initrd"	# 28dec09 modules.*
		elif [ $retval -eq 255 ]; then
		 exit #130223
		else
		  ANOTHER_REMOVE="/lib/modules/$KERNELVER/initrd /lib/modules/*/modules.*"	# 28dec09 modules.*
		fi
	
	else
	 MKZDRV=""
	 ANOTHER_REMOVE="/lib/modules /lib/modules/$KERNELVER/initrd /lib/modules/*/modules.*"
	 [ ! -e $WKGMNTPT/puppylivecdbuild ] && mkdir -p $WKGMNTPT/puppylivecdbuild
	fi
	
	m_16_2="$(eval_gettext 'Do you like to make ${FDRVSFS}, the separate firmware driver file?')"
	Xdialog --wrap --left  --title "$m_01" --default-no --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_16_2" 0 0
	[ $? -eq 0 ] && MKFDRV="yes" || MKFDRV=""
	[ $? -eq 255 ] && exit #130223
	
	if [ "$MKFDRV" != "yes" ]; then
	 m_16_3="$(eval_gettext 'Include firmware drivers on Puppy SFS file?')"
	 Xdialog --wrap --left  --title "$m_01" --default-no --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_16_3" 0 0
	 [ $? -eq 0 ] && INCLUDEFW="yes" || INCLUDEFW=""
	 [ $? -eq 255 ] && exit #130223
	else
	 INCLUDEFW=""
	fi

	# set compression
	/usr/lib/gtkdialog/box_yesno --yes-label "xz (default)" --no-label "gzip" --yes-first --info \
	--yes-icon "execute.svg" --no-icon "execute.svg" \
"$m_01" "$(gettext 'You can use xz or gzip compression. Choose one...')"
	case $? in
		1) COMP="-comp gzip" ;;
		*) COMP="-comp xz -Xbcj x86" ;;
	esac
	#COMP="-noI -noD -noF -noX" #fast tests zzzzzz
	echo "COMP=${COMP}"
	# -
	
	blk1=`Xdialog --wrap --no-cancel --stdout --title "$m_01" --combobox "Before we start, select compression block size first\nThe larger the block, the smaller the puppy will be created.\nHowever large blocks will increase on CPU overhead\nYou may leave it blank if you have any doubts" 11 66 128K 256K 512K 1M`

	if [ "$blk1" == "" ] ||  [ "$blk1" == "0" ]; then
	 blk1="128K"
	fi
	
	BLKSIZE="$blk1"

	echo "BLOCK_SIZE=$blk1"

	COMP="$COMP -b $BLKSIZE"
	
	busybox mount -t aufs -o remount,udba=reval unionfs /

	m_18="$(eval_gettext 'Creating the ${PUPPYSFS} file in ${WKGMNTPT}/puppylivecdbuild/.')
$(gettext 'This can take quite a long time, so please wait.... and wait...')
$(eval_gettext 'This window will disappear when ${PUPPYSFS} is finally created.')
$(gettext 'Please wait...')"
	Xdialog --wrap --left  --title "$m_01" --no-buttons --ignore-eof   --infobox "$m_18" 0 0 0 &
	XPID=$!

	#create new puppy.sfs file...
	squash() {
		echo $0 $@
		rxvt -bg orange -fg black -title "$m_01" -geometry 80x6 -e mksquashfs $@ 2> /dev/null
	}
	DIRHOME=""
	[ -d /home ] && DIRHOME="/home"
	[ -d /sys ] && DIRSYS="/sys"
	[ -d /lost+found ] && DIRLOST="/lost+found"
	rm -f ${WKGMNTPT}/puppylivecdbuild/$PUPPYSFS 2> /dev/null
	sync
	#note, /puppy.sfs is not normally there, i relocated it to a separate tmpfs,
	#however have not yet done that for multisession-cd/dvd (PUPMODE=77).
	# modules copied from initrd
	ANOTHER_REMOVE="/lib/modules/$KERNELVER/initrd /lib/modules/*/modules.*"	# 28dec09 modules.*
	if [ "$MKZDRV" = "yes" ]; then
		rm -f $WKGMNTPT/puppylivecdbuild/$ZDRVSFS 2> /dev/null
		mksquashfs /lib $WKGMNTPT/puppylivecdbuild/$ZDRVSFS -keep-as-directory -e /lib/[^m]* $ANOTHER_REMOVE
		ANOTHER_REMOVE="/lib/modules"
	fi
	
	if [ "$MKFDRV" = "yes" ]; then
	  rm -f $WKGMNTPT/puppylivecdbuild/$FDRVSFS 2> /dev/null
	  mksquashfs /lib $WKGMNTPT/puppylivecdbuild/$FDRVSFS -keep-as-directory -e /lib/[^f]* $ANOTHER_REMOVE
	  ANOTHER_REMOVE="$ANOTHER_REMOVE /lib/firmware"
	else
	   rm -f $WKGMNTPT/puppylivecdbuild/$FDRVSFS 2> /dev/null
	   if [ "$INCLUDEFW" != "yes" ]; then
	    ANOTHER_REMOVE="$ANOTHER_REMOVE /lib/firmware"
	   fi
	fi
	
	#120605 Omit certain /dev subdir content and modem components loaded from firmware tarballs...
	[ -d /dev/snd ] && [ "`ls /dev/snd`" != "" ] && DIRDEVSNDFILES="/dev/snd/*" #120721
	[ -d /dev/.udev ] && DIRDEVUDEV="/dev/.udev"
	#121021 modem daemons now left in place.
	[ -f /usr/share/icons/hicolor/icon-theme.cache ] && ICONCACHE=/usr/share/icons/hicolor/icon-theme.cache #120721
	TOPPLCDB=''
	[ -e /puppylivecdbuild ] && TOPPLCDB='/puppylivecdbuild'
	TOPPUPSFS=''
	[ -e /${PUPPYSFS} ] && TOPPUPSFS="/${PUPPYSFS}"
	# display terminal only for the first stage because it takes the most of time. 'squash' is a function, see above. 120512 $COMP added...
	squash / $WKGMNTPT/puppylivecdbuild/$PUPPYSFS ${COMP} -e /media /etc /proc /initrd /var /tmp /archive /mnt /root $TOPPLCDB $ANOTHER_REMOVE $DIRHOME $DIRSYS $DIRLOST $TOPPUPSFS $DIRDEVSNDFILES $DIRDEVUDEV $ICONCACHE  #120605 end #120721 avoid wildecards option, icon-theme.cache 121021
	sync
	
	if [ -e /var/lib/flatpak ]; then
         rxvt -bg black -fg white -title "Processing flatpak packages... DO NOT CLOSE" -geometry 80x6+50+50 -e mksquashfs /var/lib/flatpak $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -e /var/lib/flatpak/repo/tmp -keep-as-directory $COPTIONS
 	 sync
        fi

	#add pristine folders (out of current puppy.sfs)...
	mksquashfs /initrd${PUP_LAYER}/home $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	mksquashfs /initrd${PUP_LAYER}/proc $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	mksquashfs /initrd${PUP_LAYER}/tmp $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	mksquashfs /initrd${PUP_LAYER}/mnt $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	mksquashfs /initrd${PUP_LAYER}/media $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync

	kill $XPID

	#######START WORKING ON /root#######
	rm -rf /tmp/root 2> /dev/null
	#do some work on /root before add it to the squashfs...
	cp -a /initrd${PUP_LAYER}/root /tmp/root #pristine /root
	#copy all of my-applications/
	cp -af /root/my-applications/* /tmp/root/my-applications/
	#some dotpups get installed here...
	cp -af /root/my-roxapps /tmp/root/ 2>/dev/null
	#window manager config files...
	cp -af /root/.jwmrc /tmp/root/
	cp -af /root/.jwmrc-tray /tmp/root/ #v411
	cp -af /root/.fvwm95rc /tmp/root/
	cp -af /root/.icewm/menu /tmp/root/.icewm/
	cp -rf /root/.fonts /tmp/root/
	cp -rf /root/.icons /tmp/root/
	
	#rox desktop settings...
	cp -af /root/Choices/ROX-Filer/PuppyPin /tmp/root/Choices/ROX-Filer/
	cp -af /root/Choices/ROX-Filer/globicons /tmp/root/Choices/ROX-Filer/
	#100117 user changes get saved here, which overrides original...
	if [ -f /root/.config/rox.sourceforge.net/ROX-Filer/globicons ];then
		mkdir -p /tmp/root/.config/rox.sourceforge.net/ROX-Filer/
		cp -af /root/.config/rox.sourceforge.net/ROX-Filer/globicons /tmp/root/.config/rox.sourceforge.net/ROX-Filer/
	fi
	#100117 i think also save user settings...
	if [ -f /root/.config/rox.sourceforge.net/ROX-Filer/Options ];then
		mkdir -p /tmp/root/.config/rox.sourceforge.net/ROX-Filer/
		cp -af /root/.config/rox.sourceforge.net/ROX-Filer/Options /tmp/root/.config/rox.sourceforge.net/ROX-Filer/
	fi
	
	#Include xdg autostart
	if [ -e /root/.config/autostart ] && [ ! -d /tmp/root/.config/autostart ];then
	 mkdir -p /tmp/root/.config/autostart/
	fi
	
	cp -rf /root/.config/autostart/* /tmp/root/.config/autostart/ 2>/dev/null
	
	rm -f /tmp/root/.config/autostart/lxrandr-autostart.desktop 2>/dev/null
	
	
	#Include lxde settings
	#libfm
	if [ -e /root/.config/libfm ] && [ ! -d /tmp/root/.config/libfm ];then
	 mkdir -p /tmp/root/.config/libfm/
	fi
	
	cp -rf /root/.config/libfm/* /tmp/root/.config/libfm/ 2>/dev/null
	
	#lxpanel
	if [ -e /root/.config/lxpanel ] && [ ! -d /tmp/root/.config/lxpanel ];then
	 mkdir -p /tmp/root/.config/lxpanel
	fi
	
	cp -rf /root/.config/lxpanel/* /tmp/root/.config/lxpanel/ 2>/dev/null
	
	#lxsession
	if [ -e /root/.config/lxsession ] && [ ! -d /tmp/root/.config/lxsession ];then
	 mkdir -p /tmp/root/.config/lxsession
	fi
	
	cp -rf /root/.config/lxsession/* /tmp/root/.config/lxsession/ 2>/dev/null
	
	#openbox
	if [ -e /root/.config/openbox ] && [ ! -d /tmp/root/.config/openbox ];then
	 mkdir -p /tmp/root/.config/openbox
	fi
	
	cp -rf /root/.config/openbox/* /tmp/root/.config/openbox/ 2>/dev/null	
	
	#pcmanfm
	if [ -e /root/.config/pcmanfm ] && [ ! -d /tmp/root/.config/pcmanfm ];then
	 mkdir -p /tmp/root/.config/pcmanfm
	fi
	
	cp -rf /root/.config/pcmanfm/* /tmp/root/.config/pcmanfm/ 2>/dev/null	
	

	#Include xfce4 desktop settings
	if [ -e /root/.config/xfce4 ] && [ ! -d /tmp/root/.config/xfce4 ];then
	 mkdir -p /tmp/root/.config/xfce4/
	fi
	
	cp -rf /root/.config/xfce4/* /tmp/root/.config/xfce4/ 2>/dev/null
	
	#Remove recent on whiskermenu settings
	find /tmp/root/.config/xfce4/panel/ -type f -name "whiskermenu*.rc" -exec sed -i -e "s#recent=.*#recent=#g" '{}' \;

	#Remove xfce screen resolution settings
	if [ -f /tmp/root/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml ];then
	 
	rm /tmp/root/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml

	echo '<?xml version="1.0" encoding="UTF-8"?>

	<channel name="displays" version="1.0">
	  <property name="Notify" type="bool" value="true"/>
	</channel>' > /tmp/root/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml

	fi
	
	#v411 tidy up, remove desktop drive icons...
	grep -v '/tmp/pup_event_frontend/drive_' /tmp/root/Choices/ROX-Filer/PuppyPin > /tmp/remaster-PuppyPin
	mv -f /tmp/remaster-PuppyPin /tmp/root/Choices/ROX-Filer/PuppyPin
	#this may have been modified for a different w.m...
	cp -af /root/.xinitrc /tmp/root/
	#also this...
	[ -f /root/.xset.sh ] && cp -af /root/.xset.sh /tmp/root/

	#v411 gtk theme may have been changed...
	cp -af /root/.gtkrc-2.0 /tmp/root/

	#v411 jwm theme may have changed...
	cp -af /root/.jwm/jwmrc-personal /tmp/root/.jwm/
	cp -af /root/.jwm/jwmrc-personal2 /tmp/root/.jwm/
	cp -af /root/.jwm/jwmrc-theme /tmp/root/.jwm/

	#v411 pmount preferences...
	cp -af /root/.pmountauto /tmp/root/
	cp -af /root/.pmountengine /tmp/root/
	cp -af /root/.pmountquit /tmp/root/
	cp -af /root/.pmountsingle /tmp/root/

	#TODO think need to do this for /var also...

	#.packages/ .files, copy any files installed to /root...
	echo -n "" > /tmp/allpkgs.files
	for ONEPKG in `ls -1 /root/.packages/*.files 2>/dev/null | tr "\n" " "`
	do
		grep '^/root/' $ONEPKG | \
		while read -r ONEFILE
		do
			if [ -d "$ONEFILE" ] && [ ! -L "$ONEFILE" ];then #w018
				mkdir -p "/tmp${ONEFILE}"
			fi
			if [ -f "$ONEFILE" ] || [ -L "$ONEFILE" ];then #w018
				DIRNAME="`dirname "$ONEFILE"`"
				mkdir -p "/tmp${DIRNAME}"
				rm -f "/tmp${ONEFILE}" # if ONEFILE already exists and it's a link, needs to be removed
				cp -a -f "$ONEFILE" "/tmp${DIRNAME}/"
			fi
		done
	done

	#w018...
	#modify /root/.packages/ files, as all installed packages are now part of the new cd...
	cp -a -f /root/.packages /tmp/root/
	touch /root/.packages/user-installed-packages
	# 141008: move *.files to ~/.packages/builtin_files/
	cat /root/.packages/user-installed-packages | \
	while read -r ONEPKG
	do
		ONEFILE="/tmp/root/.packages/`echo "$ONEPKG" | cut -f1 -d '|'`.files"
		ONEBUILTIN="$(echo "$ONEPKG" | cut -f2 -d '|')"
		 if  [ "$ONEBUILTIN" != "" ]; then
		  ONENAME="/tmp/root/.packages/builtin_files/$ONEBUILTIN"
		 else
		  ONENAME="/tmp/root/.packages/builtin_files/$(basename $ONEFILE .files)"
		 fi
		mv -f "$ONEFILE" "$ONENAME"
	done
	
	while IFS= read -r line
	do
	 pkgname5="$(echo "$line" | cut -f 2 -d '|')"
	 if [ "$pkgname5" != "" ]; then
	  #check if the user installed package overwrites the builtin package
	  oldpkg="$(cat "/tmp/root/.packages/woof-installed-packages" | grep "|$pkgname5|")"
	  if [ "$oldpkg" == "" ]; then
	   #not a builtin package add anyway
	   echo "$line" >> "/tmp/root/.packages/woof-installed-packages"
	  else
	   #Its a builtin package, update the builtin package information
	   cat /tmp/root/.packages/woof-installed-packages | grep -v "$oldpkg" > /tmp/root/.packages/woof-installed-packages.tmp
	   echo "$line" >> /tmp/root/.packages/woof-installed-packages.tmp
	   mv -f /tmp/root/.packages/woof-installed-packages.tmp /tmp/root/.packages/woof-installed-packages
	  fi
	 fi
	done < /tmp/root/.packages/user-installed-packages
	
	sort -u --key=1 --field-separator="|" /tmp/root/.packages/woof-installed-packages > /tmp/woof-installed-packages-tmp #110722
	mv -f /tmp/woof-installed-packages-tmp /tmp/root/.packages/woof-installed-packages
	echo -n "" > /tmp/root/.packages/user-installed-packages #v431
	sync #120607
	rm -f /tmp/root/.packages/*.files #120607
	rm -f /tmp/root/.packages/*.remove #120607

	[ -f /tmp/root/.XLOADED ] && rm -f /tmp/root/.XLOADED #130527

	m_19="$(eval_gettext 'This program has created folder /tmp/root, which has everything that is now going to be added as /root in the ${PUPPYSFS} file.')
$(gettext "This is mostly 'pristine', as obviously you do not want all your cache files, temp files, email files, and other working/temporary files to be the ISO. However, if you are familiar with the workings of Puppy, you might like to take a look at /tmp/root right now, and possibly add anything that you want from /root (or remove something!)")
$(gettext '(if you think that this program has missed out something important, please let us know..')

$(eval_gettext "After examining /tmp/root, click 'Ok' to add /root in \${PUPPYSFS} file...")"
	Xdialog --wrap --left --title "$m_01" --msgbox "$m_19" 0 80
	sync
	[ "`ls /tmp/root/.packages/*.files`" = "" ] && CLEARPKGLOG="yes" || CLEARPKGLOG="no" #120607 in case user copied entire /root to /tmp for boot disk.
	mksquashfs /tmp/root $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	rm -rf /tmp/root
	#######END WORKING ON /root#######

	#######START WORKING ON /etc#######
	rm -rf /tmp/etc 2> /dev/null
	
	#do some work on /etc before add it to the .sfs...
	cp -a /initrd${PUP_LAYER}/etc /tmp/etc #pristine /etc.
	
	#maybe this has been modified...
	cp -af /etc/ld.so.conf /tmp/etc/
	
	mkdir -p /tmp/etc/ld.so.conf.d 2>/dev/null
	cp -af /etc/ld.so.conf.d/* /tmp/etc/ld.so.conf.d/
	
	mkdir -p /tmp/etc/init.d 2>/dev/null
	cp -af /etc/init.d/* /tmp/etc/init.d/
	
	mkdir -p /tmp/etc/udev/rules.d 2>/dev/null
	cp -af /etc/udev/rules.d/* /tmp/etc/udev/rules.d/
	rm -f /tmp/etc/udev/rules.d/*-persistent-net.rules
	
	mkdir -p /tmp/etc/xdg/autostart 2>/dev/null
	cp -af /etc/xdg/autostart/* /tmp/etc/xdg/autostart/
	
        mkdir -p /tmp/etc/xdg/menus 2>/dev/null
	cp -af /etc/xdg/menus/* /tmp/etc/xdg/menus/

	#.packages/ .files, copy any files installed to /etc...
	echo -n "" > /tmp/allpkgs.files
	
	for ONEPKG in `ls -1 /root/.packages/*.files 2>/dev/null | tr "\n" " "`
	do
		grep '^/etc/' $ONEPKG | \
		while read -r ONEFILE
		do
			if [ -d "$ONEFILE" ] && [ ! -L "$ONEFILE" ];then #w018
				mkdir -p "/tmp${ONEFILE}"
			fi
			if [ -f "$ONEFILE" ] || [ -L "$ONEFILE" ];then #w018
				DIRNAME="`dirname "$ONEFILE"`"
				mkdir -p "/tmp${DIRNAME}"
				rm -f "/tmp${ONEFILE}" # if ONEFILE already exists and it's a link, needs to be removed
				cp -a -f "$ONEFILE" "/tmp${DIRNAME}/"
			fi
		done
	done
	sync

	cp -af /etc/eventmanager /tmp/etc/ #v411

	#what about settings for a particular pc?...
	m_20="$(gettext 'Hardware customisation was not chosen.')"
	MSG1="$m_20"
	m_21="$(eval_gettext 'Have created the /etc directory for the new ${PUPPYSFS} file.')
$(gettext "It is in a 'pristine' state, but you can choose to customise it.")
$(gettext "Do you want to add customisations for your hardware? Examples are mouse, keyboard, video. But, if you answer 'Yes' here, the live-CD will be preconfigured for your PC only. Therefore, it is best to answer 'No' if you want to boot the new live-CD on different PCs.")

$(gettext "Click 'Yes' button to customise /etc...")
$(gettext "Click 'No' button not to customise (recommended)...")"
	Xdialog --wrap --left --title "$m_01" --default-no --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_21" 0 80
	if [ $? -eq 0 ];then
		cp -af /etc/codepage /tmp/etc/
		cp -af /etc/fontmap /tmp/etc/
		cp -af /etc/keymap /tmp/etc/
		cp -af /etc/mousedevice /tmp/etc/
		cp -af /etc/eth0mode /tmp/etc/
		cp -af /etc/eth1mode /tmp/etc/
		cp -af /etc/resolv.conf /tmp/etc/
		rm -f /tmp/etc/localtime #a symlink
		cp -af /etc/localtime /tmp/etc/
		cp -af /etc/TZ /tmp/etc/
		cp -af /etc/cdburnerdevice /tmp/etc/
		cp -af /etc/dvddevice /tmp/etc/
		cp -af /etc/modemdevice /tmp/etc/
		cp -af /etc/modules.conf /tmp/etc/
		cp -af /etc/modprobe.d /tmp/etc/ #101020
		cp -af /etc/rdesktoprc /tmp/etc/
		cp -af /etc/windowmanager /tmp/etc/
		cp -af /etc/X11/xorg.conf /tmp/etc/X11
		cp -af /etc/network-wizard /tmp/etc/
		cp -af /etc/simple_network_setup/* /tmp/etc/simple_network_setup/
		m_22="$(gettext 'These files were customised in /etc:')
codepage fontmap keymap mousedevice eth0mode eth1mode resolv.conf localtime TZ cdburnerdevice dvddevice modemdevice modprobe.d/* rdesktoprc windowmanager X11/xorg.conf
$(gettext 'Also these directories:')
network-wizard."
		MSG1="$m_22"
	fi

	#some files to always copy...
	cp -af /etc/Puppybackgroundpicture /tmp/etc/
	#TODO: other gtk and jwm customisations.

	cp -f /tmp/etc/DISTRO_SPECS /tmp/DISTRO_SPECSupdated #keep this to put into initrd.gz.

	m_23="${MSG1}

$(gettext 'If you know what you are doing, you can now modify any files in /tmp/etc folder. This is just about to be added to /etc in the .sfs file.')
$(gettext "Do anything you want before clicking 'Ok'.")
$(gettext '(If this program has missed something important, let me know -- Barry Kauler)')

$(eval_gettext "Click 'Ok' to add /etc in \${PUPPYSFS} file...")"
	Xdialog --wrap --left  --title "$m_01" --msgbox "$m_23" 0 80

	#120606 in case user just now replaced the /etc directory...
	sync
	#130527 .XLOADED moved to /root (see /usr/bin/xwin), change test...
	MODIFETC="$(find /tmp/etc/modules -mindepth 1 -maxdepth 1 -name 'firmware.dep.inst.*')"
	if [ "$MODIFETC" != "" ];then
		#rm -f /tmp/etc/.XLOADED
		rm -f /tmp/etc/modules/firmware.dep.inst.*
		touch /tmp/etc/personal_settings_popup_disabled
		touch /tmp/etc/personal_data_save_disabled
	fi
	[ -f /tmp/etc/.XLOADED ] && rm -f /tmp/etc/.XLOADED #130527 just in case old file still there.

	sync

	mksquashfs /tmp/etc $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	rm -rf /tmp/etc
	#######END WORKING ON /etc#######

	#######START WORKING ON /var#######
	rm -rf /tmp/var 2> /dev/null
	cp -a /initrd${PUP_LAYER}/var /tmp/var #pristine var

	#.packages/ .files, copy any files installed to /var...
	echo -n "" > /tmp/allpkgs.files
	for ONEPKG in `ls -1 /root/.packages/*.files 2>/dev/null | tr "\n" " "`
	do
		grep '^/var/' $ONEPKG | \
		while read -r ONEFILE
		do
			if [ -d "$ONEFILE" ] && [ ! -L "$ONEFILE" ];then #w018
				mkdir -p "/tmp${ONEFILE}"
			fi
			if [ -f "$ONEFILE" ] || [ -L "$ONEFILE" ];then #w018
				DIRNAME="`dirname "$ONEFILE"`"
				mkdir -p "/tmp${DIRNAME}"
				rm -f "/tmp${ONEFILE}" # if ONEFILE already exists and it's a link, needs to be removed
				cp -a -f "$ONEFILE" "/tmp${DIRNAME}/"
			fi
		done
	done
	sync
	[ "$CLEARPKGLOG" = "yes" ] && rm -f /tmp/var/log/packages/* #120607

	sync
	mksquashfs /tmp/var $WKGMNTPT/puppylivecdbuild/$PUPPYSFS -keep-as-directory
	sync
	rm -rf /tmp/var
	#######END WORKING ON /var#######
	chmod a+r $WKGMNTPT/puppylivecdbuild/* >/dev/null 2>&1
	chmod a-x $WKGMNTPT/puppylivecdbuild/*.sfs >/dev/null 2>&1

fi ###### end of long skip if, creating new sfs

#=================================================================

if [ "$xCDREMASTER" != "" ]; then

m_25="$(gettext 'Almost ready to create the new ISO file!')

$(gettext "If you want to add any more files, say extra SFS files, or to edit or modify the files in any way, do it now. Note, if you add an extra SFS file, say 'devx.sfs' then it will be available for use when you boot the new live-CD.")

$(eval_gettext "If you want to make any changes, use ROX-Filer to open \${WKGMNTPT}/puppylivecdbuild/ and do so now, before clicking the 'OK' button.")"
Xdialog --wrap --left  --title "$m_01" --msgbox "$m_25" 0 80
sync

BOOTLOADER=""
[ -f $WKGMNTPT/puppylivecdbuild/grldr ] && BOOTLOADER="grldr"
[ -f $WKGMNTPT/puppylivecdbuild/isolinux.bin ] && BOOTLOADER="isolinux.bin"
if [ "$BOOTLOADER" = "" ]; then
	m_25_1="$(gettext 'No boot loaders found. You need isolinux.bin or grldr to make bootable CD.')
$(gettext "Click 'OK' to quit.")
$(eval_gettext '(leaving ${WKGMNTPT}/puppylivecdbuild/ files in existence)')"
	Xdialog --wrap --left  --title "$m_01" --msgbox "$m_25_1" 0 0
	exit
fi

if [ "$NEW" = "yes" ]; then	#120628: no change id-string for reuse
	sync
	#100913 need to update file DISTRO_SPECS in initrd.gz, so init script can find puppy files...
	if [ -f $WKGMNTPT/puppylivecdbuild/initrd.gz ]; then
		mv -f $WKGMNTPT/puppylivecdbuild/initrd.gz /tmp #note $WKGMNTPT may be non-linux fs.
		cd /tmp
		gunzip initrd.gz
		mkdir initrd-tree-tmp1
		cd initrd-tree-tmp1
		cat ../initrd | cpio -i -d -m
		sync
		rm -f ../initrd
		cp -a -f /tmp/DISTRO_SPECSupdated ./DISTRO_SPECS #see earlier.
		find . | cpio -o -H newc | gzip -9 > $WKGMNTPT/puppylivecdbuild/initrd.gz
		sync
		cd ..
		rm -rf initrd-tree-tmp1
		cd /root
	elif [ -f $WKGMNTPT/puppylivecdbuild/initrd.xz ]; then
		mv -f $WKGMNTPT/puppylivecdbuild/initrd.xz /tmp #note $WKGMNTPT may be non-linux fs.
		cd /tmp
		unxz initrd.xz
		mkdir initrd-tree-tmp1
		cd initrd-tree-tmp1
		cat ../initrd | cpio -i -d -m
		sync
		rm -f ../initrd
		cp -a -f /tmp/DISTRO_SPECSupdated ./DISTRO_SPECS #see earlier.
		find . | cpio -o -H newc | xz --check=crc32 --lzma2=dict=1MB > $WKGMNTPT/puppylivecdbuild/initrd.xz
		sync
		cd ..
		rm -rf initrd-tree-tmp1
		cd /root
	fi
fi #120628 end

if [ -f $WKGMNTPT/puppylivecdbuild/efi.img ] ; then
	EFI_IMG='efi.img'
elif [ -f $WKGMNTPT/puppylivecdbuild/boot/efi.img ] ; then
	EFI_IMG='boot/efi.img'
fi

#build new iso file
MSG="$(gettext 'ISO file not created.')"
m_27="$(eval_gettext "Click 'Yes' button to create a 'custom-puppy.iso' in \${WKGMNTPT}/ (assuming that there is 100MB-300MB free space)...")
$(eval_gettext "Click 'No' button (or close-box on window) to quit program at this point (leaving  \${WKGMNTPT}/puppylivecdbuild/ files in existence)...")"
Xdialog --wrap --left  --title "$m_01" --ok-label "$Yes_lbl" --cancel-label "$No_lbl" --yesno "$m_27" 0 80
if [ $? -eq 0 ];then
	VOLI=""
	m_27_1="$(gettext 'You can add the CD volume ID.')"
	VOLI=$(Xdialog --title "$m_01" --stdout --inputbox "$m_27_1" 0 60 "$SFSBASE")
	[ "$VOLI" != "" ] && VOLI="-V $(echo "$VOLI"|tr ' ' '_')"
	rm -f $WKGMNTPT/custom-puppy*.iso
	#--
	rm -f $WKGMNTPT/puppylivecdbuild/boot.cat*
	mkdir -p $WKGMNTPT/puppylivecdbuild/boot
	BOOT_CAT="-c boot/boot.catalog"
	#--
	if [ "$EFI_IMG" ];then
		UEFI='-uefi'
		UEFI_OPT='-u'
		# make uefi iso
		rxvt -bg orange -fg black -title "$m_01" -e \
			mkisofs -iso-level 4 -D -R $VOLI -o $WKGMNTPT/custom-puppy${UEFI}.iso \
			-b ${BOOTLOADER} ${BOOT_CAT} -no-emul-boot -boot-load-size 4 -boot-info-table \
			-eltorito-alt-boot -eltorito-platform efi -b "$EFI_IMG" -no-emul-boot \
				$WKGMNTPT/puppylivecdbuild/
	else
		rxvt -bg orange -fg black -title "$m_01" -e \
			mkisofs -iso-level 4 -D -R $VOLI -o $WKGMNTPT/custom-puppy.iso \
			-b ${BOOTLOADER} ${BOOT_CAT} -no-emul-boot -boot-load-size 4 -boot-info-table \
				$WKGMNTPT/puppylivecdbuild/
	fi
	case $BOOTLOADER in *"isolinux"*)
		if which isohybrid ; then
			echo "isohybrid ${UEFI_OPT} $WKGMNTPT/custom-puppy${UEFI}.iso"
			isohybrid ${UEFI_OPT} "$WKGMNTPT/custom-puppy${UEFI}.iso"
		fi ;;
	esac
	MSG="$(eval_gettext '${WKGMNTPT}/custom-puppy${UEFI}.iso created.')"
fi
sync
m_28="$(eval_gettext '${WKGMNTPT}/puppylivecdbuild/ files left in existence.')
$(gettext "Click 'Ok' button to quit...")"
Xdialog --wrap --left  --title "$m_01" --msgbox "$MSG
$m_28" 0 0

else
 sync
 xmsg="$(eval_gettext 'Newly remastered puppy sfs files is created at

${WKGMNTPT}/puppylivecdbuild/')

$(gettext "Click 'Ok' button to quit...")"
 Xdialog --wrap --left  --title "$m_01" --msgbox "$xmsg" 0 0
 exit
fi

### END ###