diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2012-10-08 12:47:23 +0200 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2012-10-08 12:48:22 +0200 |
| commit | e182e58e886c6e5cb105055b76646113f2c3bc2d (patch) | |
| tree | caeed2d3c67dd118bc78f4d8e34f7364e1dda552 /sysconfig/network-scripts/network-functions | |
| parent | 30483d5b4a4763e03dcc2462a4621b76568ab1b3 (diff) | |
| download | initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar.gz initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar.bz2 initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.tar.xz initscripts-e182e58e886c6e5cb105055b76646113f2c3bc2d.zip | |
Revert patches which should not be in 6.4
Revert "Process rule6-* for sit devices (#840009)"
This reverts commit f082f9e64eadbf68ef9bb67744c97c0974af9115.
Revert "securetty: check if the device is in the file before attempting to write to it"
This reverts commit 10c72ce532c1d4f6d0b17fdc9448c9bd2d0b5ef5.
Revert "Killproc -d should parse same values as sleep"
This reverts commit 763b7dcf6bf9e47d90546be1aabf1f724dd527f8.
Revert "Make killproc more granular when delay is passed. (#428029, <xjakub@fi.muni.cz>)"
This reverts commit 6e62c51f3162081cc05ef546929aa98b8448b1cb.
Revert "Allow dhclient configuration files for DHCPv6 as well. (#815676)"
This reverts commit 9987361e94ec6f26e557053b27af6e43a9ee13e1.
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index a3833463..e0d5018c 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -59,17 +59,6 @@ get_uuid_by_config () dbus-send --system --print-reply --dest=com.redhat.ifcfgrh1 /com/redhat/ifcfgrh1 com.redhat.ifcfgrh1.GetIfcfgDetails string:"/etc/sysconfig/network-scripts/$1" 2>/dev/null | awk -F '"' '/string / { print $2 }' } -generate_config_file_name () { - local ver=$1 - if [ -s /etc/dhcp/dhclient$ver-${DEVICE}.conf ]; then - DHCLIENTCONF="-cf /etc/dhcp/dhclient$ver-${DEVICE}.conf"; - elif [ -s /etc/dhclient$ver-${DEVICE}.conf ]; then - DHCLIENTCONF="-cf /etc/dhclient$ver-${DEVICE}.conf"; - else - DHCLIENTCONF=''; - fi -} - need_config () { local nconfig |