[Fedora-livecd-list] 3 commits - imgcreate/kickstart.py imgcreate/live.py Makefile

[Warren Togami 砥上勇]

 Makefile               |    2 +-
 imgcreate/kickstart.py |    2 +-
 imgcreate/live.py      |    9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 5ab5f01adc69f23ade5170b14d7b61d3ff7e3a37
Author: Warren Togami <wtogami at redhat.com>
Date:   Mon Oct 19 15:16:06 2009 -0400

    version 029

diff --git a/Makefile b/Makefile
index 18dcba6..8175ed6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 028
+VERSION = 029
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit bfe8df0560339eedcef2958171eb6b04fe438e76
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Oct 19 15:12:00 2009 -0400

    Tell dracut not to ask for LUKS passwords or activate mdraid sets
    
    By default dracut will try to activate any LUKS devices it finds while
    looking for the rootfs, and bring up any mdraid arrays it finds, this is
    undesirable behaviour for the livecd, to tell it to not do this.

diff --git a/imgcreate/live.py b/imgcreate/live.py
index ed3d563..78cbff7 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -462,10 +462,17 @@ menu hiddenrow 5
             else:
                 long = "Boot %s(%s)" % (self.name, kernel)
 
+
+            # tell dracut not to ask for LUKS passwords or activate mdraid sets
+            if isDracut:
+                kern_opts = kernel_options + " rd_NO_LUKS rd_NO_MD"
+            else:
+                kern_opts = kernel_options
+
             cfg += self.__get_image_stanza(is_xen, isDracut,
                                            fslabel = self.fslabel,
                                            isofstype = "auto",
-                                           liveargs = kernel_options,
+                                           liveargs = kern_opts,
                                            long = long,
                                            short = "linux" + index,
                                            extra = "",


commit 3cf56948c863ef8642a39f4cf77a9b53c12a4fa8
Author: Warren Togami <wtogami at redhat.com>
Date:   Mon Oct 19 15:10:39 2009 -0400

    Silence the /etc/modprobe.conf deprecation warning.

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 98db856..c926977 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -406,7 +406,7 @@ class SelinuxConfig(KickstartConfig):
     """A class to apply a kickstart selinux configuration to a system."""
     def relabel(self, ksselinux):
         # touch some files which get unhappy if they're not labeled correctly
-        for fn in ("/etc/modprobe.conf", "/etc/resolv.conf"):
+        for fn in ("/etc/resolv.conf"):
             path = self.path(fn)
             f = file(path, "w+")
             os.chmod(path, 0644)