Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
04884376
Commit
04884376
authored
May 18, 2010
by
Leigh B Stoller
Browse files
Fix merge error.
parent
1cea01c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
install/updates/5/2
View file @
04884376
...
...
@@ -21,9 +21,10 @@ sub InstallUpdate($$)
Phase "newsyslog", "Updating $NEWSYSLOG_CONF", sub {
DoneIfEdited($NEWSYSLOG_CONF);
BackUpFileFatal($NEWSYSLOG_CONF);
ExecQuietFatal("sed -i .orig -e '/checknodes/d' $NEWSYSLOG_CONF");
AppendToFileFatal($NEWSYSLOG_CONF,
"$LOGDIR/checknodes.log 640 14 300 ".
"* Z /var/run/checknodes.pid");
"* Z /var/run/checknodes
_daemon
.pid");
};
Phase "startupfile", "Updating testbed startup file", sub {
DoneIfIdentical("$TOP_OBJDIR/rc.d/3.testbed.sh", $TESTBED_STARTUP);
...
...
@@ -44,9 +45,9 @@ sub InstallUpdate($$)
}
# Old version of daemon still running.
if (-e "$VARRUN/checknodes.pid" &&
ExecQuiet("pgrep -f checknodes_daemon")) {
!
ExecQuiet("pgrep -f checknodes_daemon")) {
SignalDaemon("checknodes", "TERM");
}
}
;
RestartDaemon("checknodes_daemon");
};
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment