diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:16:44 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:16:44 -0500 |
commit | 52cc0c3ff27d4c48d3461d9fd898367aa4a92631 (patch) | |
tree | f4d2b4fcfbc1c6cda116b7723ebe2eee774b0cd6 /src/chroot-tools/hooks-distcc.sh | |
parent | 3793e4fac9d1d853251e84838caa2b8849d1f32b (diff) | |
parent | 58e2a9cd5aa9a4eb80f8da675685f62aca128eb3 (diff) |
Merge branch 'master' into xbs
Conflicts:
src/lib/conf.sh
Diffstat (limited to 'src/chroot-tools/hooks-distcc.sh')
-rw-r--r-- | src/chroot-tools/hooks-distcc.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chroot-tools/hooks-distcc.sh b/src/chroot-tools/hooks-distcc.sh index 9e42242..d8d708a 100644 --- a/src/chroot-tools/hooks-distcc.sh +++ b/src/chroot-tools/hooks-distcc.sh @@ -75,7 +75,7 @@ distcc_stop() { if [[ -f "$copydir/run/distcc-tool.pid" ]]; then - odaemon=$(cat "$copydir/distcc-tool.pid") + odaemon=$(< "$copydir/distcc-tool.pid") kill -- "$odaemon" rm -f -- \ |