This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 3 ++-
libs/InstallImage.py | 11 +++++------
moblin-image-creator.spec | 1 +
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 15474c3a6d6ad3035cc15dae5d86dcd2e4116527
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Oct 30 16:08:07 2008 +0900
Deleted necessary function in NFSLiveIsoImage. Adjusted NFSLiveUsbImage
size.
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index fa9dd40..23b0ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ moblin-image-creator (0.47) gaston; urgency=low
* Added NFS Live CD Image function.
* Added error handling and modified destination of isolinux.bin LiveIsoImage.
* Rebase with nfsboot function. Fixed some comments and install_kernels()
arguments.
+ * Deleted necessary function in NFSLiveIsoImage. Adjusted NFSLiveUsbImage
size.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 30 Oct 2008 11:43:46 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 30 Oct 2008 16:06:52 +0900
moblin-image-creator (0.46) gaston; urgency=low
diff --git a/libs/InstallImage.py b/libs/InstallImage.py
index fc90874..04defa0 100755
--- a/libs/InstallImage.py
+++ b/libs/InstallImage.py
@@ -525,9 +525,7 @@ class NFSLiveIsoImage(InstallImage):
print _("NFSLiveCDImage: Creating Live CD Image Now...")
image_type = _("NFS Live CD Image")
self.create_all_initramfs()
- self.create_rootfs()
initrd_stat_result = os.stat('/tmp/.tmp.initrd0')
- rootfs_stat_result = os.stat(self.rootfs_path)
self.tmp_path = tempfile.mkdtemp('','pdk-', '/tmp')
@@ -541,8 +539,10 @@ class NFSLiveIsoImage(InstallImage):
self.kernels.pop(0)
# Flashing yellow on a green background
self.install_kernels("ae", image_type, 'NFSCDImage')
- pdk_utils.copy(self.rootfs_path, self.tmp_path)
- pdk_utils.copy("/usr/lib/syslinux/isolinux.bin", self.tmp_path)
+ try:
+ pdk_utils.copy(os.path.join(self.project.path,
"/usr/lib/syslinux/isolinux.bin"), self.tmp_path)
+ except OSError:
+ print _("Could not copy isolinux.bin. Ignored error")
print _("Creating NFS CD image file at: %s") % self.path
cmd_line = "genisoimage -quiet -o %s -b isolinux.bin -c boot.cat
-no-emul-boot -boot-load-size 4 -boot-info-table -l -R -r %s" % (self.path,
self.tmp_path)
@@ -554,7 +554,6 @@ class NFSLiveIsoImage(InstallImage):
shutil.rmtree(self.tmp_path)
self.tmp_path = ''
- self.delete_rootfs()
print _("NFSLiveIsoImage: Finished!")
def __str__(self):
@@ -762,7 +761,7 @@ class NFSLiveUsbImage(BaseUsbImage):
self.create_all_initrd()
initrd_stat_result = os.stat('/tmp/.tmp.initrd0')
- size = (initrd_stat_result.st_size / (1024 * 1024)) + 64
+ size = (initrd_stat_result.st_size / (1024 * 1024)) + 4
self.create_usb_image(size)
self.mount_container()
self.kernels.insert(0,self.default_kernel)
diff --git a/moblin-image-creator.spec b/moblin-image-creator.spec
index d3c83bf..d5b4b22 100644
--- a/moblin-image-creator.spec
+++ b/moblin-image-creator.spec
@@ -63,6 +63,7 @@ rm -rf %{buildroot}
%changelog
* Thu Oct 30 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- Rebase with nfsboot function. Fixed some comments and install_kernels()
arguments.
+- Deleted necessary function in NFSLiveIsoImage. Adjusted NFSLiveUsbImage size.
* Wed Oct 22 2008 Mitsutaka Amano <[EMAIL PROTECTED]>
- Added NFS Live CD Image function.
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
