diff -Nru ifupdown-0.6.8ubuntu12/debian/changelog ifupdown-0.6.8ubuntu12~ppa1/debian/changelog --- ifupdown-0.6.8ubuntu12/debian/changelog 2008-10-12 17:12:08.000000000 -0500 +++ ifupdown-0.6.8ubuntu12~ppa1/debian/changelog 2008-10-31 10:40:07.000000000 -0500 @@ -1,3 +1,10 @@ +ifupdown (0.6.8ubuntu12~ppa1) intrepid; urgency=low + + * make modprobe ipv6 not abort ifup. Original patch by Malte S. Stretz. + (LP #158582) + + -- Matt LaPlante Thu, 30 Oct 2008 19:14:16 -0500 + ifupdown (0.6.8ubuntu12) intrepid; urgency=low * resurrect _darcs directory diff -Nru ifupdown-0.6.8ubuntu12/debian/testbuild ifupdown-0.6.8ubuntu12~ppa1/debian/testbuild --- ifupdown-0.6.8ubuntu12/debian/testbuild 2008-06-21 17:30:44.000000000 -0500 +++ ifupdown-0.6.8ubuntu12~ppa1/debian/testbuild 2008-10-30 19:13:44.000000000 -0500 @@ -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 ipv6 || true ifconfig eth0 up ifconfig eth0 add 3ffe:ffff:100:f101::1/64 diff -Nru ifupdown-0.6.8ubuntu12/ifupdown.nw ifupdown-0.6.8ubuntu12~ppa1/ifupdown.nw --- ifupdown-0.6.8ubuntu12/ifupdown.nw 2008-10-12 17:09:23.000000000 -0500 +++ ifupdown-0.6.8ubuntu12~ppa1/ifupdown.nw 2008-10-30 19:14:11.000000000 -0500 @@ -4160,7 +4160,7 @@ /address/ is dependent on this choice. mtu size -- MTU size up - modprobe -Q ipv6 + modprobe -Q 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 ipv6 || true down method v4tunnel @@ -4194,7 +4194,7 @@ ttl time -- TTL setting up - modprobe -Q ipv6 + modprobe -Q ipv6 || true ip tunnel add %iface% mode sit remote %endpoint% [[local %local%]] \ [[ttl %ttl%]] ip link set %iface% up