diff --git a/bin/setup-policy-routes.sh b/bin/setup-policy-routes.sh index 853a656..7c51089 100755 --- a/bin/setup-policy-routes.sh +++ b/bin/setup-policy-routes.sh @@ -44,7 +44,7 @@ case "$2" in refresh) register_networkd_reloader [ -e "/sys/class/net/${iface}" ] || exit 0 - info "Starting configuration refresh for $iface" + debug "Starting configuration refresh for $iface" do_setup ;; start) @@ -57,7 +57,7 @@ start) sleep 0.1 ((counter++)) done - info "Starting configuration for $iface" + debug "Starting configuration for $iface" debug /lib/systemd/systemd-networkd-wait-online -i "$iface" /lib/systemd/systemd-networkd-wait-online -i "$iface" export EC2_IF_INITIAL_SETUP=1 @@ -65,7 +65,7 @@ start) ;; remove) register_networkd_reloader - info "Removing configuration for $iface." + debug "Removing configuration for $iface." rm -rf "/run/network/$iface" \ "${unitdir}/70-${iface}.network" \ "${unitdir}/70-${iface}.network.d" || true diff --git a/debian/changelog b/debian/changelog index 4f6f4a2..efd5aea 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +amazon-ec2-net-utils (2.7.2) unstable; urgency=medium + + * New upstream release 2.7.2 + + -- Joe Kurokawa Tue, 24 Mar 2026 09:15:00 +0000 + amazon-ec2-net-utils (2.7.1) unstable; urgency=medium * New upstream release 2.7.1 diff --git a/debian/patches/update-networkd-priorities.patch b/debian/patches/update-networkd-priorities.patch index c6fbac1..a2599fc 100644 --- a/debian/patches/update-networkd-priorities.patch +++ b/debian/patches/update-networkd-priorities.patch @@ -10,12 +10,12 @@ ensure they're order before netplan 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/setup-policy-routes.sh b/bin/setup-policy-routes.sh -index e4c67d8..a8b9fc8 100755 +index 7c51089..335ce18 100755 --- a/bin/setup-policy-routes.sh +++ b/bin/setup-policy-routes.sh -@@ -63,8 +63,8 @@ remove) +@@ -67,8 +67,8 @@ remove) register_networkd_reloader - info "Removing configuration for $iface." + debug "Removing configuration for $iface." rm -rf "/run/network/$iface" \ - "${unitdir}/70-${iface}.network" \ - "${unitdir}/70-${iface}.network.d" || true @@ -25,7 +25,7 @@ index e4c67d8..a8b9fc8 100755 ;; stop|cleanup) diff --git a/lib/lib.sh b/lib/lib.sh -index bb1241a..1d103c8 100644 +index fb1f2a8..8cbb1e8 100644 --- a/lib/lib.sh +++ b/lib/lib.sh @@ -236,7 +236,7 @@ create_ipv4_aliases() { @@ -54,7 +54,7 @@ index bb1241a..1d103c8 100644 + local cfgfile="${unitdir}/07-${iface}.network" if [ -e "$cfgfile" ] && [ ! -v EC2_IF_INITIAL_SETUP ]; then - debug "Using existing cfgfile ${cfgfile}" + echo $retval -- 2.47.3 diff --git a/lib/lib.sh b/lib/lib.sh index 15f2e69..fb1f2a8 100644 --- a/lib/lib.sh +++ b/lib/lib.sh @@ -140,7 +140,7 @@ get_meta() { local key=$1 local max_tries=${2:-10} declare -i attempts=0 - debug "[get_meta] Querying IMDS for ${key}" + [ -v EC2_IF_INITIAL_SETUP ] && debug "[get_meta] Querying IMDS for ${key}" if [[ -z $imds_endpoint || -z $imds_token || -z $imds_interface ]]; then error "[get_meta] Unable to obtain IMDS token, endpoint, or interface" @@ -326,7 +326,7 @@ create_rules() { # response. addrs=$(get_iface_imds ${ether} ${local_addr_key} || true) if [[ -z "$addrs" ]]; then - info "No addresses found for ${ether}" + debug "No addresses found for ${ether}" return 0 fi @@ -466,7 +466,6 @@ create_interface_config() { local cfgfile="${unitdir}/70-${iface}.network" if [ -e "$cfgfile" ] && [ ! -v EC2_IF_INITIAL_SETUP ]; then - debug "Using existing cfgfile ${cfgfile}" echo $retval return fi @@ -616,9 +615,9 @@ maybe_reload_networkd() { if [ -e "$reload_flag" ]; then rm -f "$reload_flag" 2> /dev/null networkctl reload - info "Reloaded networkd" + debug "Reloaded networkd" else - debug "No networkd reload needed" + [ -v EC2_IF_INITIAL_SETUP ] && debug "No networkd reload needed" fi else debug "Deferring networkd reload to another process" @@ -639,7 +638,7 @@ register_networkd_reloader() { while [ $cnt -lt $max ]; do cnt+=1 mkdir -p "$lockdir" - trap 'debug "Called trap" ; maybe_reload_networkd' EXIT + trap '[ -v EC2_IF_INITIAL_SETUP ] && debug "Called trap" ; maybe_reload_networkd' EXIT # If the redirect fails, most likely because the target file # already exists and -o noclobber is in effect, $? will be set # nonzero. If it succeeds, it is set to 0 @@ -649,7 +648,7 @@ register_networkd_reloader() { [ $registered -eq 0 ] && break sleep 0.1 if (( $cnt % 100 == 0 )); then - info "Unable to lock ${iface} after ${cnt} tries." + debug "Unable to lock ${iface} after ${cnt} tries." fi done # re-enable -o errexit if it had originally been set