commit e46bbfe0e9595acff843cbfa2b83e7a62524b882 Author: Tim Biermann <tbier@posteo.de> Date: Sat Dec 11 23:06:47 2021 +0100 dbus: updated rc script for run symlink diff --git a/dbus/.signature b/dbus/.signature index cd5a9acd8..6de586b0d 100644 --- a/dbus/.signature +++ b/dbus/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZbjmBAT1hoNlNAzkfNQ+nP6o3bcM5L/nLfjYctvT8fGYC66vz4AYlqpSUOCCaxYrznNpiFk8fXPtwKwewkMbAo= -SHA256 (Pkgfile) = f0ab92d911fe5f39475b34bc233c5d42c9d278105efe5d5fda7ea7deada02239 +RWSE3ohX2g5d/fGCRhvkoeSTIw3ofoA6SiPcw5pedZ5d/mHOogHhekaNBneI8ZzEpXmCGj+ysjWXjQt84ypGx7oIoB3AyTDOcgk= +SHA256 (Pkgfile) = 4744620385a8907471bdb99a6b9cb6f5b6ebb2569ea74744ef7e9f85d3cfb202 SHA256 (.footprint) = 2e385c670cb97879a0fc8cac1e12b06bbe4591424979160f19c1a67091c4f0a8 SHA256 (dbus-1.12.20.tar.gz) = f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa7de5fe -SHA256 (rc.dbus) = 4926a04f787824e55fab97d6f5938ca6bfb8fc95db5f7063fd80907f30b87ef5 +SHA256 (rc.dbus) = 60d189edd553bf7b81123da5e484e1683047d0e4d5ed7f3e36cda11f9f082630 SHA256 (30-dbus.launch) = 18ea1e79698bb876f7f5fb298daae5ff6cd17c56764b087f8da2e1d5809af37a diff --git a/dbus/Pkgfile b/dbus/Pkgfile index 6a5965988..0aac8a1eb 100644 --- a/dbus/Pkgfile +++ b/dbus/Pkgfile @@ -1,13 +1,13 @@ # Description: A message bus system -# URL: https://freedesktop.org/wiki/Software/dbus -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: expat +# URL: https://freedesktop.org/wiki/Software/dbus +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: expat name=dbus version=1.12.20 -release=1 +release=2 source=(https://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ - rc.dbus 30-dbus.launch) + rc.dbus 30-dbus.launch) build() { cd $name-$version diff --git a/dbus/rc.dbus b/dbus/rc.dbus index e2d671ddf..246c6ff58 100644 --- a/dbus/rc.dbus +++ b/dbus/rc.dbus @@ -5,35 +5,40 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/dbus-daemon -PID=/var/run/dbus/dbus.pid +PID=/run/dbus/dbus.pid OPTS="--system" case $1 in -start) - if [ ! -f /var/lib/dbus/machine-id ] - then - /usr/bin/dbus-uuidgen --ensure - fi - $SSD --start --pidfile=$PID --exec $PROG -- $OPTS - ;; -stop) - $SSD --stop --remove-pidfile --retry 10 --pidfile=$PID - ;; -restart) - $0 stop - $0 start - ;; -status) - $SSD --status --exec $PROG - case $? in - 0) echo "$PROG is running with pid $(cat $PID)" ;; - 1) echo "$PROG is not running but the pid file $PID exists" ;; - 3) echo "$PROG is not running" ;; - 4) echo "Unable to determine the program status" ;; - esac - ;; -*) - echo "usage: $0 [start|stop|restart|status]" - ;; -esac + start) + mkdir /run/dbus + + if [ ! -f /var/lib/dbus/machine-id ] + then + /usr/bin/dbus-uuidgen --ensure + fi + $SSD --start --pidfile=$PID --exec $PROG -- $OPTS + ;; + + stop) + $SSD --stop --remove-pidfile --retry 10 --pidfile=$PID + ;; + + restart) + $0 stop + $0 start + ;; + status) + $SSD --status --exec $PROG + case $? in + 0) echo "$PROG is running with pid $(cat $PID)" ;; + 1) echo "$PROG is not running but the pid file $PID exists" ;; + 3) echo "$PROG is not running" ;; + 4) echo "Unable to determine the program status" ;; + esac + ;; + + *) + echo "usage: $0 [start|stop|restart|status]" + ;; +esac