diff options
| -rw-r--r-- | sysconfig.txt | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index c4b3e1f3..7cae03d1 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -229,15 +229,12 @@ Generic options: missing link beat is considered to be unplugged. Default: 2 -<<<<<<< HEAD MIN_LINK_DETECTION_DELAY=<delay in seconds> Force minimum link detection delay on all interfaces. Default: 0 CRDA_DOMAIN=<domain> Default wireless regulatory domain (man 8 crda). -======= ->>>>>>> initscripts-9.41-1 IPV6FORWARDING=yes|no Enable or disable global forwarding of incoming IPv6 packets @@ -308,21 +305,10 @@ Generic options: This setting has been moved into net.ipv4.ip_forward setting in /etc/sysctl.conf. Setting it to 1 there enables IP forwarding, setting it to 0 disables it (which is the default for RFC compliance). -<<<<<<< HEAD - Note these options can still be used for compatibility, but you - really have to swith to /etc/sysctl.conf facilities. - DEFRAG_IPV4=yes|no - Setting this to yes used to automatically defragment IPv4 - packets. This is a good idea for masquerading, and - a bad idea otherwise. This setting was moved into - net.ipv4.ip_always_defrag setting in /etc/sysctl.conf. It - is no longer valid for 2.4 kernels. -======= NETWORKWAIT=yes|no This is not used with the move to systemd. ->>>>>>> initscripts-9.41-1 NETWORKING_IPV6=yes|no To do this properly, disable IPv6 in the module itself. This can be done by booting the kernel with "ipv6.disable_ipv6=1". @@ -574,14 +560,10 @@ Files in /etc/sysconfig/network-scripts/ ONBOOT=yes|no (not valid for alias devices; use ONPARENT) HOTPLUG=yes|no USERCTL=yes|no -<<<<<<< HEAD - BOOTPROTO=none|bootp|dhcp|static -======= BOOTPROTO=none|bootp|dhcp 'bootp' or 'dhcp' cause a DHCP client to run on the device. Any other value causes any static configuration in the file to be applied. VLAN=yes|no ->>>>>>> initscripts-9.41-1 MTU= Default MTU for this device WINDOW= @@ -644,18 +626,16 @@ Files in /etc/sysconfig/network-scripts/ If not set, default zone (specified in /etc/firewalld/firewalld.conf) is used. To see all available zones, run 'firewall-cmd --get-zones'. -<<<<<<< HEAD - If BOOTPROTO is not "none", then the only other item that - must be set is the DEVICE item; all the rest will be determined - by the boot protocol. No "dummy" entries need to be created. - + For dynamic addressing (BOOTPROTO=dhcp) only DEVICE needs to + be set; all the rest will be determined by the boot protocol. + You can specify which dhcp client to use with the DHCP_CLIENT, if the DHCP_CLIENT is not specified we trying to launch in order : /sbin/dhclient /sbin/dhcpcd /sbin/pump /sbin/dhcpxd - if you have a preferred client define the DHCP_CLIENT variable. + if you have a preferred client define the DHCP_CLIENT variable. When you use dhclient (which it is the default on a Mandrake-Linux system) you can specify a timeout of waiting the answer from server, the option is called DHCP_TIMEOUT the default is 60 sec. @@ -693,11 +673,6 @@ Files in /etc/sysconfig/network-scripts/ CRDA_DOMAIN=<domain> Wireless regulatory domain for this connection (man 8 crda). -======= - For dynamic addressing (BOOTPROTO=dhcp) only DEVICE needs to - be set; all the rest will be determined by the boot protocol. ->>>>>>> initscripts-9.41-1 - Base items being deprecated: NETWORK=<will be calculated automatically with ipcalc> BROADCAST=<will be calculated automatically with ipcalc> @@ -839,7 +814,7 @@ Files in /etc/sysconfig/network-scripts/ Ethernet 802.1q VLAN items: DEVICE=eth0.42 Initscripts use DEV_PLUS_VID_NO_PAD naming mode for VLAN - devices. + devices. Example: eth0.42 for vlan 42 on device eth0. Valid VLAN ID range is 0-4095. Most ethernet switches reserve VLAN ID 1 to be used as management VLAN; starting from VLAN |