kadischi/rc rc.readonly-livecd,1.6,1.7 readonly-halt,1.7,1.8

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/rc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18384/kadischi/rc

Modified Files:
	rc.readonly-livecd readonly-halt 
Log Message:
Actually mount /var/lib/rpm to tmpfs, minor changes.


Index: rc.readonly-livecd
===================================================================
RCS file: /cvs/devel/kadischi/rc/rc.readonly-livecd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rc.readonly-livecd	2 Sep 2006 22:38:31 -0000	1.6
+++ rc.readonly-livecd	4 Sep 2006 19:47:18 -0000	1.7
@@ -23,17 +23,13 @@
 	
 	echo "Binding files from /livecd/tmpfs to their original locations"
 	# Set up temporary file directories
-        ### Setup LiveCD /tmp on ramfs and /var/lib/rpm on ramfs
-	#mount_file /tmp
-	#chmod a+rwxt /livecd/tmpfs/tmp
-        mount -t tmpfs none /tmp
-        chmod a+rwxt /tmp
+	mount_file /tmp
+	chmod a+rwxt /livecd/tmpfs/tmp
  	
 	mount_file /var
         #mount -n --bind /livecd/moved/var/lib/rpm /var/lib/rpm
-        mount -t ramfs none /var/lib/rpm
-        cp /livecd/moved/var/lib/rpm/* /var/lib/rpm 
-	
+	mount_file /var/lib/rpm
+
 	if [ ! -d /livecd/tmpfs/var/tmp ]; then
 		mkdir /livecd/tmpfs/var/tmp
 	fi


Index: readonly-halt
===================================================================
RCS file: /cvs/devel/kadischi/rc/readonly-halt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- readonly-halt	29 Aug 2006 22:39:31 -0000	1.7
+++ readonly-halt	4 Sep 2006 19:47:18 -0000	1.8
@@ -104,7 +104,7 @@
      echo "You may remove any LiveCD or LiveDVD media from the drive"
      /sbin/eject-live-cd
      sleep 10
-     reboot -f
+     reboot
 fi
 if [ "$RUNLEVEL" -eq "0" ]; then
     clear
@@ -112,5 +112,5 @@
     echo "You may remove any LiveCD or LiveDVD media from the drive"
     /sbin/eject-live-cd
     sleep 10
-    halt -f -p
+    halt -p
 fi