tazlito rev 386

writeiso: fix /var/log workaround
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Sun Jun 21 20:38:56 2015 +0300 (2015-06-21)
parents 2d5213a11839
children 2687e9f01abc
files tazlito
line diff
     1.1 --- a/tazlito	Mon May 18 15:20:12 2015 +0200
     1.2 +++ b/tazlito	Sun Jun 21 20:38:56 2015 +0300
     1.3 @@ -375,7 +375,7 @@
     1.4  		echo "Creating rootfs.gz without compression... "
     1.5  		cpio -o -H newc > /rootfs.gz
     1.6  	fi < /tmp/list
     1.7 -	# [ $align == '1' ] && align_to_32bits /rootfs.gz
     1.8 +	# [ $align == 'y' ] && align_to_32bits /rootfs.gz
     1.9  	# align_to_32bits /rootfs.gz
    1.10  	echo 1 > /tmp/rootfs
    1.11  }
    1.12 @@ -2334,10 +2334,6 @@
    1.13  		fi
    1.14  		
    1.15  		# Clean-up files by default
    1.16 -		if [ ! $(find /var/log/wtmp -size +4k) = "" ]; then
    1.17 -			mv -f /var/log/wtmp /tmp/tazlito-wtmp
    1.18 -			touch /var/log/wtmp
    1.19 -		fi
    1.20  		newline > /etc/udev/rules.d/70-persistent-net.rules
    1.21  		newline > /etc/udev/rules.d/70-persistant-cd.rules
    1.22  
    1.23 @@ -2356,18 +2352,22 @@
    1.24  			[ -d $dir ] && echo $dir
    1.25  		done >>/tmp/list
    1.26  
    1.27 -		sed -i '/var\/run\/.*pid$/d'	/tmp/list
    1.28 -		sed -i '/var\/run\/utmp/d'	/tmp/list
    1.29 -		sed -i '/.*\/.gvfs/d'	/tmp/list
    1.30 -
    1.31 -		for removelog in auth boot messages dmesg daemon slim .*old Xorg; do
    1.32 +		sed '/var\/run\/.*pid$/d ; /var\/run\/utmp/d ; /.*\/.gvfs/d' -i /tmp/list
    1.33 +		
    1.34 +		if [ ! $(find /var/log/slitaz/tazpkg.log -size +4k) = "" ]; then
    1.35 +			sed -i "/var\/log\/slitaz\/tazpkg.log/d" /tmp/list
    1.36 +		fi
    1.37 +		mv -f /var/log/wtmp /tmp/tazlito-wtmp
    1.38 +		touch /var/log/wtmp
    1.39 +		
    1.40 +		for removelog in \
    1.41 +		auth boot messages dmesg daemon slim .*old Xorg tazpanel cups; do
    1.42  			sed -i "/var\/log\/$removelog/d" /tmp/list
    1.43  		done
    1.44  
    1.45  		# Generate initramfs with specified compression and display rootfs
    1.46  		# size in realtime.
    1.47 -		rm -f /tmp/.write-iso*	2> /dev/null
    1.48 -		rm -f /tmp/rootfs	2> /dev/null
    1.49 +		rm -f /tmp/.write-iso*  /tmp/rootfs	2>/dev/null
    1.50  
    1.51  		write_initramfs &
    1.52  		sleep 2
    1.53 @@ -2378,7 +2378,6 @@
    1.54  			sleep 1
    1.55  			echo -en "\\033[18G`du -sh /rootfs.gz | awk '{print $1}'`    "
    1.56  		done
    1.57 -		[ -f /tmp/tazlito-wtmp ] && \
    1.58  		mv -f /tmp/tazlito-wtmp /var/log/wtmp
    1.59  		echo -e "\n"
    1.60  		rm -f /tmp/rootfs