imgcreate/live.py | 6 ++++--
tools/livecd-iso-to-disk.sh | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit e128200e1b6b9f2d71681dcd74e8906f8c775c1f
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Fri Mar 14 18:06:30 2008 -0400
Add pcmcia modules (#435903)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 0474d59..c6267f7 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -66,7 +66,7 @@ class LiveImageCreatorBase(LoopImageCreator):
self.__isodir = None
- self.__modules = ["=ata", "sym53c8xx", "aic7xxx", "=usb", "=firewire", "=mmc"]
+ self.__modules = ["=ata", "sym53c8xx", "aic7xxx", "=usb", "=firewire", "=mmc", "=pcmcia"]
self.__modules.extend(kickstart.get_modules(self.ks))
#
@@ -209,7 +209,7 @@ class LiveImageCreatorBase(LoopImageCreator):
f.write('LIVEOS="yes"\n')
f.write('PROBE="no"\n')
f.write('MODULES+="squashfs ext3 ext2 vfat msdos "\n')
- f.write('MODULES+="sr_mod sd_mod ide-cd "\n')
+ f.write('MODULES+="sr_mod sd_mod ide-cd cdrom "\n')
for module in self.__modules:
if module == "=usb":
@@ -220,6 +220,8 @@ class LiveImageCreatorBase(LoopImageCreator):
f.write('MODULES+="sbp2 ohci1394 ieee1394 "\n')
elif module == "=mmc":
f.write('MODULES+="mmc_block sdhci "\n')
+ elif module == "=pcmcia":
+ f.write('MODULES+="pata_pcmcia "\n')
else:
f.write('MODULES+="' + module + ' "\n')
commit eb2c5c3c5e8a3e78a19d1cc2ac06813ee5a05442
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Mon Mar 10 11:34:40 2008 -0400
Deal with sillies of bash so that we don't check overlaysizemb unless it exists
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 5aeeca7..0302bcf 100644
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -197,9 +197,11 @@ checkPartActive $USBDEV
checkMBR $USBDEV
[ -n $resetmbr ] && resetMBR $USBDEV
-if [ -n "$overlaysizemb" -a "$USBFS" = "vfat" -a "$overlaysizemb" -gt 2047 ]; then
+if [ -n "$overlaysizemb" -a "$USBFS" = "vfat" ]; then
+ if [ "$overlaysizemb" -gt 2047 ]; then
echo "Can't have an overlay greater than 2048MB on VFAT"
exitclean
+ fi
fi
# FIXME: would be better if we had better mountpoints