kadischi/livecd_generator movefiles.py,1.5,1.6

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	movefiles.py 
Log Message:
Use buildstamp file for stamping .livecd, make /var/lib/rpm writeable


Index: movefiles.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/movefiles.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- movefiles.py	9 Jul 2006 09:41:40 -0000	1.5
+++ movefiles.py	4 Sep 2006 15:51:38 -0000	1.6
@@ -16,6 +16,7 @@
     '/opt',
     '/mnt',
     '/media',
+    '/var/lib/rpm',
     ]
 
 # Files that we don`t want to be on tmpfs,
@@ -24,9 +25,11 @@
 # mount --bind to their original locations.
 # The reason we don`t want then on tmpfs is that
 # they are big and we don`t need them to be writable
-files_to_be_moved = [
-    '/var/lib/rpm',
-    ]
+### Disable this for now, as Anaconda grabs locks we want /var/lib/rpm
+### writeable.
+# files_to_be_moved = [
+#    '/var/lib/rpm',
+#    ]
 
 # Files that we need to stay in their original 
 # locations cause we need them before rc.readonly
@@ -50,19 +53,24 @@
 
 rootdir = sys.argv[1]
 
-for file in files_to_be_moved:
-    src = normalize_path ([file],rootdir)
-    dst = normalize_path (['/livecd/moved',file],rootdir)
-    os.renames (src, dst)
-    if os.path.isfile (dst):
-        os.system ("/bin/touch %s" % src)
-    else:
-        os.makedirs (src)
+### Disable this for now.
+# for file in files_to_be_moved:
+#    src = normalize_path ([file],rootdir)
+#    dst = normalize_path (['/livecd/moved',file],rootdir)
+#    os.renames (src, dst)
+#    if os.path.isfile (dst):
+#        os.system ("/bin/touch %s" % src)
+#    else:
+#        os.makedirs (src)
 
 for file in files_to_be_writable:
     src = normalize_path ([file],rootdir)
     dst = normalize_path (['/livecd/tmpfs',file],rootdir)
-    os.renames (src, dst)
+    try:
+        os.renames (src, dst)
+    except: 
+        pass
+
     if os.path.isfile (dst):
         os.system ("/bin/touch %s" % src)
     else: