tazusb rev 156 4.2.4

4.2.4
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 18 19:15:39 2014 +0000 (2014-05-18)
parents c84bf2122cde
children 09c4bbe7eee6
files tazusb
line diff
     1.1 --- a/tazusb	Sat Mar 08 02:21:09 2014 +0000
     1.2 +++ b/tazusb	Sun May 18 19:15:39 2014 +0000
     1.3 @@ -4,11 +4,11 @@
     1.4  # SliTaz LiveUSB bootable media and/or USB /home partition, such as
     1.5  # flash keys, SD card or USB harddisk.
     1.6  #
     1.7 -# Copyright (C) 2012 SliTaz GNU/Linux - GNU gpl v2
     1.8 +# Copyright (C) 2014 SliTaz GNU/Linux - GNU gpl v2
     1.9  #
    1.10  # Authors: see AUTHORS file
    1.11  #
    1.12 -VERSION=4.2.2
    1.13 +VERSION=4.2.4
    1.14  
    1.15  . /lib/libtaz.sh
    1.16  
    1.17 @@ -21,7 +21,7 @@
    1.18  
    1.19  COMMAND=$1
    1.20  TARGET_ROOT=/media/flash
    1.21 -DRIVE_NAME=$(cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3)
    1.22 +DRIVE_NAME=$(grep "drive name" < /proc/sys/dev/cdrom/info | cut -f 3)
    1.23  CDROM=/dev/$DRIVE_NAME
    1.24  LOG=/tmp/$(basename $0).log
    1.25  
    1.26 @@ -261,6 +261,8 @@
    1.27  	mkdir -p $TARGET_ROOT/boot
    1.28  	cp /media/cdrom/boot/bzImage $TARGET_ROOT/boot
    1.29  	cp /media/cdrom/boot/rootfs*.gz $TARGET_ROOT/boot
    1.30 +	cp /media/cdrom/boot/memtest $TARGET_ROOT/boot 2> /dev/null
    1.31 +	cp /media/cdrom/boot/*pxe $TARGET_ROOT/boot 2> /dev/null
    1.32  	status
    1.33  }
    1.34  
    1.35 @@ -311,7 +313,7 @@
    1.36  	cp /media/cdrom/boot/isolinux/*.kbd $TARGET_ROOT/boot/$ST
    1.37  	cp /media/cdrom/boot/isolinux/*.c32 $TARGET_ROOT/boot/$ST
    1.38  	sed -i -e s/'SliTaz GNU\/Linux'/'SliTaz GNU\/Linux LiveUSB'/ \
    1.39 -		-e s/'isolinux'/'extlinux'/ $TARGET_ROOT/boot/$ST/$ST.$STE
    1.40 +		-e "s/isolinux/$ST/" $TARGET_ROOT/boot/$ST/$ST.$STE
    1.41  }
    1.42  
    1.43  # Let user exit or reboot.
    1.44 @@ -466,6 +468,12 @@
    1.45  		echo "" > /etc/udev/rules.d/70-persistant-cd.rules
    1.46  		
    1.47  		# Create list of files
    1.48 +		# find / -xdev | sed '/^\/home\//d;/^\/tmp\//d' >/tmp/list
    1.49 +		# for dev in console null tty tty1
    1.50 +		# do
    1.51 +		#	echo /dev/$dev >>/tmp/list
    1.52 +		# done
    1.53 +
    1.54  		find /bin /etc /init /sbin /var /dev /lib /root /usr >/tmp/list
    1.55  
    1.56  		for dir in /home /proc /run /sys /tmp /mnt /media /media/cdrom /media/flash /media/usbdisk
    1.57 @@ -476,16 +484,16 @@
    1.58  		# Generate initramfs with specified compression
    1.59  		if [ "$COMPRESSION" = "lzma" ]; then
    1.60  			gettext "Creating rootfs.gz with lzma compression... "
    1.61 -			cat /tmp/list | cpio -o -H newc | lzma e -si -so > /rootfs.gz
    1.62 +			cpio -o -H newc | lzma e -si -so > /rootfs.gz
    1.63  
    1.64  		elif [ "$COMPRESSION" = "gzip" ]; then
    1.65  			gettext "Creating rootfs.gz with gzip compression... "
    1.66 -			cat /tmp/list | cpio -o -H newc | gzip -9 > /rootfs.gz
    1.67 +			cpio -o -H newc | gzip -9 > /rootfs.gz
    1.68  
    1.69  		else
    1.70  			gettext "Creating rootfs.gz without compression... "
    1.71 -			cat /tmp/list | cpio -o -H newc > /rootfs.gz
    1.72 -		fi
    1.73 +			cpio -o -H newc > /rootfs.gz
    1.74 +		fi < /tmp/list
    1.75  
    1.76  		# Get initramfs size
    1.77  		size=`du -sh /rootfs.gz | cut -f 1`