From: Roy Marples Date: Wed, 4 Sep 2013 16:27:56 +0000 (+0000) Subject: Clarify waitup arguments. X-Git-Tag: v6.1.0~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b7499fd9e8969d4ab0b635d7a24a787fff91976;p=thirdparty%2Fdhcpcd.git Clarify waitup arguments. --- diff --git a/dhcpcd.8.in b/dhcpcd.8.in index 900544f6..d8b6781f 100644 --- a/dhcpcd.8.in +++ b/dhcpcd.8.in @@ -422,6 +422,12 @@ then exits before doing any configuration. Wait for an address to be assigned before forking to the background. 4 means wait for an IPv4 address to be assigned. 6 means wait for an IPv6 address to be assigned. +If no argument is given, +.Nm +will wait for any address protocol to be assigned. +It is possible to wait for more than one address protocol and +.Nm +will only fork to the background when all waiting conditions are satisfied. .It Fl x , Fl Fl exit Op Ar interface This will signal an existing .Nm diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in index e49948b2..5594e7d7 100644 --- a/dhcpcd.conf.5.in +++ b/dhcpcd.conf.5.in @@ -414,6 +414,12 @@ To work around it, try and impersonate Windows by using the MSFT vendorclassid. Wait for an address to be assigned before forking to the background. 4 means wait for an IPv4 address to be assigned. 6 means wait for an IPv6 address to be assigned. +If no argument is given, +.Nm +will wait for any address protocol to be assigned. +It is possible to wait for more than one address protocol and +.Nm +will only fork to the background when all waiting conditions are satisfied. .It Ic xidhwaddr Use the last four bytes of the hardware address as the DHCP xid instead of a randomly generated number.