public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use the --quiet flag.

Browse Source 
svn path=/nixos/trunk/; revision=33225
This commit is contained in:
Eelco Dolstra 2012-03-18 02:36:44 +00:00
parent 83f5d26a85
commit 21393eed1e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/system/activation/switch-to-configuration.sh
View File

@ -84,7 +84,7 @@ newJobs=$(readlink -f @out@/etc/init)
for job in $(initctl list | sed -e '/ stop\/waiting/ d; /^[^a-z]/ d; s/^\([^ ]\+\).*/\1/' | sort); do for job in $(initctl list | sed -e '/ stop\/waiting/ d; /^[^a-z]/ d; s/^\([^ ]\+\).*/\1/' | sort); do
if ! [ -e "$newJobs/$job.conf" ] ; then if ! [ -e "$newJobs/$job.conf" ] ; then
echo "stopping obsolete job ‘$job’..." echo "stopping obsolete job ‘$job’..."
initctl stop "$job" || true stop --quiet "$job" || true
fi fi
done done
@ -115,8 +115,8 @@ for job in $(cd $newJobs && ls *.conf); do
echo "restarting changed service ‘$job’..." echo "restarting changed service ‘$job’..."
# Note: can't use "restart" here, since that only restarts the # Note: can't use "restart" here, since that only restarts the
# job's main process. # job's main process.
stop "$job" || true stop --quiet "$job" || true
start "$job" || true start --quiet "$job" || true
done done
# Start all jobs that are not running but should be. The "should be" # Start all jobs that are not running but should be. The "should be"
@ -135,11 +135,11 @@ for job in $(cd $newJobs && ls *.conf); do
"$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ]; "$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
then continue; fi then continue; fi
echo "starting task ‘$job’..." echo "starting task ‘$job’..."
start "$job" || true start --quiet "$job" || true
else else
if ! grep -q "^start on" "$newJobs/$job.conf"; then continue; fi if ! grep -q "^start on" "$newJobs/$job.conf"; then continue; fi
echo "starting service ‘$job’..." echo "starting service ‘$job’..."
start "$job" || true start --quiet "$job" || true
fi fi
done done