Merge authors: Steve Langasek (vorlon) Related merge proposals: https://code.launchpad.net/~vorlon/upstart/lp.1235387/+merge/189399 proposed by: Steve Langasek (vorlon) review: Approve - James Hunt (jamesodhunt) ------------------------------------------------------------ revno: 1547 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Mon 2013-10-28 09:45:13 +0000 message: * Merge of lp:~vorlon/upstart/lp.1235387. modified: ChangeLog extra/conf/upstart-file-bridge.conf
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-10-23 22:44:54 +0000 +++ ChangeLog 2013-10-28 09:45:13 +0000 @@ -12,6 +12,9 @@ * extra/upstart-local-bridge.c: use SOCKET_PATH in our event environment, instead of clobbering PATH. (LP: #1235480) + * extra/conf/upstart-file-bridge.conf: fix the start condition to + comply with the intent, that we start the file bridge only once + the filesystem is up. (LP: #1235387) 2013-10-04 James Hunt <[email protected]> === modified file 'extra/conf/upstart-file-bridge.conf' --- extra/conf/upstart-file-bridge.conf 2013-03-15 12:51:25 +0000 +++ extra/conf/upstart-file-bridge.conf 2013-10-04 18:15:26 +0000 @@ -9,7 +9,7 @@ # the bridge does not currently handle dealing with mounts that overlay # already-watched directories. -start on mounted +start on filesystem stop on runlevel [!2345]
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
