[Guessnet-devel] [svn] r151 - in trunk: . debian doc examples

[Enrico Zini]

Author: enrico
Date: Fri Aug 25 17:55:20 2006
New Revision: 151

Modified:
   trunk/   (props changed)
   trunk/FAQ
   trunk/debian/changelog
   trunk/doc/Saner-Defaults-HOWTO
   trunk/examples/interfaces
Log:
 r398 at viaza:  enrico | 2006-08-25 15:14:57 +0100
 Applied Adeodato Simó patches to improve the interfaces examples


Modified: trunk/FAQ
==============================================================================
--- trunk/FAQ	(original)
+++ trunk/FAQ	Fri Aug 25 17:55:20 2006
@@ -13,18 +13,25 @@
 
   auto lo eth0
   iface lo inet loopback
+
+  # possible guessnet default
+  iface dhcp inet dhcp
+
+  # guessnet interface to detect the absence of cable
+  iface interface inet manual
+  	test missing-cable
+  	pre-up echo No link present.
+  	pre-up false
   
   mapping eth0
-  	# Too bad there's no way to pass commandline options to script
-  	# script /usr/sbin/guessnet -i
-  	script /usr/sbin/guessnet-ifupdown
+  	script guessnet-ifupdown
   	
   	# List of stanzas guessnet should scan for
   	#   If none is specified, scans for all stanzas
   	#map home work
   	
   	# Profile to select when all tests fail
-  	map default: none
+  	map default: dhcp
   	
   	# If no test succeed after this amount of seconds,
 	# then guessnet selects the default profile.
@@ -46,18 +53,6 @@
   	# Check for one of these hosts:
   	test peer address 192.168.1.1 mac 00:01:02:03:04:05
   
-  # Bogus configuration to use when there is no cable plugged on the
-  # interface. This avoids those long, boring DHCP timeouts at boot!
-  #  
-  # Many network drivers want some real-looking data anyway.  I'd really
-  # appreciate a way to just keep the interface down (see bug #275326).
-  iface disconnected inet static
-  	address 192.168.1.2
-  	netmask 255.255.255.0
-  	test missing-cable
-  
-  # If nothing is found, try negotiating DHCP
-  iface none inet dhcp
 		</pre></div>
 
 What is the difference between guessnet and whereami, intuitively, laptop-net, divine, ...

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Fri Aug 25 17:55:20 2006
@@ -1,9 +1,10 @@
 guessnet (0.39-1) unstable; urgency=low
 
   * Fixed path of arping.  Closes: #384569.
-    Thanks Adeodato Simó for the patch.
+  * Greatly improved /etc/network/interfaces examples.
+    Thanks Adeodato Simó for the patches.
 
- -- Enrico Zini <enrico at debian.org>  Fri, 25 Aug 2006 15:11:49 +0100
+ -- Enrico Zini <enrico at debian.org>  Fri, 25 Aug 2006 15:13:47 +0100
 
 guessnet (0.38-1) unstable; urgency=low
 

Modified: trunk/doc/Saner-Defaults-HOWTO
==============================================================================
--- trunk/doc/Saner-Defaults-HOWTO	(original)
+++ trunk/doc/Saner-Defaults-HOWTO	Fri Aug 25 17:55:20 2006
@@ -14,21 +14,19 @@
 
 # Use guessnet
 mapping eth0
-	# Too bad there's no way to pass commandline options to script
-	# (see ifupdown bug #139383)
-	script /usr/sbin/guessnet-ifupdown
-	map default: auto
+	script guessnet-ifupdown
+	map default: dhcp
 
 # If there is no link detected, don't try DHCP
 #
 # Here it would be useful to have 'fail' method for iface that just
 # keeps the interface down (see ifupdown bug #275326)
-# In the meantime, we have to specify some random configuration data:
-iface disconnected inet static
-	address 10.0.0.1
-	netmask 255.255.255.0
+# In the meantime, leave the interface unconfigured by hand.
+iface interface inet manual
 	test missing-cable
+	pre-up echo No link present.
+	pre-up false
 
 # By default, perform DHCP
-iface auto inet dhcp
+iface dhcp inet dhcp
 ----------------------------------------------------------------------

Modified: trunk/examples/interfaces
==============================================================================
--- trunk/examples/interfaces	(original)
+++ trunk/examples/interfaces	Fri Aug 25 17:55:20 2006
@@ -3,13 +3,11 @@
 iface lo inet loopback
 
 mapping eth0
-	# Too bad there's no way to pass commandline options to script
-	# script /usr/sbin/guessnet -i
-	script /usr/sbin/guessnet-ifupdown
+	script guessnet-ifupdown
 	# List of stanzas guessnet should scan for
 	#   If none is specified, scans for all stanzas
 	#map home work
-	map default: none
+	map default: dhcp
 	map timeout: 3
 	map verbose: true
 
@@ -54,15 +52,11 @@
 	# It could also be:
 	#test-pppoe please
 
-# I'd really appreciate a 'disabled' method for iface that just
-# keeps the interface down)
-iface disconnected inet static
-	address 192.168.1.2
-	netmask 255.255.255.0
-	up touch /etc/roaming/not_online
-	test missing-cable
-	# It could also be:
-	#test-missing-cable please
+# I'd really appreciate a 'disabled' method for iface (#275326)
+iface interface inet manual
+    test missing-cable
+    pre-up echo No link present.
+    pre-up false
 
-# If nothing is found, try negotiating DHCP
+# guessnet default
 iface none inet dhcp