From 12acbadacca34a32626f6fff5aede35bb199a39a Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 11 Sep 2013 12:27:05 +0200 Subject: [PATCH] =?utf8?q?Modification=20:=20suppression=20du=20proxy=5Far?= =?utf8?q?p=20=C3=A0=20Grenode.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- etc/local.sh | 4 +++- etc/network/interfaces.m4 | 8 ++++---- local/boot-configure | 2 +- local/network-configure | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/etc/local.sh b/etc/local.sh index 41a767a..9f334e1 100644 --- a/etc/local.sh +++ b/etc/local.sh @@ -81,12 +81,14 @@ local_e2fs_extended_options=${local_e2fs_stride:+,stride=$local_e2fs_stride}${lo readonly local_arch="amd64" readonly local_bridge="br-gresille" readonly local_ipv4="91.216.110.42" # NOTE: IPv4 publique assignée par Grésille +readonly local_gateway="91.216.110.6" # NOTE: estran.grenode.net readonly local_lsb_name="wheezy" -readonly local_mac="00:16:3E:E5:98:42" # NOTE: addresse MAC assignée par Grésille # NOTE: on part sur wheezy dès le début # dans l'idée de ne pas s'embêter avec # une migration squeeze -> wheezy dans deux mois ; # et parce qu'on juge wheezy « suffisamment stable ». +readonly local_mac="00:16:3E:E5:98:42" # NOTE: addresse MAC assignée par Grésille +readonly local_netmask="255.255.255.192" readonly local_iodine_ns="i.wiklou.org" readonly local_iodine_gateway="10.0.42.1" diff --git a/etc/network/interfaces.m4 b/etc/network/interfaces.m4 index f8d9f55..8a09cd9 100644 --- a/etc/network/interfaces.m4 +++ b/etc/network/interfaces.m4 @@ -4,10 +4,10 @@ iface lo inet loopback auto eth0=grenode iface grenode inet static address LOCAL_IPV4 - gateway LOCAL_IPV4 # NOTE: proxy_arp sur la passerelle permet d'utiliser la même adresse + gateway LOCAL_GATEWAY network LOCAL_IPV4 broadcast LOCAL_IPV4 - netmask 255.255.255.255 + netmask LOCAL_NETMASK mtu 1300 # NOTE: il y a besoin de ça en l'état actuel du réseau de Grenode # car la MTU des tunnels GRE/IPsec entre les routeurs de Grenode l'impose. @@ -25,5 +25,5 @@ iface grenode inet static # # --- soupirail.grenode.net ping statistics --- # 0 packets transmitted, 0 received, +1 errors - post-up ip address add LOCAL_IPV4/32 dev $IFACE - pre-down ip address delete LOCAL_IPV4/32 dev $IFACE + post-up ip address add LOCAL_GATEWAY dev $IFACE + post-down ip address del LOCAL_GATEWAY dev $IFACE diff --git a/local/boot-configure b/local/boot-configure index ce32562..d620787 100755 --- a/local/boot-configure +++ b/local/boot-configure @@ -14,7 +14,7 @@ sudo install -m 644 -o root -g root /dev/stdin \ GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR=\`lsb_release -i -s 2> /dev/null || echo Debian\` GRUB_CMDLINE_LINUX_DEFAULT="quiet" - GRUB_CMDLINE_LINUX="vt.default_utf8=1 rootfstype=ext4 loglevel=5 console=hvc0 ip=$local_ipv4::$local_ipv4:255.255.255.254:$vm:eth0:off resume=/dev/mapper/${vm}_swap_deciphered" + GRUB_CMDLINE_LINUX="vt.default_utf8=1 rootfstype=ext4 loglevel=5 console=hvc0 ip=$local_ipv4::$local_gateway:$local_netmask:$vm:eth0:off resume=/dev/mapper/${vm}_swap_deciphered" GRUB_DISABLE_RECOVERY="true" #GRUB_PRELOAD_MODULES="lvm" EOF diff --git a/local/network-configure b/local/network-configure index 05d6034..8a7e721 100755 --- a/local/network-configure +++ b/local/network-configure @@ -17,12 +17,15 @@ sudo install -m 644 -o root -g root /dev/stdin \ /etc/hosts sudo install -m 644 -o root -g root /dev/stdin \ /etc/resolv.conf <<-EOF + domain ${local_domainname} search ${local_host#*.} nameserver 127.0.0.1 #nameserver ${local_host_nameserver} EOF m4 \ --define=LOCAL_IPV4=$local_ipv4 \ + --define=LOCAL_GATEWAY=$local_gateway \ + --define=LOCAL_NETMASK=$local_netmask \ <"$tool"/etc/network/interfaces.m4 | sudo install -m 640 -o root -g root /dev/stdin \ /etc/network/interfaces -- 2.20.1