wok-6.x rev 52

Modified slitaz-base-files + slitaz-boot-scripts to avoid errosr msg
author Christophe Lincoln <pankso@slitaz.org>
date Thu Dec 20 22:17:41 2007 +0100 (2007-12-20)
parents b9474e3f7037
children f80752ee205e
files slitaz-base-files/receipt slitaz-boot-scripts/receipt
line diff
     1.1 --- a/slitaz-base-files/receipt	Thu Dec 20 22:05:08 2007 +0100
     1.2 +++ b/slitaz-base-files/receipt	Thu Dec 20 22:17:41 2007 +0100
     1.3 @@ -34,19 +34,17 @@
     1.4  {
     1.5  	local root
     1.6  	root=$1
     1.7 -	echo -n "Creating backup of all files in /etc..."
     1.8 -	cp -a $root/etc $root/tmp/etc.bak
     1.9 -	status
    1.10 +	echo "Creating backup of all files in /etc..."
    1.11 +	cp -a $root/etc $root/tmp/etc.bak 2>/dev/null
    1.12  }
    1.13  
    1.14  post_install()
    1.15  {
    1.16  	local root
    1.17  	root=$1
    1.18 -	echo -n "Restoring files from /etc/etc.bak..."
    1.19 -	cp -a $root/tmp/etc.bak/* $root/etc
    1.20 +	echo "Restoring files from /etc/etc.bak..."
    1.21 +	cp -a $root/tmp/etc.bak/* $root/etc 2>/dev/null
    1.22  	rm -rf $root/tmp/etc.bak
    1.23 -	status
    1.24  	
    1.25  	# Remove old base-file pkg info
    1.26  	rm -rf $root/var/lib/tazpkg/installed/base-files
     2.1 --- a/slitaz-boot-scripts/receipt	Thu Dec 20 22:05:08 2007 +0100
     2.2 +++ b/slitaz-boot-scripts/receipt	Thu Dec 20 22:17:41 2007 +0100
     2.3 @@ -41,23 +41,21 @@
     2.4  	rm -f $root/etc/motd
     2.5  	
     2.6  	# Backup file to restore with post install
     2.7 -	echo -n "Creating backups of configs..."
     2.8 -	cp $root/etc/rcS.conf $root/etc/rcS.conf.bak
     2.9 -	cp $root/etc/network.conf $root/etc/network.conf.bak
    2.10 -	cp $root/etc/inittab $root/etc/inittab.bak
    2.11 -	cp $root/etc/init.d/local.sh $root/etc/init.d/local.sh.bak
    2.12 -	status
    2.13 +	echo "Creating backups of configs..."
    2.14 +	cp $root/etc/rcS.conf $root/etc/rcS.conf.bak 2>/dev/null
    2.15 +	cp $root/etc/network.conf $root/etc/network.conf.bak 2>/dev/null
    2.16 +	cp $root/etc/inittab $root/etc/inittab.bak 2>/dev/null
    2.17 +	cp $root/etc/init.d/local.sh $root/etc/init.d/local.sh.bak 2>/dev/null
    2.18  }
    2.19  
    2.20  post_install()
    2.21  {
    2.22   	local root
    2.23   	root=$1
    2.24 -	echo -n "Restoring configs backups..."
    2.25 -	mv -f $root/etc/rcS.conf.bak $root/etc/rcS.conf
    2.26 -	mv -f $root/etc/network.conf.bak $root/etc/network.conf
    2.27 -	mv -f $root/etc/inittab.bak $root/etc/inittab
    2.28 -	mv -f $root/etc/init.d/local.sh.bak $root/etc/init.d/local.sh
    2.29 -	status
    2.30 +	echo "Restoring configs backups..."
    2.31 +	mv -f $root/etc/rcS.conf.bak $root/etc/rcS.conf 2>/dev/null
    2.32 +	mv -f $root/etc/network.conf.bak $root/etc/network.conf 2>/dev/null
    2.33 +	mv -f $root/etc/inittab.bak $root/etc/inittab 2>/dev/null
    2.34 +	mv -f $root/etc/init.d/local.sh.bak $root/etc/init.d/local.sh 2>/dev/null
    2.35  }
    2.36