[maemo-commits] [maemo-commits] r13135 - in projects/haf/trunk/osso-af-startup: . debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-08-13 10:06:53 +0300 (Mon, 13 Aug 2007)
New Revision: 13135

Added:
   projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers
Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/control
   projects/haf/trunk/osso-af-startup/debian/install
   projects/haf/trunk/osso-af-startup/debian/postinst
Log:
now using update-sudoers


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-08-13 06:52:11 UTC (rev 13134)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-08-13 07:06:53 UTC (rev 13135)
@@ -1,3 +1,11 @@
+osso-af-startup (1.46-1) unstable; urgency=low
+
+  * UNRELEASED
+  * Added dependency to osso-product-info.
+  * Now using update-sudoers instead of writing to /etc/sudoers directly.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 13 Aug 2007 10:01:46 +0300
+
 osso-af-startup (1.45-1) unstable; urgency=low
 
   * Patch from Leonid to optimise first boot. Fixes: NB#60398

Modified: projects/haf/trunk/osso-af-startup/debian/control
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/control	2007-08-13 06:52:11 UTC (rev 13134)
+++ projects/haf/trunk/osso-af-startup/debian/control	2007-08-13 07:06:53 UTC (rev 13135)
@@ -7,7 +7,7 @@
 
 Package: osso-af-startup
 Architecture: all
-Depends: osso-af-utils (>= 1.12-2), osso-core-config, dbus (>= 0.61-osso5), sudo
+Depends: osso-af-utils (>= 1.12-2), osso-core-config, dbus (>= 0.61-osso5), sudo, osso-product-info
 Description: Application framework top startup scripts
  Application framework startup scripts af-services, af-startup and
  af-base-apps. Also includes D-BUS session bus starting script.

Modified: projects/haf/trunk/osso-af-startup/debian/install
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/install	2007-08-13 06:52:11 UTC (rev 13134)
+++ projects/haf/trunk/osso-af-startup/debian/install	2007-08-13 07:06:53 UTC (rev 13135)
@@ -1,2 +1,3 @@
 top-scripts/* /etc/init.d
 services/* /etc/osso-af-init
+osso-af-startup.sudoers /etc/sudoers.d

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2007-08-13 06:52:11 UTC (rev 13134)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2007-08-13 07:06:53 UTC (rev 13135)
@@ -1,16 +1,5 @@
 #!/bin/sh
 
-add_sudoer ()
-{
-  line="$1"
-  if ! grep -F -q "$line" /etc/sudoers; then
-    chmod 666 /etc/sudoers
-    echo "+$line"
-    echo "$line" >>/etc/sudoers
-    chmod 440 /etc/sudoers
-  fi
-}
-
 TGT=''
 if [ -e /targets/links/scratchbox.config ] ; then
         . /targets/links/scratchbox.config
@@ -67,12 +56,7 @@
   echo "$line" >> /etc/profile
 fi
 
-add_sudoer 'user ALL = NOPASSWD: /etc/init.d/ke-recv start'
-add_sudoer 'user ALL = NOPASSWD: /etc/init.d/ke-recv stop'
-add_sudoer 'user ALL = NOPASSWD: /etc/init.d/alarmd start'
-add_sudoer 'user ALL = NOPASSWD: /etc/init.d/alarmd stop'
-add_sudoer 'user ALL = NOPASSWD: /etc/init.d/osso-hss start'
-add_sudoer 'user ALL = NOPASSWD: /etc/init.d/osso-hss stop'
-add_sudoer 'user ALL = NOPASSWD: /usr/bin/osso-product-info'
-add_sudoer 'user ALL = NOPASSWD: /bin/rm -f /tmp/.opi.tmp'
+if [ -x /usr/sbin/update-sudoers ]; then
+  /usr/sbin/update-sudoers
+fi
 

Added: projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers
===================================================================
--- projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers	2007-08-13 06:52:11 UTC (rev 13134)
+++ projects/haf/trunk/osso-af-startup/osso-af-startup.sudoers	2007-08-13 07:06:53 UTC (rev 13135)
@@ -0,0 +1,9 @@
+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/rm -f /tmp/.opi.tmp
+