Hi Rafael, Reviewed the patch, but didn't test. Ack from me.
Thanks, Zoran -----Original Message----- From: Rafael Odzakow Sent: den 16 oktober 2017 13:53 To: Zoran Milinkovic <[email protected]>; Hans Nordebäck <[email protected]> Cc: [email protected]; Rafael Odzakow <[email protected]> Subject: [PATCH 1/1] base: double start failed [#2622] Moving the setup_env caused ubuntu 14.04 systems to fail as they dont have the /var/lock/subsys directory by default. --- src/nid/opensafd.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nid/opensafd.in b/src/nid/opensafd.in index d7035f5..ed7818f 100644 --- a/src/nid/opensafd.in +++ b/src/nid/opensafd.in @@ -97,8 +97,6 @@ setup_env() { getent passwd $OPENSAF_USER > /dev/null && chown $OPENSAF_USER $directory fi done - rm -f $pkgpiddir/* - rm -f $pkglogdir/nid.log } clean_shm() { @@ -235,6 +233,8 @@ mutex_remove() { } start() { + setup_env + if ! mutex_create; then return 1 fi @@ -249,11 +249,11 @@ start() { return $RETVAL fi + rm -f $pkgpiddir/* + rm -f $pkglogdir/nid.log [ -x $daemon ] || exit 5 - setup_env - check_transport logger -t $osafprog "Starting OpenSAF Services($osafversion - $osafcshash) (Using $MDS_TRANSPORT)" -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
