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 fixes and documentation
[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..92292074a8b521d475c0c67d49771047cdd23711 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-24,10
+24,10
@@
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
@@
-38,7
+38,6
@@
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
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