From db54b59b90c8db2fc4a637ae09d3f0df14e77acb Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 18 Mar 2016 20:42:49 -0400 Subject: remove the 'find_name' function that was here. I had left this in to commit it, it was my first pass at cloud-init doing the naming itself. That design was then replaced with the idea for cloud-init to instead write systemd.rules files. --- udev/cloud-init-wait | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'udev/cloud-init-wait') diff --git a/udev/cloud-init-wait b/udev/cloud-init-wait index 345333f9..f27309e3 100755 --- a/udev/cloud-init-wait +++ b/udev/cloud-init-wait @@ -5,20 +5,6 @@ LOG="/run/cloud-init/${0##*/}.log" LOG_INIT=0 DEBUG=0 -find_name() { - local match="" name="" none="_UNSET" pound="#" - while read match name; do - [ "${match#${pound}}" = "$match" ] || continue - case "$match" in - ID_NET_NAME=${ID_NET_NAME:-$none}) _RET="$name"; return 0;; - ID_NET_NAME_PATH=${ID_NET_NAME_PATH:-$none}) _RET="$name"; return 0;; - MAC_ADDRESS=${MAC_ADDRESS:-$none}) _RET="$name"; return 0;; - INTERFACE=${INTERFACE:-$none}) _RET="$name"; return 0;; - esac - done - return 0 -} - block_until_ready() { local fname="$1" local naplen="$2" max="$3" n=0 @@ -69,11 +55,7 @@ main() { block_until_ready "$readyfile" .1 600 || { log "failed waiting for ready on $INTERFACE"; return 1; } - #find_name < "$CI_NET_RULES" && name="$_RET" || - # { log "failed to find match for $INTERFACE"; return 0; } - log "net config ready" - #[ -z "$name" ] || echo "CLOUDINIT_NET_NAME=$name" } main "$@" -- cgit v1.2.3