-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello,
Le 09/10/2013 17:48, Vincent Bernat a écrit : >> If by multiple instances you mean many configuration files in >> /etc/stud I haven't tested. If you mean multiple children (or >> cores) started by the -n option, this is indeed what it is trying >> to fix. > > Yes, I mean multiple configuration files. But OK, I see what you > mean. Well, I don't know how to concile the two approaches. Being > able to run multiple instances is important. > True, I hadn't thought of that. So I ran new tests with two configs and as you stated, my patch doesn't work. Turns out that removing --pidfile is only needed in the do_stop. This way, we keep the possibility of running multiple instances, while fixing the restart part, especially since the pidfiles are cleaned up anyway. So here is a new and simpler patch > I am usually never on IRC. I should try to get there because you > are not the first trying to reach me this way. > This is not by any mean mandatory, I just happen to be there all the time for work-related requirements. Kind regards, ...Louis - -- Louis Bouchard Software engineer, Cloud & Sustaining eng. Canonical Ltd Ubuntu support: http://canonical.com/support -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlJWewcACgkQDvqokHrhnCwuOwCff1RBzG6BgO0hI+TlrGpsNkBV m6YAn0r4lC29tAp5Cw2tGj0h4sqDAS63 =YoHj -----END PGP SIGNATURE-----
diff -Nru stud-0.3/debian/changelog stud-0.3/debian/changelog --- stud-0.3/debian/changelog 2013-06-08 23:11:29.000000000 +0200 +++ stud-0.3/debian/changelog 2013-10-10 11:35:24.000000000 +0200 @@ -1,3 +1,13 @@ +stud (0.3-5.1) UNRELEASED; urgency=low + + * Fixes failure to run invoke-rc.d stud restart + Closes: #725797 + Use of --pidfile with start-stop-daemon failed to kill the children. + It is important to avoid running stud as 'root' as stated in the README.md + since running invoke-rc.d stud stop will kill the initscript. + + -- Louis Bouchard <louis.bouch...@ubuntu.com> Thu, 10 Oct 2013 11:35:58 +0200 + stud (0.3-5) unstable; urgency=low * Fix FTBFS when using --as-needed on non x86 arch. diff -Nru stud-0.3/debian/stud.init.d stud-0.3/debian/stud.init.d --- stud-0.3/debian/stud.init.d 2013-06-08 23:11:29.000000000 +0200 +++ stud-0.3/debian/stud.init.d 2013-10-10 11:34:45.000000000 +0200 @@ -86,7 +86,7 @@ PIDFILE=/var/run/stud.${BASE}.pid . $conf start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 \ - --pidfile $PIDFILE --name $NAME + --name $NAME --user $USER RETVAL="$?" if [ "$RETVAL" = 2 ]; then [ "$VERBOSE" != no ] && log_progress_msg "[Unable to stop: ${BASE}]"