[maemo-commits] [maemo-commits] r17187 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-01-15 12:21:39 +0200 (Thu, 15 Jan 2009)
New Revision: 17187

Modified:
   projects/haf/trunk/hildon-initscripts/debian/changelog
   projects/haf/trunk/hildon-initscripts/osso-gtk.defs
Log:
Applying stuff from NB#94132

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2009-01-15 09:07:20 UTC (rev 17186)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2009-01-15 10:21:39 UTC (rev 17187)
@@ -1,3 +1,10 @@
+hildon-initscripts (1.19-1unreleased) unstable; urgency=low
+
+  * Do not assume HOME=/home/user in osso-gtk.defs
+  * Fixes: NB#94132
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 15 Jan 2009 12:20:35 +0200
+
 hildon-initscripts (1.18-1) unstable; urgency=low
 
   * Properly launch gconf, hildon-desktop, and HIM

Modified: projects/haf/trunk/hildon-initscripts/osso-gtk.defs
===================================================================
--- projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2009-01-15 09:07:20 UTC (rev 17186)
+++ projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2009-01-15 10:21:39 UTC (rev 17187)
@@ -25,7 +25,11 @@
 PREFIX=/usr
 SYSCONFDIR=/etc
 ORIGHOME=$HOME
-HOME=/home/user  ;# needed for some root processes
+if "x$USER" = "x"; then
+  HOME=/home/user  ;# needed for some root processes
+else
+  HOME=/home/$USER
+fi
 
 if [ $(id -u) -eq 0 ]; then
   export XDG_DATA_HOME=$PREFIX/share/mime