From 70f3e2517486b8a6cbf35f76c465a7236edaedec Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Thu, 2 Aug 2012 15:17:16 +0800 Subject: [PATCH] fix live img create failure when label assigned and clean some trailing space Signed-off-by: Gui Chen --- mic/imager/livecd.py | 3 +++ mic/kickstart/__init__.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mic/imager/livecd.py b/mic/imager/livecd.py index 92da671..a9f4d09 100644 --- a/mic/imager/livecd.py +++ b/mic/imager/livecd.py @@ -73,6 +73,9 @@ class LiveImageCreatorBase(LoopImageCreator): if len(parts) > 1: raise CreatorError("Can't support multi partitions in ks file " "for this image type") + # FIXME: rename rootfs img to self.name, + # else can't find files when create iso + self._instloops[0]['name'] = self.name + ".img" self.__isodir = None diff --git a/mic/kickstart/__init__.py b/mic/kickstart/__init__.py index 756d3f5..27437b7 100644 --- a/mic/kickstart/__init__.py +++ b/mic/kickstart/__init__.py @@ -238,8 +238,8 @@ class TimezoneConfig(KickstartConfig): self.call([cpcmd, "-f", tz_source, tz_dest]) else: cpcmd = fs.find_binary_path('cp') - subprocess.call([cpcmd, "-f", - self.path(tz_source), + subprocess.call([cpcmd, "-f", + self.path(tz_source), self.path(tz_dest)]) except (IOError, OSError), (errno, msg): raise errors.KsError("Timezone setting error: %s" % msg) -- 2.7.4