lp:~smoser/ubuntu/oneiric/ifupdown/lp838968

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/ifupdown at revision 56

Steve Langasek: Approve on 2011-09-02

Ubuntu branches: Pending requested 2011-09-02

Diff: 86 lines (+27/-14)

3 files modified

debian/changelog (+12/-0)
debian/ifupdown.upstart.if-up (+14/-13)
ifupdown.nw (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #838968: static-network-up event does not wait for interfaces to have an address

High

Fix Released

Link a bug report

Related blueprints

64. By Scott Moser on 2011-09-02

address slangasek's objections to code restructuring.

 * remove the 'mkdir', parent dir must now exist.
   (it will in the case of /run/network)
 * do not use global _RET, but write list of interfaces
   to stdout in get_auto_interfaces.

63. By Scott Moser on 2011-09-02

fix wrong assumed directory '/var/run' -> '/run/network'

62. By Scott Moser on 2011-09-02

changes in response to Steve's comments

 * do not use 'date' (save a fork)
 * simplify use of 'all_interfaces_up' by having it get the list of all
   auto interfaces
 * only fork to mkdir for parent dir of MARK_STATIC_NETWORK_EMITTED if
   it is not a direct subdir of /var/run.

61. By Scott Moser on 2011-09-02

The change for '-1' is only made for 'dchlient3', not dhclient

changelog message indicated '-1' would be for dhclient, but
the change was only made for dhclient3. I wasn't positive if something
that was 'dhclient' only would have a '-1' option or not.

back to lucid we have a 'dhclient3' binary available whose
help mentions the '-1' flag, so I think this is reasonable.

60. By Scott Moser on 2011-09-02

* invoke dhclient with '-1', meaning it should exit failure if it does
  not receive a response in 60 seconds. (LP: #838968)
* fix the broken static-network-up-emitted event. This now keeps
  state of which interfaces have been brought up by marker files
  in /run/network named ifup.IFACE and a directory named
  static-network-up-emitted indicating static-network-up has been
  emitted.

59. By Scott Moser on 2011-09-02

fix inconsistent use of prefix resulting in bad names

sometimes I was using "prefix.iface". other times "${prefix}$iface"

MARK_DEV_PREFIX must have a trailing '.'. Nothing other than the IFACE
will be appended.

58. By Scott Moser on 2011-09-02

debian/ifupdown.upstart.if-up: white space cleanup

57. By Scott Moser on 2011-09-02

ifupdown.upstart.if-up: do not use /var/run/network/ifstate

Previously, we expected that /var/run/network/ifstate would contain
only interfaces that had been brought up.

That is not the case. It contains interfaces that are being brought up.
Essentially it will contain an interface immediately after 'ifup IFACE"
is invoked.

So, instead, we use /var/run to manage our own files indicating that
"this interface has been brought up once this boot"

56. By Scott Moser on 2011-09-02

add '-1' to dhclient3 invocations

55. By Colin Watson on 2011-08-22

releasing version 0.7~alpha5.1ubuntu3