diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-08-22 08:02:05 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2011-08-22 08:02:05 +0000 |
| commit | 79fc39f16ebf6187d6533d495c8edee8a4c723c1 (patch) | |
| tree | 20bc0a93299f2b6d9f32755723577fdcef6490a8 /etc | |
| parent | 122de3fd3ac87a9458c3b8d654741de6ad078280 (diff) | |
Read amd_master using print -rn, fixes problems if the file has multiple
lines. Problem noticed by me, this solution from halex@.
ok halex aja
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/amd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/amd b/etc/rc.d/amd index 224144b69af..82b3634d517 100644 --- a/etc/rc.d/amd +++ b/etc/rc.d/amd @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: amd,v 1.3 2011/07/16 09:33:29 sthen Exp $ +# $OpenBSD: amd,v 1.4 2011/08/22 08:02:04 nicm Exp $ daemon="/usr/sbin/amd" @@ -12,7 +12,7 @@ rc_stop=NO rc_pre() { [ -e ${amd_master} ] || return 1 - daemon_flags=$(cat ${amd_master}) + daemon_flags=$(print -rn -- $(< ${amd_master})) } rc_start() { |