- merged changes from PLD, all TLD changes and fixes are kept

[rc-scripts.git] / sysconfig / interfaces / ifcfg-description

diff --git a/sysconfig/interfaces/ifcfg-description b/sysconfig/interfaces/ifcfg-description
index 3986ef9dd8ea85a76a39b2f7b8795b20c36ef89c..45d5a704b81b146e63c2debba9990006b4f77595 100644 (file)
--- a/sysconfig/interfaces/ifcfg-description
+++ b/sysconfig/interfaces/ifcfg-description
@@ -81,6 +81,8 @@ VLAN_REORDER_HDR=[0|1]        When this is set, the VLAN device will move the
 [ HANDLING=0|1|2|3 ] (0 is default; used ie. in ATM configuration, for
                      details see ifup script)
 
+[ CHECK_LINK_WAIT_TIMEOUT=<wait max x sec for interface link up> ]
+
 if     DEVICE=eth*; then
 
        [ MEDIA={auto|10baseT|10base2|AUI} ]
@@ -89,6 +91,7 @@ if    DEVICE=eth*; then
        if macvlan
                MACVLAN_DEV=<exitsting base interface eg. eth0>
                MACVLAN_MACADDR=<desired hw address of new interface>
+               MACVLAN_MODE=<desired mode of new interface (private, vepa, bridge, passthru, source)>
        fi
        
 
@@ -227,13 +230,23 @@ elif    DEVICE=irda* ; then     /* IrDA */
         DISCOVERY=yes|no (starts discovery of remote IrDA devices)
 fi
 
-# You can also run some other programs *after* device has been brought up or down.
-# Just create functions run_up() and run_down().
+# You can also run commands before/after a device has been brought up or down.
+# Just create functions run_up/run_pre_up/run_down/run_pre_down.
+run_pre_up()
+{
+       echo "This will be executed before device is brought up!"
+}
+
 run_up()
 {
        echo "This will be executed after device is brought up!"
 }
 
+run_pre_down()
+{
+       echo "This will be executed before device is brought down!"
+}
+
 run_down()
 {
        echo "This will be executed after device is brought down!"