philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

* Mark tasks such as mount-failed as not to be restarted.

Browse source 
svn path=/nixos/trunk/; revision=33237
This commit is contained in:
Eelco Dolstra 2012-03-18 18:04:49 +00:00
parent 362d1389d3
commit 4acc48fc2d
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/system/activation/switch-to-configuration.sh
View file

@ -121,7 +121,7 @@ done
# Start all jobs that are not running but should be. The "should be"
# criterion is tricky: the intended semantics is that we end up with
# the same jobs as after a reboot. If it's a task, restart it if it
# the same jobs as after a reboot. If it's a task, start it if it
# differs from the previous instance of the same task; if it wasn't
# previously run, don't run it. If it's a service, only start it if
# it has a "start on" condition.
@ -134,6 +134,7 @@ for job in $(cd $newJobs && ls *.conf); do
if [ ! -e "/var/run/upstart-jobs/$job" -o \
"$(readlink -f "$newJobs/$job.conf")" = "$(readlink -f "/var/run/upstart-jobs/$job")" ];
then continue; fi
if ! grep -q "^# RESTART-IF-CHANGED" "$newJobs/$job.conf"; then continue; fi
echo "starting task ‘$job’..."
start --quiet "$job" || true
else

4
modules/tasks/filesystems.nix
View file

@ -203,6 +203,7 @@ in
jobs."mount-failed" =
{ task = true;
startOn = "mount-failed";
restartIfChanged = false;
script =
''
# Don't start the emergency shell if the X server is
@ -225,6 +226,7 @@ in
{
task = true;
startOn = "ip-up";
restartIfChanged = false;
script =
''
# Send USR1 to the mountall process. Can't use "pkill
@ -243,6 +245,8 @@ in
jobs."emergency-shell" =
{ task = true;
restartIfChanged = false;
console = "owner";
script =