git://git.onelab.eu
/
mom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e58ad9b
)
No more pl_conf.
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Tue, 25 Sep 2007 18:18:39 +0000
(18:18 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Tue, 25 Sep 2007 18:18:39 +0000
(18:18 +0000)
pl_mop.sh
patch
|
blob
|
history
diff --git
a/pl_mop.sh
b/pl_mop.sh
index
8c3757d
..
80fcb41
100755
(executable)
--- a/
pl_mop.sh
+++ b/
pl_mop.sh
@@
-5,7
+5,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
-# $Id: pl_mop.sh,v 1.
7 2006/05/09 22:26:31 mlhuang
Exp $
+# $Id: pl_mop.sh,v 1.
8 2007/02/14 20:48:46 faiyaza
Exp $
#
PATH=/sbin:/usr/sbin:$PATH
#
PATH=/sbin:/usr/sbin:$PATH
@@
-75,17
+75,6
@@
restart_netflow() {
fi
}
fi
}
-# keep pl_conf running
-restart_pl_conf() {
- echo "* Checking pl_conf"
- vserver pl_conf exec /sbin/service pl_conf status >/dev/null 2>&1
- if [ $? -ne 0 ] ; then
- echo "* Restarting pl_conf"
- vserver pl_conf stop
- vserver pl_conf start
- fi
-}
-
# GPG keys are installed in /etc/pki/rpm-gpg by both the Boot Manager
# during initial installation, and by PlanetLabConf during daily
# updates. NodeUpdate imports the keys into the RPM database before
# GPG keys are installed in /etc/pki/rpm-gpg by both the Boot Manager
# during initial installation, and by PlanetLabConf during daily
# updates. NodeUpdate imports the keys into the RPM database before
@@
-224,8
+213,6
@@
run fix_etc_shadow
run restart_services
run restart_services
-run restart_pl_conf
-
run restart_netflow
run kill_duplicate_ssh
run restart_netflow
run kill_duplicate_ssh