[meego-commits] 5732: Changes to Trunk/installer-shell

[Anas Nashif]

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

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5732:

  submit:   Trunk:Testing/installer-shell(r2) -> Trunk/installer-shell


Message:
    Move to Trunk

State:   new          2010-07-15T01:47:44 nashif
Comment: None



changes files:
--------------
--- installer-shell.changes
+++ installer-shell.changes
@@ -0,0 +1,3 @@
+* Wed Jul 14 2010 Vivian Zhang <vivian.zhang at intel.com> - 0.1
+- Reboot the system  by pressing any key after the installation process completes (BMC #3828)
+

new:
----
  fix-3828-reboot-by-press-any-key.patch

spec files:
-----------
--- installer-shell.spec
+++ installer-shell.spec
@@ -14,6 +14,7 @@
 URL:        http://meego.com
 Source0:    installer-shell-%{version}.tar.bz2
 Source100:  installer-shell.yaml
+Patch0:     fix-3828-reboot-by-press-any-key.patch
 Requires:   dialog
 Requires:   system-logos
 Requires:   e2fsprogs
@@ -39,6 +40,8 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+# fix-3828-reboot-by-press-any-key.patch
+%patch0 -p1
 # >> setup
 # << setup
 
@@ -59,6 +62,13 @@
 # << install post
 
 
+
+
+
+
+
+
+
 %files
 %defattr(-,root,root,-)
 # >> files
@@ -69,7 +79,7 @@
 
 %files -n installer-launch
 %defattr(-,root,root,-)
-# >> files launch
+# >> files installer-launch
 %{_sbindir}/liveinst
-# << files launch
+# << files installer-launch
 

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

++++++ fix-3828-reboot-by-press-any-key.patch (new)
--- fix-3828-reboot-by-press-any-key.patch
+++ fix-3828-reboot-by-press-any-key.patch
+diff -Nur installer-shell-0.1/installer-shell installer-shell-0.1-new/installer-shell
+--- installer-shell-0.1/installer-shell	2010-07-08 20:56:49.000000000 -0400
++++ installer-shell-0.1-new/installer-shell	2010-07-14 23:04:44.690043681 -0400
+@@ -64,7 +64,6 @@
+     DISK_LIST=""
+     LIVE_DEV=""
+     LIVE_DEV=`cat /etc/mtab | grep "/mnt/live" | cut -d " " -f1 | sed "s/[0-9]//"`
+-    echo $LIVE_DEV
+ 
+     for i in `cat /proc/partitions | sed -n "s/\ *[0-9][0-9]*\ *[0-9][0-9]*\ *[0-9][0-9]*\ \([a-z]*\)$/\1/p"`; do
+         if test "/dev/$i" = "$LIVE_DEV" ; then
+@@ -459,6 +458,6 @@
+ output ""
+ output "Now you can press any key, and then unplug the removable disk to reboot into the installed system."
+ output "Do not remove the USB key until you press the key. If you do remove it and your computer freezes, press the power button to restart."
+-read answer
++read -n 1 answer
+ /sbin/reboot
+ exit 0

++++++ installer-shell.yaml
--- installer-shell.yaml
+++ installer-shell.yaml
@@ -7,6 +7,8 @@
 URL: http://meego.com
 Sources:
     - installer-shell-%{version}.tar.bz2
+Patches:
+    - fix-3828-reboot-by-press-any-key.patch
 Description: |
     A shell-script based installer which implements the installation process in silent mode
 Requires: