wok-current diff dbus/receipt @ rev 15646
libdrm: update bdeps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Dec 10 15:00:10 2013 +0000 (2013-12-10) |
parents | 7896f0694ef6 |
children | 53082fab5f1e |
line diff
1.1 --- a/dbus/receipt Sat Aug 10 21:12:16 2013 +0000 1.2 +++ b/dbus/receipt Tue Dec 10 15:00:10 2013 +0000 1.3 @@ -50,7 +50,7 @@ 1.4 root=$1 1.5 # Go for echoing on configuration files if any messagebus user 1.6 # was found. 1.7 - if ! grep -q 'messagebus' $root/etc/passwd; then 1.8 + if ! grep -qs 'messagebus' $root/etc/passwd; then 1.9 echo -n "Adding user: messagebus..." 1.10 echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> $root/etc/passwd 1.11 echo 'messagebus:!:14013:0:99999:7:::' >> $root/etc/shadow 1.12 @@ -58,7 +58,7 @@ 1.13 echo 'messagebus:!::' >> $root/etc/gshadow 1.14 status 1.15 fi 1.16 - if ! grep -q ^DBUS_OPTIONS $root/etc/daemons.conf; then 1.17 + if ! grep -qs ^DBUS_OPTIONS $root/etc/daemons.conf; then 1.18 echo -n "Configuring $root/etc/daemons.conf..." 1.19 cat >> $root/etc/daemons.conf << "EOT" 1.20 # DBUS daemon options. 1.21 @@ -72,7 +72,7 @@ 1.22 pre_remove() 1.23 { 1.24 if [ -z "$1" ]; then 1.25 - /etc/init.d/dbus stop 1.26 + /etc/init.d/dbus stop 2> /dev/null 1.27 deluser messagebus 1.28 fi 1.29 }