slitaz-tools diff tinyutils/bootfloppybox @ rev 549

Tiny edits
author Paul Issott <paul@slitaz.org>
date Sun Mar 06 19:58:55 2011 +0000 (2011-03-06)
parents 4b0ce259164b
children 5e5779810922
line diff
     1.1 --- a/tinyutils/bootfloppybox	Mon Oct 25 20:53:30 2010 +0000
     1.2 +++ b/tinyutils/bootfloppybox	Sun Mar 06 19:58:55 2011 +0000
     1.3 @@ -435,13 +435,13 @@
     1.4  		ln -s $i /tmp/rootfs$$/$n
     1.5  		n=$(($n + 1))
     1.6  	done
     1.7 -	echo "Unpack rootfs..."
     1.8 +	echo "Unpacking rootfs..."
     1.9  	( zcat $rootfs 2> /dev/null | unlzma -c $rootfs ) | \
    1.10  		( cd /tmp/rootfs$$/fs ; cpio -idm > /dev/null )
    1.11  	if [ $(unlzma -c $rootfs 2> /dev/null| wc -c) -gt $(stat -c %s $rootfs) ]; then
    1.12  		if [ $(du -ck $rootfs $bzimage | awk 'END { print $1 }') -gt 15296 ]; then
    1.13  	# The rootfs.gz file is too big, extract a minimum bootfs with busybox stuff
    1.14 -			echo "Extract bootfs..."
    1.15 +			echo "Extracting bootfs..."
    1.16  			mv /tmp/rootfs$$/fs /tmp/rootfs$$/fs0
    1.17  			for i in lib bin sbin usr/bin usr/sbin ; do
    1.18  				mkdir -p /tmp/rootfs$$/fs/$i
    1.19 @@ -486,7 +486,7 @@
    1.20  		fi
    1.21  	else
    1.22  	# This is a loram rootfs.gz, extract loram bootstrap
    1.23 -		echo "Split loram rootfs..."
    1.24 +		echo "Splitting loram rootfs..."
    1.25  		offset=$(awk '/07070100/ { o+=index($0,"07070100"); print o/4 ; exit } { o+=1+length() }' < $rootfs)
    1.26  		dd if=$rootfs skip=$(($offset / 1024)) bs=4k count=1 2> /dev/null | \
    1.27  		dd skip=$(($offset % 1024)) bs=4 of=/tmp/rootfs$$/1/root 2> /dev/null
    1.28 @@ -497,7 +497,7 @@
    1.29  	# Create extra rootfs floppies
    1.30  	for i in /tmp/rootfs$$/[1-9]*/root* ; do
    1.31  		[ -f $i ] || continue
    1.32 -		echo "Create floppies for rootfs $(basename $(dirname $i) )..."
    1.33 +		echo "Creating floppies for rootfs $(basename $(dirname $i) )..."
    1.34  		case "$(dd if=$i bs=1 count=4 2> /dev/null)" in
    1.35  		0707) cat $i ;;
    1.36  		*)    zcat $i 2> /dev/null || unlzma -c $i ;;
    1.37 @@ -523,7 +523,7 @@
    1.38  		esac
    1.39  		shift 2
    1.40  	done
    1.41 -	echo "Create /init ..."
    1.42 +	echo "Creating /init ..."
    1.43  	base=100
    1.44  	set -- $selection
    1.45  	for i in /tmp/rootfs$$/[1-9]* ; do
    1.46 @@ -541,7 +541,7 @@
    1.47  	done | buildinit /tmp/rootfs$$/fs
    1.48  	cmdline="$(grep append /tmp/iso$$/boot/isolinux/isolinux.cfg | tail -n 1 | sed 's/.*gz //')"
    1.49  	( cd /tmp/rootfs$$/fs ; find | cpio -o -H newc ) | lzma e /tmp/rootfs$$/rootfs -si
    1.50 -	echo "Create first stage boot floppies..."
    1.51 +	echo "Creating first stage boot floppies..."
    1.52  	floppyset $bzimage /tmp/rootfs$$/rootfs "$cmdline"
    1.53  	base=100
    1.54  	for i in /tmp/rootfs$$/[1-9]* ; do