Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1:Test
sysconfig
sysconfig-allow-per-dhcp-client-user-options.bn...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File sysconfig-allow-per-dhcp-client-user-options.bnc524695.diff of Package sysconfig
--- config/sysconfig.dhcp-network +++ config/sysconfig.dhcp-network 2009-09-01 12:27:38.000000000 +0200 @@ -32,6 +32,33 @@ # DHCLIENT6_BIN="" +## Type: string +## Default: "" +## ServiceRestart: network +# +# Additional user start options to use when the 'dhcpcd' DHCPv4 client +# is enabled in the DHCLIENT_BIN variable (default). +# +DHCPCD_USER_OPTIONS="" + +## Type: string +## Default: "" +## ServiceRestart: network +# +# Additional user start options to use when the 'dhclient' ISC DHCPv4 +# client is enabled in the DHCLIENT_BIN variable. +# +DHCLIENT_USER_OPTIONS="" + +## Type: string +## Default: "" +## ServiceRestart: network +# +# Additional user start options to use when the 'dhcp6c' DHCPv6 client +# is enabled in the DHCLIENT6_BIN variable (default). +# +DHCP6C_USER_OPTIONS="" + ## Type: yesno ## Default: no # --- scripts/ifup-dhcp +++ scripts/ifup-dhcp 2009-09-01 12:24:45.000000000 +0200 @@ -311,10 +311,10 @@ args="$args${DHCLIENT_VENDOR_CLASS_ID:+ -i \"$DHCLIENT_VENDOR_CLASS_ID\"}" args="$args${DHCLIENT_LEASE_TIME:+ -l \"$DHCLIENT_LEASE_TIME\"}" args="$args${DHCLIENT_HOSTNAME_OPTION:+ -h \"$DHCLIENT_HOSTNAME_OPTION\"}" - debug "Starting dhcp client: $DHCLIENT_BIN $args $INTERFACE" + debug "Starting dhcp client: $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $args $INTERFACE" # now start dhcpcd - $DHCLIENT_BIN $DHCLIENT_ARGS \ + $DHCLIENT_BIN $DHCPCD_USER_OPTIONS $DHCLIENT_ARGS \ ${DHCLIENT_TIMEOUT:+-t "$DHCLIENT_TIMEOUT"} \ ${DHCLIENT_CLIENT_ID:+-I "$DHCLIENT_CLIENT_ID"} \ ${DHCLIENT_VENDOR_CLASS_ID:+-i "$DHCLIENT_VENDOR_CLASS_ID"} \ @@ -354,8 +354,8 @@ { print $0; } ' < /etc/dhclient.conf > "$DHCPIFCONF" || return 1 - debug "Starting dhcp client: $DHCLIENT_BIN -cf "$DHCPIFCONF" -lf "$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE" - $DHCLIENT_BIN -cf "$DHCPIFCONF" -lf "$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE </dev/null &>/dev/null & + debug "Starting dhcp client: $DHCLIENT_BIN $DHCLIENT_USER_OPTIONS -cf "$DHCPIFCONF" -lf "$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE" + $DHCLIENT_BIN $DHCLIENT_USER_OPTIONS -cf "$DHCPIFCONF" -lf "$DHCPIFLEASE" -pf "$DHCPIFPID" $args $INTERFACE </dev/null &>/dev/null & } start_dhcp6_dhcp6c() { @@ -380,8 +380,8 @@ echo "};" } > "$DHCP6IFCONF" || return 1 - debug "Starting dhcp client: $DHCLIENT6_BIN $args $INTERFACE" - $DHCLIENT6_BIN $args $INTERFACE </dev/null &>/dev/null & + debug "Starting dhcp client: $DHCLIENT6_BIN $DHCP6C_USER_OPTIONS $args $INTERFACE" + $DHCLIENT6_BIN $DHCP6C_USER_OPTIONS $args $INTERFACE </dev/null &>/dev/null & } case "$ACTION" in
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor