3 commits - config/livecd-fedora-base-desktop.ks creator/livecd-creator

[Jeremy Katz]

 config/livecd-fedora-base-desktop.ks |    6 ++++++
 creator/livecd-creator               |   17 +++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit d3b2df56747e02009d7dbeea4619efa147ef5148
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Thu Oct 25 13:24:26 2007 -0400

    add a hidden option to skip minimizing the filesystem size as it makes my
    testing a lot quicker and avoids me committing the change to comment out
    the steps...

diff --git a/creator/livecd-creator b/creator/livecd-creator
index f07c72c..1160077 100755
--- a/creator/livecd-creator
+++ b/creator/livecd-creator
@@ -1509,6 +1509,8 @@ def parse_options(args):
     # Don't compress the image.
     parser.add_option("-s", "--skip-compression",
action="store_true", dest="skip_compression",
                       help=optparse.SUPPRESS_HELP)
+    parser.add_option("", "--skip-minimize",
action="store_true", dest="skip_minimize",
+                      help=optparse.SUPPRESS_HELP)
 
     (options, args) = parser.parse_args()
     if not options.kscfg or not os.path.isfile(options.kscfg):
@@ -1579,8 +1581,9 @@ def main():
 
         target.unmount()
 
-        target.cleanupDeleted()
-        target.genMinInstDelta()
+        if not skip_minimize:
+            target.cleanupDeleted()
+            target.genMinInstDelta()
 
         target.package()
 


commit 703b9b4a7ef0622740f40723001e2dbbf8e38477
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Thu Oct 25 13:21:22 2007 -0400

    avoid lvm files sticking around as they can lead to weirdness later (#346471)

diff --git a/creator/livecd-creator b/creator/livecd-creator
index b0a2cf4..f07c72c 100755
--- a/creator/livecd-creator
+++ b/creator/livecd-creator
@@ -596,6 +596,16 @@ class ImageCreator(object):
         finally:
             self.ayum.closeRpmDB()
 
+        # do some clean up to avoid lvm info leakage.  this sucks.
+        for subdir in ("cache", "backup", "archive"):
+            for f in os.listdir("%s/install_root/etc/lvm/%s"
+                                %(self.build_dir, subdir)):
+                try:
+                    os.unlink("%s/install_root/etc/lvm/%s/%s"
+                              %(self.build_dir, subdir, f))
+                except:
+                    pass
+
     def writeNetworkIfCfg(self, instroot, network):
         path = instroot + "/etc/sysconfig/network-scripts/ifcfg-" +
network.device
 


commit 185b3cf41bb0284f9db2db972b36f7148bae021e
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Thu Oct 25 13:16:14 2007 -0400

    remove the qlogic firmwares for now as they push us over on size and we're
    in the final push for f8

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index e30792e..6c66597 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -41,6 +41,12 @@ memtest86+
 # lose the compat stuff
 -compat*
 
+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+-ql2400-firmware
+
 # scanning takes quite a bit of space :/
 -xsane
 -xsane-gimp