wok diff dbus/receipt @ rev 18708

Up cookutils(786)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Wed Dec 16 17:40:23 2015 +0200 (2015-12-16)
parents 2429812d90ab
children 6222d1b9c074
line diff
     1.1 --- a/dbus/receipt	Tue Aug 05 13:54:31 2014 +0200
     1.2 +++ b/dbus/receipt	Wed Dec 16 17:40:23 2015 +0200
     1.3 @@ -45,28 +45,26 @@
     1.4  
     1.5  pre_install()
     1.6  {
     1.7 -	local root
     1.8 -	root=$1
     1.9  	# Go for echoing on configuration files if any messagebus user
    1.10  	# was found.
    1.11 -	if ! grep -qs 'messagebus' $root/etc/passwd; then
    1.12 -		echo -n "Adding user: messagebus..."
    1.13 -		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> $root/etc/passwd
    1.14 -		echo 'messagebus:!:14013:0:99999:7:::' >> $root/etc/shadow
    1.15 -		echo 'messagebus:x:25:' >> $root/etc/group
    1.16 -		echo 'messagebus:!::' >> $root/etc/gshadow
    1.17 +	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    1.18 +		action 'Adding user: messagebus...'
    1.19 +		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd"
    1.20 +		echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow"
    1.21 +		echo 'messagebus:x:25:' >> "$1/etc/group"
    1.22 +		echo 'messagebus:!::' >> "$1/etc/gshadow"
    1.23  		status
    1.24  	fi
    1.25 -	if ! grep -qs ^DBUS_OPTIONS $root/etc/daemons.conf; then
    1.26 -		echo -n "Configuring $root/etc/daemons.conf..."
    1.27 -		cat >> $root/etc/daemons.conf << "EOT"
    1.28 +	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
    1.29 +		action 'Configuring %s/etc/daemons.conf...' "$1"
    1.30 +		cat >> "$1/etc/daemons.conf" << "EOT"
    1.31  # DBUS daemon options.
    1.32  DBUS_OPTIONS="--system"
    1.33  
    1.34  EOT
    1.35  		status
    1.36  	fi
    1.37 -	[ -d $root/var/run ] || mkdir -p $root/var/run
    1.38 +	[ -d "$1/var/run" ] || mkdir -p "$1/var/run"
    1.39  }
    1.40  
    1.41  pre_remove()