[meego-commits] 7869: Changes to Trunk:Testing/installer

[Vivian Zhang]

Hi,
I have made the following changes to installer in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Vivian Zhang

[This message was auto-generated]

---

Request #7869:

  submit:   home:vivian:branches:Trunk:Testing/installer(r7)(cleanup) -> Trunk:Testing/installer


Message:
    Check defaultDev before set menu-default, fixed BMC #5266; Add -g option in liveinst.desktop, partially fixed BMC #4065

State:   new          2010-09-28T01:07:06 vivian
Comment: None



changes files:
--------------
--- installer.changes
+++ installer.changes
@@ -0,0 +1,4 @@
+* Sun Sep 26 2010 Vivian Zhang <vivian.zhang at intel.com> - 0.56
+- Add -g option in liveinst.desktop, partially fixed BMC #4065
+- Check defaultDev before set menu-default, fixed BMC #5266
+

new:
----
  fix-4065-launch-install-from-menu.patch
  fix-5266-set-default-bootdev.patch

spec files:
-----------
--- installer.spec
+++ installer.spec
@@ -28,6 +28,8 @@
 Source1:    lang-names
 Source100:  installer.yaml
 Patch0:     fix-3274-refine-fstab-comments.patch
+Patch1:     fix-4065-launch-install-from-menu.patch
+Patch2:     fix-5266-set-default-bootdev.patch
 Requires:   pygtk2-libglade
 Requires:   rpm-python >= %{rpmpythonver}
 Requires:   rhpl >= %{rhplver}
@@ -98,6 +100,10 @@
 
 # fix-3274-refine-fstab-comments.patch
 %patch0 -p1
+# fix-4065-launch-install-from-menu.patch
+%patch1 -p1
+# fix-5266-set-default-bootdev.patch
+%patch2 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ fix-4065-launch-install-from-menu.patch (new)
--- fix-4065-launch-install-from-menu.patch
+++ fix-4065-launch-install-from-menu.patch
+diff -Nur installer-0.56/anaconda installer-0.56-new/anaconda
+--- installer-0.56/anaconda	2010-07-08 21:51:50.000000000 -0400
++++ installer-0.56-new/anaconda	2010-09-26 02:29:25.139098641 -0400
+@@ -617,13 +617,16 @@
+     # automatically, I don't know.  but we need to trigger so that we
+     # have all the information about netdevs that we care about for 
+     # NetworkManager in the udev database
+-    from baseudev import udev_trigger, udev_settle
+-    udev_trigger("net")
+-    udev_settle()
+-    # and for added fun, once doesn't seem to be enough?  so we 
+-    # do it twice, it works and we scream at the world "OH WHY?"
+-    udev_trigger("net")
+-    udev_settle()
++    try:
++        from baseudev import udev_trigger, udev_settle
++        udev_trigger("net")
++        udev_settle()
++        # and for added fun, once doesn't seem to be enough?  so we 
++        # do it twice, it works and we scream at the world "OH WHY?"
++        udev_trigger("net")
++        udev_settle()
++    except:
++        log.info("Failed to run the trigger")
+ 
+     import gettext
+     _ = lambda x: gettext.ldgettext("anaconda", x)
+diff -Nur installer-0.56/liveinst/liveinst.desktop.in installer-0.56-new/liveinst/liveinst.desktop.in
+--- installer-0.56/liveinst/liveinst.desktop.in	2010-07-08 21:51:50.000000000 -0400
++++ installer-0.56-new/liveinst/liveinst.desktop.in	2010-09-26 04:10:14.514040349 -0400
+@@ -3,7 +3,7 @@
+ _GenericName=Install
+ _Comment=Install the live CD to your hard disk
+ Categories=System;Utility;X-Red-Hat-Base;X-Fedora;GNOME;GTK;
+-Exec=/usr/bin/liveinst
++Exec=/usr/bin/liveinst -g
+ Terminal=false
+ Type=Application
+ Icon=system-software-install

++++++ fix-5266-set-default-bootdev.patch (new)
--- fix-5266-set-default-bootdev.patch
+++ fix-5266-set-default-bootdev.patch
+diff -Nur installer-0.56/booty/bootloaderInfo.py installer-0.56-new/booty/bootloaderInfo.py
+--- installer-0.56/booty/bootloaderInfo.py	2010-07-08 21:52:23.000000000 -0400
++++ installer-0.56-new/booty/bootloaderInfo.py	2010-09-26 02:12:32.287225029 -0400
+@@ -731,7 +731,16 @@
+ """ %(defaultmenu, menuhidden, resolutionline, splashline))
+ 
+         if self.password:
+-                f.write("menu master passwd %s\n" %(self.password))
++            f.write("menu master passwd %s\n" %(self.password))
++    
++        menudefault = True
++        if defaultDev and chainList:
++            defaultDev_name = defaultDev.name
++            if defaultDev_name[0] != "/":
++                defaultDev_name = "/dev/" + defaultDev_name
++            log.info("booty: defautldev %s rootdev %s bootdev %s" %(defaultDev_name, rootDev, bootDev))
++            if defaultDev_name != rootDev and defaultDev_name != bootDev:
++                menudefault = False
+ 
+         for (label, longlabel, version) in kernelList:
+             # XXX hackity, hack hack hack.  but we need them in a different
+@@ -753,7 +762,8 @@
+             if self.args.get():
+                 f.write(' %s' % self.args.get())
+             f.write('\n')
+-            f.write("\tmenu default\n")
++            if menudefault:
++                f.write("\tmenu default\n")
+             break
+         for (label, longlabel, device) in chainList:
+             if ((not longlabel) or (longlabel == "")):
+@@ -776,6 +786,9 @@
+             else:
+                 appendline += " 0"
+             appendline += "\n"
++            if not menudefault and defaultDev.name == label:
++                log.info("Set menu default for %s" %(label))
++                appendline = appendline + "\tmenu default\n"    
+             f.write(appendline)
+             
+         f.close()

++++++ installer.yaml
--- installer.yaml
+++ installer.yaml
@@ -10,6 +10,8 @@
     - lang-names
 Patches:
     - fix-3274-refine-fstab-comments.patch
+    - fix-4065-launch-install-from-menu.patch
+    - fix-5266-set-default-bootdev.patch
 Description: |
     The installer package contains the program which was used to install your 
     system.  These files are of little use on an already installed system.