ppcrcd/trunk/initrd.dir/linuxrc

[sparky]

Author: sparky
Date: Wed Mar 22 22:40:05 2006
New Revision: 7285

Modified:
   ppcrcd/trunk/initrd.dir/linuxrc
Log:
- prepare most dirs before extracting config


Modified: ppcrcd/trunk/initrd.dir/linuxrc
==============================================================================
--- ppcrcd/trunk/initrd.dir/linuxrc	(original)
+++ ppcrcd/trunk/initrd.dir/linuxrc	Wed Mar 22 22:40:05 2006
@@ -157,7 +157,7 @@
 P="/initrd"
 B="$P/bin"
 
-# We nead /proc
+# We need /proc
 $B/mount -n -t proc proc /proc
 
 findcd
@@ -189,29 +189,29 @@
 	fi
 done
 
+$B/echo "${cG}*** Preparing RW directories${cE}"
+# cp rw files
 /bin/cp -a /live/etc /etc
 /bin/chmod -R +w /etc
+/bin/cp -a /live/var /var
+/bin/chmod -R +w /var
+/bin/cp -a /live/dev /dev
+/bin/chmod -R +w /dev
+/bin/touch /fastboot
 
 if $B/test -n "$CONFIG"; then
 	$B/echo "${cG}*** Extracting configuration${cE}"
-	{ /bin/gunzip -c $CFILE || $B/cat $CFILE; } | \
+	{ /bin/gunzip -c $CFILE 2>/dev/null || $B/cat $CFILE; } | \
 		/usr/lib/ppcrcd/xmluntar.pl
 	$B/test -r etc/fstab.add && \
 		{ $B/echo "#Saved:"; $B/cat etc/fstab.add; } >> etc/fstab
 	$B/rm -f etc/fstab.add	
 fi
 
-
-$B/echo "${cG}*** Preparing RW directories${cE}"
-# cp rw files
 /bin/cp -a /etc/skel /root
 /bin/chmod -R +w /root
 /bin/chmod +x /root/.bash*
-/bin/cp -a /live/var /var
-/bin/chmod -R +w /var
-/bin/cp -a /live/dev /dev
-/bin/chmod -R +w /dev
-/bin/touch /fastboot
+
 
 if $B/test -n "$TOMEM"; then
 	/bin/umount /media/ppcrcd