[maemo-commits] [maemo-commits] r17713 - in projects/haf/branches/osso-af-startup/empty: . debian services

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Tue Mar 17 16:33:32 EET 2009 
Author: schulhof
Date: 2009-03-17 16:33:19 +0200 (Tue, 17 Mar 2009)
New Revision: 17713

Removed:
   projects/haf/branches/osso-af-startup/empty/services/after-suw-process-restart.sh
   projects/haf/branches/osso-af-startup/empty/services/dbus-sessionbus.sh
   projects/haf/branches/osso-af-startup/empty/services/get-devlock.sh
   projects/haf/branches/osso-af-startup/empty/services/launch-wrapper-tryrestart.sh
   projects/haf/branches/osso-af-startup/empty/services/launch-wrapper.sh
   projects/haf/branches/osso-af-startup/empty/services/nice-kill-launch-wrapper.sh
   projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper-tryrestart.sh
   projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper.sh
   projects/haf/branches/osso-af-startup/empty/services/real-af-base-apps
   projects/haf/branches/osso-af-startup/empty/services/real-af-services
   projects/haf/branches/osso-af-startup/empty/services/real-af-startup
   projects/haf/branches/osso-af-startup/empty/services/temp-reaper-startup.sh
   projects/haf/branches/osso-af-startup/empty/top-scripts/
Modified:
   projects/haf/branches/osso-af-startup/empty/configure.ac
   projects/haf/branches/osso-af-startup/empty/debian/changelog
   projects/haf/branches/osso-af-startup/empty/debian/install
   projects/haf/branches/osso-af-startup/empty/osso-af-startup.sudoers
Log:
Cleaning house

Modified: projects/haf/branches/osso-af-startup/empty/configure.ac
===================================================================
--- projects/haf/branches/osso-af-startup/empty/configure.ac	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/configure.ac	2009-03-17 14:33:19 UTC (rev 17713)
@@ -2,5 +2,4 @@
 AM_INIT_AUTOMAKE(osso-af-startup, 1.78)
 
 AC_OUTPUT(Makefile \
-	services/Makefile \
-    	top-scripts/Makefile)
+	services/Makefile)

Modified: projects/haf/branches/osso-af-startup/empty/debian/changelog
===================================================================
--- projects/haf/branches/osso-af-startup/empty/debian/changelog	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/debian/changelog	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,3 +1,9 @@
+osso-af-startup (1.78-1empty1) unstable; urgency=low
+
+  * Remove all scripts except af-defines.sh
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue, 17 Mar 2009 16:06:31 +0200
+
 osso-af-startup (1.78-1) unstable; urgency=low
 
   * Don't touch $HOME from (pre|post)(inst|rm) scripts. Use /etc/skel instead.

Modified: projects/haf/branches/osso-af-startup/empty/debian/install
===================================================================
--- projects/haf/branches/osso-af-startup/empty/debian/install	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/debian/install	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,3 +1,2 @@
-top-scripts/* /etc/init.d
 services/* /etc/osso-af-init
 osso-af-startup.sudoers /etc/sudoers.d

Modified: projects/haf/branches/osso-af-startup/empty/osso-af-startup.sudoers
===================================================================
--- projects/haf/branches/osso-af-startup/empty/osso-af-startup.sudoers	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/osso-af-startup.sudoers	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,9 +1,3 @@
-user ALL = NOPASSWD: /etc/init.d/ke-recv start
-user ALL = NOPASSWD: /etc/init.d/ke-recv stop
-user ALL = NOPASSWD: /etc/init.d/alarmd start
-user ALL = NOPASSWD: /etc/init.d/alarmd stop
-user ALL = NOPASSWD: /etc/init.d/osso-hss start
-user ALL = NOPASSWD: /etc/init.d/osso-hss stop
 user ALL = NOPASSWD: /usr/bin/osso-product-info
 user ALL = NOPASSWD: /bin/mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp
 

Deleted: projects/haf/branches/osso-af-startup/empty/services/after-suw-process-restart.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/after-suw-process-restart.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/after-suw-process-restart.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# This file is part of osso-af-startup.
-#
-# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-DIR=$AF_INIT_DIR
-
-if [ -x /etc/init.d/alarmd ]; then
-  sudo /etc/init.d/alarmd stop
-fi
-
-# this is first boot, so VKB is running
-if [ -f $DIR/keyboard.defs ]; then
-  source $DIR/keyboard.defs
-fi
-source $DIR/keyboard.sh stop
-if [ -x /etc/init.d/ke-recv ]; then
-  sudo /etc/init.d/ke-recv stop
-fi
-source $DIR/dbus-sessionbus.sh stop
-
-# wait for the D-BUS session bus to die
-sleep 1
-
-if [ -f $DIR/osso-application-installer.defs ]; then
-  source $DIR/osso-application-installer.defs
-fi
-# browser needs some definitions, because we are restarting the session bus
-if [ -f $DIR/browser.defs ]; then
-  source $DIR/browser.defs
-fi
-source $DIR/dbus-sessionbus.sh start
-source $DIR/af-defines.sh ;# re-read session bus address
-/usr/sbin/waitdbus session
-if [ -x /etc/init.d/maemo-launcher ]; then
-  /etc/init.d/maemo-launcher restart
-fi
-if [ -x /etc/init.d/ke-recv ]; then
-  sudo /etc/init.d/ke-recv start
-fi
-if [ -x /etc/init.d/osso-systemui ]; then
-  sudo /etc/init.d/osso-systemui restart
-fi
-
-if [ -x $DIR/osso-connectivity-ui.sh ]; then
-  source $DIR/osso-connectivity-ui.sh start
-fi
-source $DIR/keyboard.sh start
-if [ -x /etc/init.d/alarmd ]; then
-  sudo /etc/init.d/alarmd start
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/dbus-sessionbus.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/dbus-sessionbus.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/dbus-sessionbus.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,58 +0,0 @@
-#!/bin/sh
-# D-Bus session bus daemon startup/shutdown script
-#
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ -e /targets/links/scratchbox.config ]; then
-  SBOX='yes'
-  PARAMS="--session --print-address=2"
-else
-  SBOX=''
-  PARAMS="--session"
-fi
-
-PROG=/usr/bin/dbus-daemon
-SVC="D-BUS session bus daemon"
-
-case "$1" in
-start)
-  if [ "x$SBOX" = "x" ]; then
-    source $LAUNCHWRAPPER_NICE_KILL start "$SVC" $PROG $PARAMS
-    echo "export DBUS_SESSION_BUS_ADDRESS=unix:path=/tmp/session_bus_socket" \
-         > $SESSION_BUS_ADDRESS_FILE
-  else
-    $LAUNCHWRAPPER_NICE_KILL start "$SVC" $PROG \
-                             $PARAMS 2>${SESSION_BUS_ADDRESS_FILE}.in
-    sleep 2
-    if [ -r ${SESSION_BUS_ADDRESS_FILE}.in ]; then
-      TMP=`cat ${SESSION_BUS_ADDRESS_FILE}.in`
-      echo "export DBUS_SESSION_BUS_ADDRESS=$TMP" > $SESSION_BUS_ADDRESS_FILE
-      rm -f ${SESSION_BUS_ADDRESS_FILE}.in
-    fi
-  fi
-  ;;
-stop)
-  # giving parameter also here so that dsmetool works...
-  source $LAUNCHWRAPPER_NICE_KILL stop "$SVC" $PROG $PARAMS
-  ;;
-*)
-  echo "Usage: $0 {start|stop}"
-  exit 1
-  ;;
-esac

Deleted: projects/haf/branches/osso-af-startup/empty/services/get-devlock.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/get-devlock.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/get-devlock.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# This file is part of osso-af-startup.
-#
-# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-dbus-send --system --type=method_call \
- --dest="com.nokia.mce" --print-reply \
- "/com/nokia/mce/request" \
- com.nokia.mce.request.get_devicelock_mode | \
- grep unlocked > /dev/null
-if [ $? = 0 ]; then
-  echo "unlocked"
-else
-  echo "locked"
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/launch-wrapper-tryrestart.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/launch-wrapper-tryrestart.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/launch-wrapper-tryrestart.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2004-2005 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ $# -lt 3 ]; then
-  echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-  exit 1
-fi
-
-STOP=FALSE
-START=FALSE
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   STOP=TRUE
-        ;;
-restart)
-        STOP=TRUE
-        START=TRUE
-        ;;
-*)      echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-        exit 1
-        ;;
-esac
-
-shift
-SVC="$1"
-shift
-CMD=$1
-BASENAME=`basename $CMD`
-PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
-
-if [ $STOP = TRUE ]; then
-  echo "Stopping $SVC"
-  /usr/sbin/dsmetool -k "$CMD $PARAMS"
-fi
-
-if [ $START = TRUE ]; then
-  echo "Starting $SVC"
-  /usr/sbin/dsmetool -t "$CMD $PARAMS"
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/launch-wrapper.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/launch-wrapper.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/launch-wrapper.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2004-2005 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ $# -lt 3 ]; then
-  echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-  exit 1
-fi
-
-STOP=FALSE
-START=FALSE
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   STOP=TRUE
-        ;;
-restart)
-        STOP=TRUE
-        START=TRUE
-        ;;
-*)      echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-        exit 1
-        ;;
-esac
-
-shift
-SVC="$1"
-shift
-CMD=$1
-BASENAME=`basename $CMD`
-PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
-
-if [ $STOP = TRUE ]; then
-  echo "Stopping $SVC"
-  /sbin/start-stop-daemon --stop -p $PIDFILE -R TERM/1/KILL -q &
-fi
-
-if [ $START = TRUE ]; then
-  echo "Starting $SVC"
-  /sbin/start-stop-daemon --start -x $CMD -p $PIDFILE -o -m -q -- $PARAMS &
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/nice-kill-launch-wrapper.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/nice-kill-launch-wrapper.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/nice-kill-launch-wrapper.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ $# -lt 3 ]; then
-  echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-  exit 1
-fi
-
-STOP=FALSE
-START=FALSE
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   STOP=TRUE
-        ;;
-restart)
-        STOP=TRUE
-        START=TRUE
-        ;;
-*)      echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-        exit 1
-        ;;
-esac
-
-shift
-SVC="$1"
-shift
-CMD=$1
-BASENAME=`basename $CMD`
-PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
-
-if [ $STOP = TRUE ]; then
-  echo "Stopping $SVC"
-  /usr/sbin/dsmetool -S 9 -k "$CMD $PARAMS"
-fi
-
-if [ $START = TRUE ]; then
-  echo "Starting $SVC"
-  /usr/sbin/dsmetool -n -1 -t "$CMD $PARAMS"
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper-tryrestart.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper-tryrestart.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper-tryrestart.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ $# -lt 3 ]; then
-  echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-  exit 1
-fi
-
-STOP=FALSE
-START=FALSE
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   STOP=TRUE
-        ;;
-restart)
-        STOP=TRUE
-        START=TRUE
-        ;;
-*)      echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-        exit 1
-        ;;
-esac
-
-shift
-SVC="$1"
-shift
-CMD=$1
-BASENAME=`basename $CMD`
-PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
-
-if [ $STOP = TRUE ]; then
-  echo "Stopping $SVC"
-  /usr/sbin/dsmetool -k "$CMD $PARAMS"
-fi
-
-if [ $START = TRUE ]; then
-  echo "Starting $SVC"
-  /usr/sbin/dsmetool -n -1 -t "$CMD $PARAMS"
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/nice-launch-wrapper.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
-#
-# Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ $# -lt 3 ]; then
-  echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-  exit 1
-fi
-
-STOP=FALSE
-START=FALSE
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   STOP=TRUE
-        ;;
-restart)
-        STOP=TRUE
-        START=TRUE
-        ;;
-*)      echo "Usage: $0 {start|stop|restart} servicename cmd [params]"
-        exit 1
-        ;;
-esac
-
-shift
-SVC="$1"
-shift
-CMD=$1
-BASENAME=`basename $CMD`
-PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
-
-if [ $STOP = TRUE ]; then
-  echo "Stopping $SVC"
-  /usr/sbin/dsmetool -k "$CMD $PARAMS"
-fi
-
-if [ $START = TRUE ]; then
-  echo "Starting $SVC"
-  /usr/sbin/dsmetool -n -1 -t "$CMD $PARAMS"
-fi

Deleted: projects/haf/branches/osso-af-startup/empty/services/real-af-base-apps
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/real-af-base-apps	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/real-af-base-apps	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-# This file is part of osso-af-startup.
-#
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-CONNECTIVITY_UI_SCRIPT=$AF_INIT_DIR/osso-connectivity-ui.sh
-case "$1" in
-start)
-
-  source $SESSION_BUS_ADDRESS_FILE
-
-  if [ -f /tmp/run-osso-backup-finish-restore ]; then
-    $AF_INIT_DIR/osso-backup-finish-restore.sh
-    rm -f /tmp/run-osso-backup-finish-restore
-  fi
-
-  if [ -x $CONNECTIVITY_UI_SCRIPT ]; then
-    source $CONNECTIVITY_UI_SCRIPT start
-  fi
-
-  if [ -x /usr/bin/hwkbd-reconfig ]; then
-	  /usr/bin/hwkbd-reconfig
-  fi
-
-  if [ -x $AF_INIT_DIR/osso-media-server.sh ]; then
-    $AF_INIT_DIR/osso-media-server.sh start &
-  fi
-
-  if [ -f /tmp/.check_auto_install ]; then
-    dbus-send --system --dest=com.nokia.ke_recv --type=method_call \
-      --print-reply /com/nokia/ke_recv/check_auto_install \
-      com.nokia.ke_recv.foo
-    rm -f /tmp/.check_auto_install
-  fi
-
-  ;;
-stop)
-
-  source $AF_INIT_DIR/clipboard.sh stop
-  source $AF_INIT_DIR/keyboard.sh stop
-
-  # Kill controlpanel if it is still running, fixes NB#83038
-  CPANELPID=`pidof controlpanel`
-  if [ "x$CPANELPID" != "x" ]; then
-    kill $CPANELPID
-  fi
-
-  if [ -x $CONNECTIVITY_UI_SCRIPT ]; then
-    source $CONNECTIVITY_UI_SCRIPT stop
-  fi
-
-  ;;
-restart)
-  echo "$0: not implemented"
-  exit 1
-  ;;
-force-reload)
-  echo "$0: not implemented"
-  exit 1
-  ;;
-*)
-  echo "Usage: $0 {start|stop}"
-  exit 1
-  ;;
-esac

Deleted: projects/haf/branches/osso-af-startup/empty/services/real-af-services
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/real-af-services	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/real-af-services	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# This file is part of osso-af-startup.
-#
-# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License 
-# version 2 as published by the Free Software Foundation. 
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-case "$1" in
-start)
-
-  source $AF_INIT_DIR/temp-reaper-startup.sh start
-  source $AF_INIT_DIR/dbus-sessionbus.sh start
-
-  # Wait until X is ready
-  INC=1
-  while [ ! -e /tmp/.X11-unix/X0 ]; do
-    if [ $INC -gt 20 ]; then
-      echo "$0: Error, X server did not start"
-      exit 2
-    fi
-    sleep 1
-    INC=`expr $INC + 1`
-  done
-
-  # start at-spi 
-  if [ -x /etc/init.d/at-spi ]; then
-    /etc/init.d/at-spi start
-  fi
-
-  source $AF_INIT_DIR/sapwood-server.sh start
-
-  source_if_is matchbox.sh start
-
-  # wait until system D-BUS is ready (some stuff started by init
-  # after us assume it is running)
-  /usr/sbin/waitdbus system
-  if [ $? -gt 0 ]; then
-    echo "$0: Error, the D-BUS system bus did not start"
-    exit 2
-  fi
-
-  # media-server is only started here if we go directly to ACTDEAD
-  DSME_STATE=`/usr/sbin/bootstate 2> /dev/null`
-  if [ "x$DSME_STATE" = "xACTDEAD" ]; then
-    if [ -x $AF_INIT_DIR/osso-media-server.sh ]; then
-      # media server wants the session bus
-      /usr/sbin/waitdbus session
-      source $SESSION_BUS_ADDRESS_FILE
-
-      source $AF_INIT_DIR/osso-media-server.sh start
-      unset LD_PRELOAD
-    fi
-  fi
-
-  ;;
-stop)
-
-  if [ -x $AF_INIT_DIR/osso-media-server.sh ]; then
-    source $AF_INIT_DIR/osso-media-server.sh stop
-    unset LD_PRELOAD
-  fi
-  source $AF_INIT_DIR/sapwood-server.sh stop
-
-  source_if_is matchbox.sh stop
-
-  if [ -x /etc/init.d/at-spi ]; then
-    /etc/init.d/at-spi stop
-  fi
-
-  source $AF_INIT_DIR/dbus-sessionbus.sh stop
-  source $AF_INIT_DIR/gconf-daemon.sh stop
-  source $AF_INIT_DIR/temp-reaper-startup.sh stop
-
-  ;;
-restart)
-  echo "$0: not implemented"
-  exit 1
-  ;;
-force-reload)
-  echo "$0: not implemented"
-  exit 1
-  ;;
-*)
-  echo "Usage: $0 {start|stop}"
-  exit 1
-  ;;
-esac

Deleted: projects/haf/branches/osso-af-startup/empty/services/real-af-startup
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/real-af-startup	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/real-af-startup	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,193 +0,0 @@
-#!/bin/sh
-#
-# This file is part of osso-af-startup.
-#
-# Copyright (C) 2004-2008 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.cm>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License 
-# version 2 as published by the Free Software Foundation. 
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-source_if_is wizard-background-defs.sh
-
-if ! type wizback_method 2> /dev/null; then
-  wizback_method() # args ignored
-  {
-    return 0
-  }
-fi
-
-case "$1" in
-start)
-  if [ -e $HOME/first-boot-flag ]; then
-    touch /tmp/first-boot-flag-tmp
-  fi
-
-  # this is used by the input methods for disabling features in startup
-  touch /tmp/im_disable_tools_menu
-
-  echo "Running xset770 -- the future of xset!"
-  # disable keyrepeat for select, fullscreen, menu, plus, minus, escape
-  # (code 104 is Return for the slide keyboard)
-  xset770 -r Return 0 -r F4 0 -r F6 0 -r F7 0 -r F8 0 -r Escape 0 -r 104 0
-
-  # block here if device lock is on
-  if [ -x /sbin/devlock-blocker ]; then
-    /sbin/devlock-blocker
-  fi
-
-  # wait for the session bus
-  /usr/sbin/waitdbus session
-  if [ $? -gt 0 ]; then
-    echo "$0: Error, the D-BUS session bus did not start"
-    exit 2
-  fi
-  source $SESSION_BUS_ADDRESS_FILE
-
-  source_if_is tracker.sh start
-
-  if [ -x /etc/osso-af-init/maemo-launcher ]; then
-    /etc/osso-af-init/maemo-launcher start
-  fi
-
-  source_if_is startup-greeting.sh start
-
-  # we need to start VKB
-  source_if_is keyboard.defs
-  source_if_is keyboard.sh start
-
-  # start clipboard daemon 
-  source_if_is clipboard.sh start
-
-  if [ -e $HOME/first-boot-flag ]; then
-    ADVANCE_STEPS=1
-
-    source_if_is wizard-background.sh start
-
-    if [ -x $AF_INIT_DIR/startup-wizard.sh ]; then
-      wizback_method advance 1
-      source $AF_INIT_DIR/startup-wizard.sh start
-
-      if [ "x$AFTER_SUW_RESTART_NEEDED" != "x0" ]; then
-      	source $AF_INIT_DIR/af-defines.sh ;# re-read locale variables
-      	# show progress animation
-      	if ! [ -f /etc/osso-af-init/wizard-background-defs.sh ]; then
-        	/usr/sbin/anim-shower 17000 &
-      	fi
-      	# restart processes because the locale might have changed
-      	source $AF_INIT_DIR/after-suw-process-restart.sh
-      fi
-    else
-      ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
-    fi
-
-    # Give Backup a chance to restore settings automatically
-    if [ -x $AF_INIT_DIR/osso-backup-startup.sh ]; then
-      if ! $AF_INIT_DIR/osso-backup-startup.sh check; then
-        wizback_method set_descriptions_visible false
-
-        # Need to wrap osso-backup-startup.sh into an 'if',
-        # otherwise this script will die when backup exits
-        # non-zero (such as on user cancel)
-        if $AF_INIT_DIR/osso-backup-startup.sh; then
-          echo -n ''
-        fi
-
-        wizback_method set_descriptions_visible true
-      fi
-    fi
-
-    if test "x$OSSO_PRODUCT_HARDWARE" != "xRX-48"; then
-      if [ -x $AF_INIT_DIR/osso-connectivity-ui-gwwizard-startup.sh \
-           -a ! -f /tmp/suw-user-cancelled.tmp ]; then
-
-        wizback_method advance 1
-
-        $AF_INIT_DIR/osso-connectivity-ui-gwwizard-startup.sh start
-
-      else
-        ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
-      fi
-
-      if [ -f $TMPDIR/launch-operator-wizard.tmp \
-           -a ! -f /tmp/suw-user-cancelled.tmp ]; then
-        if [ -x $AF_INIT_DIR/operator-wizard.sh ]; then
-
-          wizback_method advance 1
-
-          $AF_INIT_DIR/operator-wizard.sh start
-        fi
-        rm -f $TMPDIR/launch-operator-wizard.tmp
-      else
-        ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
-      fi
-    fi
-
-    wizback_method advance $ADVANCE_STEPS
-    wizback_method set_descriptions_visible false
-    sleep 1
-
-    if [ -x /usr/bin/rhapsody-installer.sh ]; then
-      /usr/bin/rhapsody-installer.sh
-    fi
-
-    # It is important to make sure all the newly created files have reached
-    # the storage media before removing first-boot-flag.
-    sync
-    rm -f $HOME/first-boot-flag
-    rm -f /tmp/suw-user-cancelled.tmp
-    touch /tmp/.check_auto_install
-
-    source_if_is startup-greeting.sh firstboot
-
-    wizback_method quit
-
-  else
-    source_if_is startup-wizard.sh start
-
-    # Give Backup a chance to finish restoring task
-    if [ -f $HOME/.osso-backup/last-restore.xml ]; then
-      if [ -x $AF_INIT_DIR/osso-backup-finish-restore.sh ]; then
-        touch /tmp/run-osso-backup-finish-restore
-        # $AF_INIT_DIR/osso-backup-finish-restore.sh
-      fi
-    fi
-  fi
-
-  rm -f /tmp/im_disable_tools_menu
-
-  ;;
-stop)
-
-  if [ -x $AF_INIT_DIR/osso-media-server.sh ]; then
-    $AF_INIT_DIR/osso-media-server.sh stop
-  fi
-
-  source_if_is tracker.sh stop
-
-  ;;
-restart)
-  echo "$0: not implemented"
-  exit 1
-  ;;
-force-reload)
-  echo "$0: not implemented"
-  exit 1
-  ;;
-*)
-  echo "Usage: $0 {start|stop}"
-  exit 1
-  ;;
-esac

Deleted: projects/haf/branches/osso-af-startup/empty/services/temp-reaper-startup.sh
===================================================================
--- projects/haf/branches/osso-af-startup/empty/services/temp-reaper-startup.sh	2009-03-17 14:09:39 UTC (rev 17712)
+++ projects/haf/branches/osso-af-startup/empty/services/temp-reaper-startup.sh	2009-03-17 14:33:19 UTC (rev 17713)
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Temporary file purging daemon startup/shutdown script
-#
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
-#
-# Contact: Gabriel Schulhof <gabriel.schulhof at nokia.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-if [ "x$LAUNCHWRAPPER_NICE_TRYRESTART" = "x" ]; then
-  echo "$0: Error, LAUNCHWRAPPER_NICE_TRYRESTART is not defined"
-  exit 2
-fi
-PROG=/usr/sbin/temp-reaper
-SVC="Periodical temporary file purging daemon"
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   START=FALSE
-        ;;
-*)      echo "Usage: $0 {start|stop}"
-	exit 1
-        ;;
-esac
-
-if [ $START = TRUE ]; then
-  source $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG
-else
-  source $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG
-fi
More information about the maemo-commits mailing list