This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 5 +++--
libs/InstallImage.py | 28 +++++++++++++++++++++++++++-
libs/Mkinitrd.py | 3 ---
3 files changed, 30 insertions(+), 6 deletions(-)
New commits:
commit 877fb0eb84c9290f4db4f29211594757e5dd466d
Author: Prajwal Mohan <[EMAIL PROTECTED]>
Date: Tue Jul 29 17:09:22 2008 -0700
Adding creating grub menu
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 8266fcc..e3baae5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,9 +81,10 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
[ Prajwal Mohan ]
* Making changes to Install Image to handle yum based platforms
- * Making changes to Makefile
+ * Making changes to Makefile
+ * Adding creating grub menu
- -- Prajwal Mohan <[EMAIL PROTECTED]> Tue, 29 Jul 2008 16:21:26 -0700
+ -- Prajwal Mohan <[EMAIL PROTECTED]> Tue, 29 Jul 2008 17:09:01 -0700
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/libs/InstallImage.py b/libs/InstallImage.py
index b9a8f92..e408a86 100755
--- a/libs/InstallImage.py
+++ b/libs/InstallImage.py
@@ -395,6 +395,32 @@ class InstallImage(object):
break;
menu.close()
+ def create_grub_menu_yum(self):
+ #FIXME: We need to generate grub menu
+ print "Creating temporary grub menu.list....................."
+ menu_dir = os.path.join(self.target.path, "boot/grub")
+ menu_file = os.path.join(menu_dir, "menu.lst")
+
+ if os.path.exists(menu_file):
+ os.unlink(menu_file)
+ if not os.path.exists(menu_dir):
+ os.makedirs(menu_dir)
+
+ out_file = open(menu_file, 'w')
+ print >> out_file, """#Temp Grub menu.list
+
+ default 0
+ timeout 10
+
+ title Moblin2 (2.6.25)
+ root (hd0,0)
+ kernel /vmlinuz-2.6.25-default boot=disk
+ initrd /initrd.img-2.6.25-default
+ """
+ out_file.close()
+ print "Done."
+
+
def __str__(self):
return ("<InstallImage: project=%s, target=%s, name=%s>"
% (self.project, self.target, self.name))
@@ -583,7 +609,7 @@ class InstallUsbImage(BaseUsbImage):
self.apply_hd_kernel_cmdline()
if self.project.platform.config_info['package_manager'] == 'yum':
self.create_all_initrd()
- self.create_grub_menu_temp()
+ self.create_grub_menu_yum()
self.create_bootfs()
self.create_rootfs()
diff --git a/libs/Mkinitrd.py b/libs/Mkinitrd.py
index 4bce06e..11ca81b 100755
--- a/libs/Mkinitrd.py
+++ b/libs/Mkinitrd.py
@@ -6,7 +6,6 @@ import re
import shutil
import sys
import tempfile
-import time
import SDK
@@ -52,10 +51,8 @@ class Busybox(object):
shutil.copy(self.cmd_path, 'busybox')
for cmd in self.cmds:
- print cmd
if not os.path.exists(cmd):
os.symlink("busybox", cmd)
- time.sleep(20)
os.chdir(save_cwd)
def create(project, initrd_file, fs_type='RAMFS'):
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
