version 0.45.2

previously broken in 6034866d1c
caused *_logger options to be passed unquoted, so
`error_logger="logger -t .."` would pass -t to s-s-d and fail to start
the service.

Fixes: #531

init.d/hostname.in

@@ -19,20 +19,18 @@ depend()
 
 start()
 {
-	local h source x
+	local h source
-	if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
+	if read -r h _ 2> /dev/null < @SYSCONFDIR@/hostname; then
-		read h x </etc/hostname
+		source="@SYSCONFDIR@/hostname"
-		source="from /etc/hostname"
+	elif [ -n "${hostname}" ]; then
-	else
+		h=${hostname}
-		# HOSTNAME variable used to be defined in caps in conf.d/hostname.
+		source="@SYSCONFDIR@/conf.d/${RC_SVCNAME}"
-		# It is also a magic variable in bash.
-		h=${hostname:-${HOSTNAME}} # checkbashisms: false positive (HOSTNAME var)
 	fi
 	if [ -z "$h" ]; then
 		einfo "Using default system hostname"
 		return 0
 	fi
-	ebegin "Setting hostname to $h $source"
+	ebegin "Setting hostname to $h from $source"
 	hostname "$h"
 	eend $? "Failed to set the hostname"
 }

meson.build

@@ -1,5 +1,5 @@
 project('OpenRC', 'c',
-  version : '0.45',
+  version : '0.45.2',
   license: 'BSD-2',
   default_options : [
     'c_std=c99',
@@ -226,4 +226,6 @@ meson.add_install_script('tools/meson_runlevels.sh',
   get_option('sysvinit') ? 'yes' : 'no')
 meson.add_install_script('tools/meson_final.sh',
   rc_libexecdir,
-  os)
+  sbindir,
+  os,
+  get_option('sysvinit') ? 'yes' : 'no')

sh/start-stop-daemon.sh

@@ -47,8 +47,8 @@ ssd_start()
 		${directory:+--chdir} $directory \
 		${output_log+--stdout} $output_log \
 		${error_log+--stderr} $error_log \
-		${output_logger:+--stdout-logger} "$output_logger" \
+		${output_logger:+--stdout-logger \"$output_logger\"} \
-		${error_logger:+--stderr-logger} "$error_logger" \
+		${error_logger:+--stderr-logger \"$error_logger\"} \
 		${capabilities+--capabilities} "$capabilities" \
 		${secbits:+--secbits} "$secbits" \
 		${no_new_privs:+--no-new-privs} \

tools/meson_final.sh

@@ -4,10 +4,15 @@ set -e
 set -u
 
 rc_libexecdir="$1"
-os="$2"
+sbindir="$2"
+os="$3"
+sysvinit="$4"
 
-if [ ${os} != Linux ]; then
+if [ "${os}" != Linux ]; then
 	install -d "${DESTDIR}/${rc_libexecdir}"/init.d
 fi
 install -d "${DESTDIR}/${rc_libexecdir}"/tmp
 install -m 644 "${MESON_BUILD_ROOT}/src/shared/version" "${DESTDIR}/${rc_libexecdir}"
+if [ "${os}" = Linux ] && [ "${sysvinit}" = yes ]; then
+	ln -s openrc-init "${DESTDIR}/${sbindir}"/init
+fi