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
update to 5.1.2 example
[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 c3fbeaabe9fcecd5d80c0c148399fb57f7b2d557..9883731fd90efbaa728267d099d3755e6ebc554e 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-2,7
+2,7
@@
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
-if ifclass DHCPC && [ $FAI_ACTION = "install" ]
+if ifclass DHCPC && [ $FAI_ACTION = "install"
-o $FAI_ACTION = "dirinstall"
]
then
cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
then
cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
@@
-10,7
+10,7
@@
then
iface lo inet loopback
iface $NIC1 inet dhcp
EOF
iface lo inet loopback
iface $NIC1 inet dhcp
EOF
-elif [ $FAI_ACTION = "install" ]
+elif [ $FAI_ACTION = "install"
-o $FAI_ACTION = "dirinstall"
]
then
[ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
then
[ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
# generated by FAI