diff options
author | Jeremy Laine <jeremy.laine@m4x.org> | 2008-07-02 17:18:59 +0000 |
---|---|---|
committer | Jeremy Laine <jeremy.laine@m4x.org> | 2008-07-02 17:18:59 +0000 |
commit | 08a6e84d3ad35bf232bd5d01b82f939904730a61 (patch) | |
tree | 05fa5fffbac84083057eea9f17e82747de566d6b | |
parent | b85f5d16a791a5f65bc10be3b257b207821681ba (diff) |
hal: create volatiles *after* creating the haldaemon user
-rw-r--r-- | packages/hal/hal_0.5.9.1.bb | 6 | ||||
-rw-r--r-- | packages/hal/hal_0.5.9.bb | 6 | ||||
-rw-r--r-- | packages/hal/hal_git.bb | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/packages/hal/hal_0.5.9.1.bb b/packages/hal/hal_0.5.9.1.bb index 3d2ba155b5..8bd193c40a 100644 --- a/packages/hal/hal_0.5.9.1.bb +++ b/packages/hal/hal_0.5.9.1.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb-compat" RDEPENDS_${PN} += "udev hal-info" RRECOMMENDS_${PN} += "udev-utils" -PR = "r7" +PR = "r8" SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ file://configure_fix.patch;patch=1 \ @@ -52,11 +52,11 @@ pkg_postinst_hal () { exit 1 fi - /etc/init.d/populate-volatile.sh update - grep haldaemon /etc/group || addgroup haldaemon grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL + /etc/init.d/populate-volatile.sh update + DBUSPID=`pidof dbus-daemon` if [ "x$DBUSPID" != "x" ]; then diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index b878638ff2..8dabddf23c 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -5,7 +5,7 @@ RDEPENDS += "udev hal-info" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r7" +PR = "r8" SRC_URI += "file://99_hal \ file://20hal \ @@ -53,11 +53,11 @@ pkg_postinst_hal () { exit 1 fi - /etc/init.d/populate-volatile.sh update - grep haldaemon /etc/group || addgroup haldaemon grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL + /etc/init.d/populate-volatile.sh update + DBUSPID=`pidof dbus-daemon` if [ "x$DBUSPID" != "x" ]; then diff --git a/packages/hal/hal_git.bb b/packages/hal/hal_git.bb index 659ab8eb6c..49ecfde9ea 100644 --- a/packages/hal/hal_git.bb +++ b/packages/hal/hal_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://99_hal" PV = "0.5.9.1+git${SRCDATE}" -PR = "r5" +PR = "r6" S = "${WORKDIR}/git" @@ -53,11 +53,11 @@ pkg_postinst_hal () { exit 1 fi - /etc/init.d/populate-volatile.sh update - grep haldaemon /etc/group || addgroup haldaemon grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL + /etc/init.d/populate-volatile.sh update + DBUSPID=`pidof dbus-daemon` if [ "x$DBUSPID" != "x" ]; then |