Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/112685
Change subject: autoinstall: another trusty early_command fix
......................................................................
autoinstall: another trusty early_command fix
killall.sh for killing DHCP was (rightfully) renamed to kill-all-dhcp to
indicate its purpose in netcfg 1.86. wheezy has 1.108 & trusty has
1.114 and are the first versions to have this change.
Add support for in a backwards-compatible way and while at it, remove a
useless "true" invocation.
Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570
---
M modules/install-server/files/autoinstall/scripts/early_command
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/112685/1
diff --git a/modules/install-server/files/autoinstall/scripts/early_command
b/modules/install-server/files/autoinstall/scripts/early_command
index f7004db..a9cea29 100644
--- a/modules/install-server/files/autoinstall/scripts/early_command
+++ b/modules/install-server/files/autoinstall/scripts/early_command
@@ -4,6 +4,7 @@
set -x
# redo network configuration statically
+
# at least trusty has ip under /sbin
if [ -x /sbin/ip -o -x /bin/ip ]; then
IP=$(ip address show dev eth0 | egrep '^[[:space:]]+inet ' | cut -d ' '
-f 6 | cut -d '/' -f 1)
@@ -13,7 +14,8 @@
echo d-i netcfg/get_ipaddress string $IP > /tmp/static_net.cfg
debconf-set-selections /tmp/static_net.cfg
-killall.sh; netcfg; true
+# kill-all-dhcp is >= wheezy/trusty (netcfg 1.86)
+killall.sh || kill-all-dhcp; netcfg
# Preseed the correct wikimedia repository location
SUITE=$(debconf-get mirror/suite)
--
To view, visit https://gerrit.wikimedia.org/r/112685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I282f8e2d7187e98b8e544335baba9501463b7570
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
