summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2005-08-05 18:57:56 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-05 18:57:56 +0000
commit016b2daaba8bee36e5fd54f6fb7b0604db88daf1 (patch)
tree64c4cf0cdb4f971642099614d0273386935e1485
parentcf5d5be8cfc164efe2ab556fd08ebe8292a9e619 (diff)
parent04d420ed91a8d597140cd7982a84d185649ec3cc (diff)
propagate from branch 'org.openembedded.dev' (head cd4b7abdfdbefabaf7aea80423ae2ff45feb7d1f)
to branch 'org.openembedded.nslu2-linux' (head 0558010e1482ae76056505548d911ae74cd4efe2)
-rw-r--r--packages/abuse/abuse_0.7.0.bb2
-rw-r--r--packages/dbus/dbus/dbus-1.init2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/abuse/abuse_0.7.0.bb b/packages/abuse/abuse_0.7.0.bb
index 02458259f9..38124296fa 100644
--- a/packages/abuse/abuse_0.7.0.bb
+++ b/packages/abuse/abuse_0.7.0.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Abuse-SDL is a port of Abuse by Crack Dot Com to Linux using the Simple DirectMedia Layer library."
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-SECTION = "opie/games"
+SECTION = "games"
LICENSE = "GPL"
DEPENDS = "virtual/libsdl libsdl-mixer libsdl-image"
diff --git a/packages/dbus/dbus/dbus-1.init b/packages/dbus/dbus/dbus-1.init
index bd31b6208c..adefe7c5b1 100644
--- a/packages/dbus/dbus/dbus-1.init
+++ b/packages/dbus/dbus/dbus-1.init
@@ -55,7 +55,7 @@ shut_it_down()
run-parts --reverse --arg=stop $EVENTDIR
fi
echo -n "Stopping $DESC: "
- start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
--user $DAEMONUSER
# We no longer include these arguments so that start-stop-daemon
# can do its job even given that we may have been upgraded.