diff -Nru ifupdown-0.6.8ubuntu15/debian/changelog ifupdown-0.6.8ubuntu16/debian/changelog
--- ifupdown-0.6.8ubuntu15/debian/changelog	2009-01-09 11:55:36.000000000 +0000
+++ ifupdown-0.6.8ubuntu16/debian/changelog	2009-03-05 13:49:48.000000000 +0000
@@ -1,3 +1,14 @@
+ifupdown (0.6.8ubuntu16) jaunty; urgency=low
+
+  * modprobe failures for ipv6 are benign as the module is likely built-in.
+    (LP: #107432)
+  * modprobe -Q is now deprecated and going away, move to using -q.
+  * modprobe for ipv6 should honour the blacklists.
+  * update all generated files to match their source versions (*.defn,
+    main.c).
+
+ -- Andy Whitcroft <apw@canonical.com>  Thu, 05 Mar 2009 13:47:48 +0000
+
 ifupdown (0.6.8ubuntu15) jaunty; urgency=low
 
   * Add Breaks to ensure the right version of udev is used.
diff -Nru ifupdown-0.6.8ubuntu15/debian/testbuild ifupdown-0.6.8ubuntu16/debian/testbuild
--- ifupdown-0.6.8ubuntu15/debian/testbuild	2008-06-21 23:30:44.000000000 +0100
+++ ifupdown-0.6.8ubuntu16/debian/testbuild	2009-03-05 12:30:24.000000000 +0000
@@ -116,7 +116,7 @@
 run-parts --verbose /etc/network/if-up.d
 Configuring interface eth0=eth0 (inet6)
 run-parts --verbose /etc/network/if-pre-up.d
-modprobe -Q ipv6
+modprobe -q -b ipv6 || true
 ifconfig eth0    up
 ifconfig eth0 add 3ffe:ffff:100:f101::1/64
 
diff -Nru ifupdown-0.6.8ubuntu15/ifupdown.nw ifupdown-0.6.8ubuntu16/ifupdown.nw
--- ifupdown-0.6.8ubuntu15/ifupdown.nw	2008-10-12 23:09:23.000000000 +0100
+++ ifupdown-0.6.8ubuntu16/ifupdown.nw	2009-03-05 12:31:00.000000000 +0000
@@ -4160,7 +4160,7 @@
                                  /address/ is dependent on this choice.
     mtu size               -- MTU size
   up
-    modprobe -Q ipv6
+    modprobe -q -b ipv6 || true
     ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up
     ifconfig %iface% add %address%/%netmask%
     [[ route -A inet6 add ::/0 gw %gateway% %iface% ]] 
@@ -4175,7 +4175,7 @@
     means of *up* and *down* commands or /etc/network/if-*.d scripts.
 
   up
-    modprobe -Q ipv6
+    modprobe -q -b ipv6 || true
   down
 
 method v4tunnel
@@ -4194,7 +4194,7 @@
     ttl time              -- TTL setting
 
   up
-    modprobe -Q ipv6
+    modprobe -q -b ipv6 || true
     ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] \
        [[ttl %ttl%]]
     ip link set %iface% up
diff -Nru ifupdown-0.6.8ubuntu15/inet6.defn ifupdown-0.6.8ubuntu16/inet6.defn
--- ifupdown-0.6.8ubuntu15/inet6.defn	2008-06-21 23:30:44.000000000 +0100
+++ ifupdown-0.6.8ubuntu16/inet6.defn	2009-03-05 13:39:50.000000000 +0000
@@ -24,7 +24,7 @@
                                  /address/ is dependent on this choice.
     mtu size               -- MTU size
   up
-    modprobe -Q ipv6
+    modprobe -q -b ipv6 || true
     ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up
     ifconfig %iface% add %address%/%netmask%
     [[ route -A inet6 add ::/0 gw %gateway% %iface% ]] 
@@ -39,7 +39,7 @@
     means of *up* and *down* commands or /etc/network/if-*.d scripts.
 
   up
-    modprobe -Q ipv6
+    modprobe -q -b ipv6 || true
   down
 
 method v4tunnel
@@ -58,7 +58,7 @@
     ttl time              -- TTL setting
 
   up
-    modprobe -Q ipv6
+    modprobe -q -b ipv6 || true
     ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] \
        [[ttl %ttl%]]
     ip link set %iface% up
diff -Nru ifupdown-0.6.8ubuntu15/main.c ifupdown-0.6.8ubuntu16/main.c
--- ifupdown-0.6.8ubuntu15/main.c	2008-10-11 13:34:51.000000000 +0100
+++ ifupdown-0.6.8ubuntu16/main.c	2009-03-05 13:39:50.000000000 +0000
@@ -79,7 +79,7 @@
 
 		ini_dict = iniparser_load (nm_system_settings);
 		if (ini_dict) {
-			int managed = iniparser_getboolean (ini_dict, "ifupdown:managed", -1);
+			int managed = iniparser_getboolean (ini_dict, "ifupdown:managed", 0);
 			auto_up_disabled = managed ? 1 : 0;
 			iniparser_freedict (ini_dict);
 			ini_dict = 0;