[Fedora-livecd-list] 2 commits - imgcreate/live.py tools/mayflower

[Jeremy Katz]

 imgcreate/live.py |    4 +++-
 tools/mayflower   |    5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 536d0ed3898231573ccd4d1f9f4f91f6c37efd12
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Jan 30 11:55:00 2008 -0500

    Allow running live images from MMC/SD (#430444)
    
    Allow getting MMC/SD related modules into the initrd and also ensure that
    mmc_block gets loaded

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 0e35df3..4191c8b 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -68,7 +68,7 @@ class LiveImageCreatorBase(LoopImageCreator):
 
         self.__isodir = None
 
-        self.__modules = ["=ata", "sym53c8xx", "aic7xxx", "=usb", "=firewire"]
+        self.__modules = ["=ata", "sym53c8xx", "aic7xxx", "=usb", "=firewire", "=mmc"]
         self.__modules.extend(kickstart.get_modules(self.ks))
 
     #
@@ -226,6 +226,8 @@ class LiveImageCreatorBase(LoopImageCreator):
             elif module == "=firewire":
                 f.write('MODULES+="firewire-sbp2 firewire-ohci "\n')
                 f.write('MODULES+="sbp2 ohci1394 ieee1394 "\n')
+            elif module == "=mmc":
+                f.write('MODULES+="mmc_block sdhlc "\n')
             else:
                 f.write('MODULES+="' + module + ' "\n')
 
diff --git a/tools/mayflower b/tools/mayflower
index b6789b8..f77b2be 100755
--- a/tools/mayflower
+++ b/tools/mayflower
@@ -447,7 +447,7 @@ echo "env{MODALIAS}\"" >> /etc/udev/rules.d/10-modprobe.rules
 echo "ACTION==\"add\", SUBSYSTEM==\"scsi_device\" RUN+=\"/sbin/modprobe sg\"" >> /etc/udev/rules.d/10-modprobe.rules
 echo "ACTION==\"add\", SUBSYSTEM==\"scsi_device\", SYSFS{type}==\"0|7|14\", RUN+=\"/sbin/modprobe sd_mod\"" >> /etc/udev/rules.d/10-modprobe.rules
 echo "ACTION==\"add\", SUBSYSTEM==\"scsi_device\", SYSFS{type}==\"[45]\", RUN+=\"/sbin/modprobe sr_mod\"" >> /etc/udev/rules.d/10-modprobe.rules
-
+echo "SUBSYSTEM==\"mmc\", RUN+=\"/sbin/modprobe mmc_block\"" >> /etc/udev/rules.d/10-modprobe.rules
 
 # FIXME: hack since sr_mod seems to fail to get loaded sometimes (#239657)
 /sbin/modprobe sr_mod


commit e7d148241f096c4bbb884e725392c52a7a6222cf
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Jan 30 11:47:39 2008 -0500

    Remove OLPC-specific bit

diff --git a/tools/mayflower b/tools/mayflower
index 5e9e097..b6789b8 100755
--- a/tools/mayflower
+++ b/tools/mayflower
@@ -448,9 +448,6 @@ echo "ACTION==\"add\", SUBSYSTEM==\"scsi_device\" RUN+=\"/sbin/modprobe sg\"" >>
 echo "ACTION==\"add\", SUBSYSTEM==\"scsi_device\", SYSFS{type}==\"0|7|14\", RUN+=\"/sbin/modprobe sd_mod\"" >> /etc/udev/rules.d/10-modprobe.rules
 echo "ACTION==\"add\", SUBSYSTEM==\"scsi_device\", SYSFS{type}==\"[45]\", RUN+=\"/sbin/modprobe sr_mod\"" >> /etc/udev/rules.d/10-modprobe.rules
 
-# OLPC specific: olpc_nand_enable, hardcodes this device file.. sigh..
-#
-echo "KERNEL==\"msr[0-9]*\", NAME=\"cpu/%n/msr\"" > /etc/udev/rules.d/20-cpu.rules
 
 # FIXME: hack since sr_mod seems to fail to get loaded sometimes (#239657)
 /sbin/modprobe sr_mod