Merging of the entire pre5 branch.

[tinc] / doc / sample-config / tinc-up

diff --git a/doc/sample-config/tinc-up b/doc/sample-config/tinc-up
index f515e51..8f05c4a 100644 (file)
--- a/doc/sample-config/tinc-up
+++ b/doc/sample-config/tinc-up
@@ -2,13 +2,14 @@
 # This file sets up the tap device.
 # It gives you the freedom to do anything you want with it.
 # Use the correct name for the tap device:
-# For ethertap this is tap0, tap1, tap2 etcetera,
-# but for the universal tun/tap device use $NETNAME.
+# For the Linux tun/tap device $INTERFACE is set to the right name,
+# but for ethertap and FreeBSD this is tap0, tap1, tap2 etcetera,
+# for Solaris and OpenBSD it is tun0, tun1, etcetera.
 
 # Set hardware ethernet address (required!)
-ifconfig tap1 hw ether fe:fd:0:0:0:0
+ifconfig $INTERFACE hw ether fe:fd:0:0:0:0
 
 # Give it the right ip and netmask. Remember, the subnet of the
 # tap device must be larger than that of the individual Subnets
 # as defined in the host configuration file!
-ifconfig tap1 192.168.1.1 netmask 255.255.0.0 -arp
+ifconfig $INTERFACE 192.168.1.1 netmask 255.255.0.0 -arp