Commit 2d57a217 authored by Steve Langasek's avatar Steve Langasek
Browse files

Fix mountall upstart job to not start a subshell for reading

/proc/cmdline, since this causes upstart to lose track of the daemon
process and leaves mountall-net unable to signal it to retry network
mounts.  LP: #1235013.
parent b8b81d61
...@@ -26,13 +26,14 @@ script ...@@ -26,13 +26,14 @@ script
# Doesn't work so well if mountall is responsible for mounting /proc, heh. # Doesn't work so well if mountall is responsible for mounting /proc, heh.
if [ -e /proc/cmdline ]; then if [ -e /proc/cmdline ]; then
for arg in $(cat /proc/cmdline); do read line < /proc/cmdline
for arg in $line; do
case $arg in case $arg in
-q|--quiet|-v|--verbose|--debug) -q|--quiet|-v|--verbose|--debug)
debug_arg=$arg debug_arg=$arg
;; ;;
esac esac
done done < /proc/cmdline
fi fi
# set $LANG so that messages appearing in plymouth are translated # set $LANG so that messages appearing in plymouth are translated
if [ -r /etc/default/locale ]; then if [ -r /etc/default/locale ]; then
......
...@@ -3,6 +3,10 @@ mountall (2.52) UNRELEASED; urgency=low ...@@ -3,6 +3,10 @@ mountall (2.52) UNRELEASED; urgency=low
* Don't emit extra 'mounting' events for mounts already in progress; this * Don't emit extra 'mounting' events for mounts already in progress; this
will cause double triggering of some jobs for remote filesystems, and will cause double triggering of some jobs for remote filesystems, and
can also cause us to miss 'mounted' events. LP: #1048017. can also cause us to miss 'mounted' events. LP: #1048017.
* Fix mountall upstart job to not start a subshell for reading
/proc/cmdline, since this causes upstart to lose track of the daemon
process and leaves mountall-net unable to signal it to retry network
mounts. LP: #1235013.
-- Steve Langasek <vorlon@debian.org> Mon, 07 Oct 2013 13:43:48 -0700 -- Steve Langasek <vorlon@debian.org> Mon, 07 Oct 2013 13:43:48 -0700
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment