[meego-packaging] 4882: Changes to MeeGo:1.0:Core:Update:Testing/firstboot

[Vivian Zhang]

Hi,
I have made the following changes to firstboot in project MeeGo:1.0:Core:Update:Testing. Please review and accept ASAP.

Thank You,
Vivian Zhang

[This message was auto-generated]

---

Request #4882:

  submit:   home:vivian:branches:MeeGo:1.0:Core:Update:Testing/firstboot(r2)(cleanup) -> MeeGo:1.0:Core:Update:Testing/firstboot


Message:
    Write clutter input method modules file (BMC #2427)

State:   new          2010-06-24T20:33:31 vivian
Comment: None



changes files:
--------------
--- firstboot.changes
+++ firstboot.changes
@@ -0,0 +1,3 @@
+* Fri Jun 25 2010 Vivian Zhang <vivian.zhang at intel.com> - 0.9
+- Write clutter input method modules file (BMC #2427)
+

new:
----
  fix-2427-write-clutter-im-file.patch

spec files:
-----------
--- firstboot.spec
+++ firstboot.spec
@@ -11,6 +11,7 @@
 Patch2:  fix-1071-po-update.patch
 Patch3:  fix-1282-english-edits-for-ui-strings.patch
 Patch4:  fix-1979-use-meego-theme.patch
+Patch5:  fix-2427-write-clutter-im-file.patch
 License: GPLv2+
 Group: System/Base
 ExclusiveOS: Linux
@@ -37,6 +38,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 

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

++++++ fix-2427-write-clutter-im-file.patch (new)
--- fix-2427-write-clutter-im-file.patch
+++ fix-2427-write-clutter-im-file.patch
+diff -Nur firstboot-0.9/init/vfirstboot firstboot-0.9-new/init/vfirstboot
+--- firstboot-0.9/init/vfirstboot	2010-04-15 13:34:23.000000000 +0800
++++ firstboot-0.9-new/init/vfirstboot	2010-06-25 10:07:48.112862273 +0800
+@@ -83,6 +83,11 @@
+ 
+         [ -x /usr/share/firstboot/scripts/fsck_bootdev.sh ] && ./usr/share/firstboot/scripts/fsck_bootdev.sh > /dev/tty3 2>&1 &
+ 
++ 	if [ -x /usr/bin/clutter-scan-immodules ]; then
++            mkdir -p /etc/clutter-imcontext
++	    /usr/bin/clutter-scan-immodules > /etc/clutter-imcontext/clutter.immodules 2>/dev/null
++	fi
++
+         # If firstboot succeeded, chkconfig it off so we don't see the message
+         # every time about starting up firstboot.
+         if [ "$RETVAL" -eq 0 ] && [ -f $FILENAME ]; then