Hello!

The release team has apparently decided this old bug is now a blocker
for Lenny....

Noticed Sven had already sent a patch, but I think there are a few
problems with it ...
1. Errors from modprobing needs to be ignored (people might have ipv6
built into their kernels and some even seem to "blacklist" it by
removing ipv6.ko)
2. I think it's pretty pointless (or even wrong) to modprobe ipv6 in
non-inet6 stansas.
3. the testcases (debian/testbuild) need to be updated for the package
to build.
4. the manual target is said to do nothing.... I think we should leave
it like that.


... so I've attached my own version for consideration. Please comment
and test it!


-- 
Regards,
Andreas Henriksson
diff -Nru ifupdown-0.6.8+nmu1/addrfam.c ifupdown-0.6.8+nmu2/addrfam.c
--- ifupdown-0.6.8+nmu1/addrfam.c	2006-09-28 19:10:27.000000000 +0200
+++ ifupdown-0.6.8+nmu2/addrfam.c	2009-02-06 21:36:32.000000000 +0100
@@ -6,7 +6,7 @@
 extern address_family addr_inet;
 #line 4050 "ifupdown.nw"
 extern address_family addr_inet6;
-#line 4131 "ifupdown.nw"
+#line 4134 "ifupdown.nw"
 extern address_family addr_ipx;
 
 #line 455 "ifupdown.nw"
@@ -16,7 +16,7 @@
 &addr_inet, 
 #line 4054 "ifupdown.nw"
 &addr_inet6,
-#line 4135 "ifupdown.nw"
+#line 4138 "ifupdown.nw"
 &addr_ipx,
 #line 457 "ifupdown.nw"
 	NULL
diff -Nru ifupdown-0.6.8+nmu1/debian/changelog ifupdown-0.6.8+nmu2/debian/changelog
--- ifupdown-0.6.8+nmu1/debian/changelog	2008-04-12 20:37:50.000000000 +0200
+++ ifupdown-0.6.8+nmu2/debian/changelog	2009-02-06 21:36:11.000000000 +0100
@@ -1,3 +1,11 @@
+ifupdown (0.6.8+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Try to load the ipv6 module when doing up on inet6 stansas except manual,
+    ignoring any errors or warnings. Closes: #413428, 512553
+
+ -- Andreas Henriksson <andr...@fatal.se>  Fri, 06 Feb 2009 20:52:24 +0100
+
 ifupdown (0.6.8+nmu1) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
diff -Nru ifupdown-0.6.8+nmu1/debian/testbuild ifupdown-0.6.8+nmu2/debian/testbuild
--- ifupdown-0.6.8+nmu1/debian/testbuild	2006-09-15 20:03:19.000000000 +0200
+++ ifupdown-0.6.8+nmu2/debian/testbuild	2009-02-06 21:20:41.000000000 +0100
@@ -116,6 +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 net-pf-10 > /dev/null 2>&1 || true # ignore failure.
 ifconfig eth0    up
 ifconfig eth0 add 3ffe:ffff:100:f101::1/64
 
diff -Nru ifupdown-0.6.8+nmu1/ifupdown.nw ifupdown-0.6.8+nmu2/ifupdown.nw
--- ifupdown-0.6.8+nmu1/ifupdown.nw	2006-09-28 19:12:18.000000000 +0200
+++ ifupdown-0.6.8+nmu2/ifupdown.nw	2009-02-06 21:35:01.000000000 +0100
@@ -4062,6 +4062,7 @@
   description
     This method may be used to define the IPv6 loopback interface.
   up
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ifconfig %iface% add ::1
   down
     ifconfig %iface% del ::1
@@ -4081,6 +4082,7 @@
                                  /address/ is dependent on this choice.
     mtu size               -- MTU size
   up
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up
     ifconfig %iface% add %address%/%netmask%
     [[ route -A inet6 add ::/0 gw %gateway% %iface% ]] 
@@ -4114,6 +4116,7 @@
     ttl time              -- TTL setting
 
   up
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] \
        [[ttl %ttl%]]
     ip link set %iface% up
diff -Nru ifupdown-0.6.8+nmu1/inet6.defn ifupdown-0.6.8+nmu2/inet6.defn
--- ifupdown-0.6.8+nmu1/inet6.defn	2006-09-28 19:10:29.000000000 +0200
+++ ifupdown-0.6.8+nmu2/inet6.defn	2009-02-06 21:36:34.000000000 +0100
@@ -5,6 +5,7 @@
   description
     This method may be used to define the IPv6 loopback interface.
   up
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ifconfig %iface% add ::1
   down
     ifconfig %iface% del ::1
@@ -24,6 +25,7 @@
                                  /address/ is dependent on this choice.
     mtu size               -- MTU size
   up
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ifconfig %iface% [[media %media%]] [[hw %hwaddress%]] [[mtu %mtu%]] up
     ifconfig %iface% add %address%/%netmask%
     [[ route -A inet6 add ::/0 gw %gateway% %iface% ]] 
@@ -57,6 +59,7 @@
     ttl time              -- TTL setting
 
   up
+    modprobe -q net-pf-10 > /dev/null 2>&1 || true # ignore failure.
     ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] \
        [[ttl %ttl%]]
     ip link set %iface% up

Reply via email to