iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor: update interfaces to match upstream
[automated-distro-installer]
/
fai
/
config
/
scripts
/
DEBIAN
/
30-interface
diff --git
a/fai/config/scripts/DEBIAN/30-interface
b/fai/config/scripts/DEBIAN/30-interface
index f688fb398e74521344375d4051fc878275bdcc5d..3d4d08fb63f4ba7ea7e4f48b847a8165c80ae35d 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-8,9
+8,9
@@
then
if ifclass VM; then
cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
if ifclass VM; then
cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
- auto lo $NIC1
- iface lo inet loopback
- iface $NIC1 inet dhcp
+
auto lo $NIC1
+
iface lo inet loopback
+
iface $NIC1 inet dhcp
EOF
else
cat > $target/etc/network/interfaces <<-EOF
EOF
else
cat > $target/etc/network/interfaces <<-EOF
@@
-19,25
+19,27
@@
EOF
iface lo inet loopback
iface $NIC1 inet manual
# make a bridge by default so we can have bridged vms.
iface lo inet loopback
iface $NIC1 inet manual
# make a bridge by default so we can have bridged vms.
+ # Some example I read had stp on, but i don't need stp,
+ # and it causes a vm to fail pxe boot, presumably unless
+ # you add some delay.
+ # http://wiki.libvirt.org/page/PXE_boot_%28or_dhcp%29_on_guest_failed
iface br0 inet dhcp
iface br0 inet dhcp
- bridge_ports eth0
- bridge_stp on
- bridge_maxwait 0
- bridge_fd 0
+ bridge_ports $NIC1
+ bridge_stp off
+ bridge_maxwait 0
EOF
fi
elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
then
[ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
EOF
fi
elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
then
[ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
- auto lo $NIC1
- iface lo inet loopback
- iface $NIC1 inet static
- address $IPADDR
- netmask $NETMASK
- broadcast $BROADCAST
+
auto lo $NIC1
+
iface lo inet loopback
+
iface $NIC1 inet static
+
address $IPADDR
+
netmask $NETMASK
+
broadcast $BROADCAST
gateway $GATEWAYS
gateway $GATEWAYS
- hwaddress ether $(cat /sys/class/net/$NIC1/address)
EOF
[ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then
EOF
[ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
if [ ! -L $target/etc/resolv.conf -a -e /etc/resolv.conf ]; then