Patchwork [RFC,2/4] pulseaudio 1.1: replace hardcoded /etc with ${sysconfdir}

login
register
mail settings
Submitter Koen Kooi
Date Nov. 29, 2011, 9:24 p.m.
Message ID <1322601901-26195-2-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/15643/
State Accepted
Commit 82414933a98b30f48507858e7fc22b349a4f8dab
Headers show

Comments

Koen Kooi - Nov. 29, 2011, 9:24 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    8 ++++----
 .../pulseaudio/pulseaudio_1.1.bb                   |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 6cd6d16..131d659 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -90,13 +90,13 @@  pkg_postinst_${PN}-server() {
         if [ "x$D" != "x" ]; then
                 exit 1
         fi
-        grep -q pulse: /etc/group || addgroup pulse
-        grep -q pulse: /etc/passwd || \
+        grep -q pulse: ${sysconfdir}/group || addgroup pulse
+        grep -q pulse: ${sysconfdir}/passwd || \
             adduser --disabled-password --home=/var/run/pulse --system \
                     --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
         addgroup pulse audio
-        if [ -e /etc/init.d/populate-volatile.sh ] ; then
-            /etc/init.d/populate-volatile.sh update
+        if [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
+            ${sysconfdir}/init.d/populate-volatile.sh update
         fi
 }
 
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
index df3a53e..576d2b7 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
@@ -1,6 +1,6 @@ 
 require pulseaudio.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "libjson gdbm speex libxml-parser-perl-native"