[maemo-commits] [maemo-commits] r15393 - projects/haf/trunk/osso-af-startup/debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-04-15 13:38:37 +0300 (Tue, 15 Apr 2008)
New Revision: 15393

Added:
   projects/haf/trunk/osso-af-startup/debian/preinst
Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
Log:
  * Move creation of ~user/first-boot-flag from postinst to new preinst, because
    preinst gets $1 = install/upgrade depending on whether it's an install or an
    upgrade. We need this switch, because we must not touch ~user/first-boot-flag
    if it's an upgrade
  * Fixes: NB#84040


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-04-15 08:39:50 UTC (rev 15392)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-04-15 10:38:37 UTC (rev 15393)
@@ -1,3 +1,13 @@
+osso-af-startup (1.53-2) unstable; urgency=low
+
+  * Move creation of ~user/first-boot-flag from postinst to new preinst, because
+    preinst gets $1 = install/upgrade depending on whether it's an install or an
+    upgrade. We need this switch, because we must not touch ~user/first-boot-flag
+    if it's an upgrade
+  * Fixes: NB#84040
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue, 15 Apr 2008 13:20:53 +0300
+
 osso-af-startup (1.53-1) unstable; urgency=low
 
   * Ensure controlpanel is not running while the device is in charging mode

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2008-04-15 08:39:50 UTC (rev 15392)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2008-04-15 10:38:37 UTC (rev 15393)
@@ -45,10 +45,6 @@
 # evil hack to ensure execute permissions
 chmod +x /etc/osso-af-init/get-devlock.sh
 
-# this is needed for optimising boots after first boot
-touch $HOME/first-boot-flag
-chown $USER:$GROUP $HOME/first-boot-flag
-
 # AF environment is included to every shell
 line="source /etc/osso-af-init/af-defines.sh"
 if ! grep -F -q "$line" /etc/profile; then

Added: projects/haf/trunk/osso-af-startup/debian/preinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/preinst	2008-04-15 08:39:50 UTC (rev 15392)
+++ projects/haf/trunk/osso-af-startup/debian/preinst	2008-04-15 10:38:37 UTC (rev 15393)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+TGT=''
+if [ -e /targets/links/scratchbox.config ] ; then
+        . /targets/links/scratchbox.config
+        TGT=$SBOX_TARGET_DIR
+fi
+
+USER=user
+GROUP=users
+HOME="$TGT/home/$USER"
+
+if test "x$1" = "xinstall"; then
+  # walk the user through initial configuration wizards
+  touch $HOME/first-boot-flag
+  chown $USER:$GROUP $HOME/first-boot-flag
+fi


Property changes on: projects/haf/trunk/osso-af-startup/debian/preinst
___________________________________________________________________
Name: svn:executable
   + *