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
wrt setup fixes and improvements
[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 832461cbb7d6a7083d4153bedf85151355f2d971..72f04a00781407bce1e5fa7b17b9f18787082d8c 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-14,7
+14,7
@@
newnicnames() {
return
fi
return
fi
- [ -z
$NIC1
] && return
+ [ -z
"$NIC1"
] && return
fields="ID_NET_NAME_FROM_DATABASE ID_NET_NAME_ONBOARD ID_NET_NAME_SLOT ID_NET_NAME_PATH"
for field in $fields; do
fields="ID_NET_NAME_FROM_DATABASE ID_NET_NAME_ONBOARD ID_NET_NAME_SLOT ID_NET_NAME_PATH"
for field in $fields; do
@@
-24,21
+24,23
@@
newnicnames() {
break
fi
done
break
fi
done
- if ifclass VM; then
- NIC1=ens3
- return
- fi
+ # This condition is only needed because the nfsroot I use
+ # is based on Jessie, which has an old udev which can't
+ # figure out the persistent interface name used in stretch.
+
if ifclass VM; then NIC1=ens3; return;
fi
if [[ ! $name ]]; then
echo "$0: error: could not find systemd predictable network name. Using $NIC1."
fi
}
if [[ ! $name ]]; then
echo "$0: error: could not find systemd predictable network name. Using $NIC1."
fi
}
+if [ -z "$NIC1" ]; then
+ echo "ERROR: \$NIC1 is not defined. Cannot configure /etc/network/interfaces properly."
+fi
newnicnames
CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
if ifclass VM; then
newnicnames
CIDR=$(ip -o -f inet addr show $NIC1 | awk '{print $4}')
if ifclass DHCPC && [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ]; then
if ifclass VM; then
-
# note, this condition would apply to the elif below too,
# but I don't specify a static ip in fai, so not bothering
cat > $target/etc/network/interfaces <<-EOF
# note, this condition would apply to the elif below too,
# but I don't specify a static ip in fai, so not bothering
cat > $target/etc/network/interfaces <<-EOF