imgcreate/creator.py | 4 ++--
imgcreate/kickstart.py | 6 ++++++
tools/mayflower | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit ce1a7bb55abb8ae9c04351555bb28edc9e6c6285
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Feb 7 01:02:32 2008 -0500
Don't explicitly specify the filesystem type to mount so that ext2 can
get mounted as well
diff --git a/tools/mayflower b/tools/mayflower
index f77b2be..2e46098 100755
--- a/tools/mayflower
+++ b/tools/mayflower
@@ -609,7 +609,7 @@ do_live_from_base_loop() {
rm -f /dev/root
ln -s /dev/mapper/live-rw /dev/root
- mount -n -t ext3 /dev/mapper/live-rw /sysroot
+ mount -n /dev/mapper/live-rw /sysroot
# here you can modify the rw ext3 fs for testing if you don't want to
# respin the entire rootfs (which takes ages). Example
#
commit 4f761b21c6ab98a2421d7706c12860c55c26fa69
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Thu Feb 7 01:02:09 2008 -0500
Actually follow the specified filesystem from the ks.cfg
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index b1766b6..40dcead 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -206,7 +206,7 @@ class ImageCreator(object):
A sensible default implementation is provided.
"""
- s = "/dev/root / ext3 defaults,noatime 0 0\n"
+ s = "/dev/root / %s defaults,noatime 0 0\n"
%(self._fstype)
s += "devpts /dev/pts devpts gid=5,mode=620 0 0\n"
s += "tmpfs /dev/shm tmpfs defaults 0 0\n"
s += "proc /proc proc defaults 0 0\n"
@@ -697,7 +697,7 @@ class LoopImageCreator(ImageCreator):
self.__minsize_KB = 0
self.__blocksize = 4096
- self.__fstype = "ext3"
+ self.__fstype = kickstart.get_image_fstype(self.ks, "ext3")
self.__instloop = None
self.__imgdir = None
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 4c6f48f..a7e0723 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -396,6 +396,12 @@ def get_image_size(ks, default = None):
return int(p.size) * 1024L * 1024L
return default
+def get_image_fstype(ks, default = None):
+ for p in ks.handler.partition.partitions:
+ if p.mountpoint == "/" and p.fstype:
+ return p.fstype
+ return default
+
def get_modules(ks):
devices = []
if isinstance(ks.handler.device, kscommands.device.FC3_Device):
Show replies by date