iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2147ec
)
use bridge interface by default
author
Ian Kelling
<ian@iankelling.org>
Mon, 18 Jan 2016 01:37:13 +0000
(17:37 -0800)
committer
Ian Kelling
<ian@iankelling.org>
Mon, 6 Feb 2017 06:21:40 +0000
(22:21 -0800)
fai/config/scripts/DEBIAN/30-interface
patch
|
blob
|
history
diff --git
a/fai/config/scripts/DEBIAN/30-interface
b/fai/config/scripts/DEBIAN/30-interface
index 9883731fd90efbaa728267d099d3755e6ebc554e..f688fb398e74521344375d4051fc878275bdcc5d 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-1,26
+1,43
@@
#! /bin/bash
#! /bin/bash
+# modified from upstream fai example
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
then
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
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
EOF
auto lo $NIC1
iface lo inet loopback
iface $NIC1 inet dhcp
EOF
+ else
+ cat > $target/etc/network/interfaces <<-EOF
+ # generated by FAI
+ auto lo br0
+ iface lo inet loopback
+ iface $NIC1 inet manual
+ # make a bridge by default so we can have bridged vms.
+ iface br0 inet dhcp
+ bridge_ports eth0
+ bridge_stp on
+ bridge_maxwait 0
+ bridge_fd 0
+EOF
+ fi
elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
then
elif [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]
then
-
[ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
- # generated by FAI
+ [ -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