Package: uruk Tags: patch, upstream Hoi,
Thanks for your bugreport. I am submitting it to the Debian BTS, so it won't get lost. Please reply to <bugnr>@bugs.debian.org if you have any more remarks on this issue. O! On which uruk-version are you working? Groet! Joost Op Fri 5 Apr 2013 om 05:14:13 +0200 schreef Casper Gielen: > Hoi Joost, > hierbij een patch voor uruk. > Precies één keer getest (op zomo). > > ip-autodetectie werkt niet als je een interface hebt in een non-routable > netwerk. Het netmask moet eigenlijk worden aangepast. > 192.168.123.0/24 -> 192.168.0.0/16 > Onderstaande code zorgt daar voor. Na het weekend hoop ik het op een > tweede systeem te testen. > > > --- autodetect-ips 2013-04-05 17:10:44.000000000 +0200 > +++ autodetect-ips.old 2013-04-05 16:49:16.000000000 +0200 > @@ -30,25 +30,6 @@ > ############################################### > > # For each interface <if> in interfaces, ip_<if> should be defined. > -# if an autodetected address is in a non-routable range, > -# then net_<iface>_default should expand to contain the entire range. > -expandnet4() > -{ > - case "$1" in > - 192.168.*) echo "192.168.0.0/24" ;; > - 172.16.*) echo "172.16.0.0/12" ;; > - *) echo "$1" ;; > - esac > -} > - > -expandnet6() > -{ > - case "$1" in > - fc00:*) echo "fc00::/7" ;; > - fec0:*) echo "fec0::/10" ;; > - *) echo "$1" ;; > - esac > -} > > # First try Red Hat's init scripts > for f in /etc/sysconfig/network-scripts/ifcfg-* > @@ -60,12 +41,10 @@ > esac > eval "$( > . $f > - net=$(expandnet4 $IPADDR/$NETMASK) > - net6=$(expandnet6 $IPADDR/$NETMASK) > echo ip_${i}_default=$IPADDR > - echo net_${i}_default=$net > + echo net_${i}_default=$IPADDR/$NETMASK > echo ip6_${i}_default=${IPV6ADDR%/*} > - echo net6_${i}_default=$net6 > + echo net6_${i}_default=$IPV6ADDR > )" > done > > @@ -92,13 +71,11 @@ > esac > case $iface,$address,$netmask in ?*,?*,?*) > case $type in inet) > - net=$(expandnet4 $address/$netmask) > echo ip_${iface}_default=$address > - echo net_${iface}_default=$net > + echo net_${iface}_default=$address/$netmask > ;; inet6) > - net6=$(expandnet6 $address/$netmask) > echo ip6_${iface}_default=$address > - echo net6_${iface}_default=$net6 > + echo net6_${iface}_default=$address/$netmask > esac > iface= > type= > -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org