-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
debian: refresh update-networkd-priorities.patch
- Loading branch information
Noah Meyerhans
committed
Mar 7, 2024
1 parent
30361cc
commit 66bb656
Showing
1 changed file
with
19 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,28 @@ | ||
From 7280ff5206eeed978d4b7f563475e5eba16babab Mon Sep 17 00:00:00 2001 | ||
From f182e277f57da02ce96d679c0f0c9cd4d3a9bb0a Mon Sep 17 00:00:00 2001 | ||
From: Noah Meyerhans <[email protected]> | ||
Date: Wed, 6 Mar 2024 11:37:11 -0800 | ||
Date: Wed, 6 Mar 2024 16:05:58 -0800 | ||
Subject: [PATCH] change the priority of the networkd configs | ||
|
||
ensure they're order before netplan | ||
--- | ||
lib/lib.sh | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
bin/setup-policy-routes.sh | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/lib/lib.sh b/lib/lib.sh | ||
index c9f1970..8933d7c 100644 | ||
--- a/lib/lib.sh | ||
+++ b/lib/lib.sh | ||
@@ -151,7 +151,7 @@ create_ipv4_aliases() { | ||
local addresses | ||
subnet_supports_ipv4 "$iface" || return 0 | ||
addresses=$(get_iface_imds $mac local-ipv4s | tail -n +2 | sort) | ||
- local drop_in_dir="${unitdir}/70-${iface}.network.d" | ||
+ local drop_in_dir="${unitdir}/07-${iface}.network.d" | ||
mkdir -p "$drop_in_dir" | ||
local file="$drop_in_dir/ec2net_alias.conf" | ||
local work="${file}.new" | ||
@@ -210,7 +210,7 @@ create_rules() { | ||
local family=$4 | ||
local addrs prefixes | ||
local local_addr_key subnet_pd_key | ||
- local drop_in_dir="${unitdir}/70-${iface}.network.d" | ||
+ local drop_in_dir="${unitdir}/07-${iface}.network.d" | ||
mkdir -p "$drop_in_dir" | ||
|
||
local -i ruleid=$((device_number+rule_base+100*network_card)) | ||
@@ -373,7 +373,7 @@ create_interface_config() { | ||
|
||
local -i retval=0 | ||
|
||
- local cfgfile="${unitdir}/70-${iface}.network" | ||
+ local cfgfile="${unitdir}/07-${iface}.network" | ||
if [ -e "$cfgfile" ]; then | ||
debug "Using existing cfgfile ${cfgfile}" | ||
echo $retval | ||
diff --git a/bin/setup-policy-routes.sh b/bin/setup-policy-routes.sh | ||
index a79fd09..9cb623b 100755 | ||
--- a/bin/setup-policy-routes.sh | ||
+++ b/bin/setup-policy-routes.sh | ||
@@ -62,8 +62,8 @@ remove) | ||
register_networkd_reloader | ||
info "Removing configuration for $iface." | ||
rm -rf "/run/network/$iface" \ | ||
- "${unitdir}/70-${iface}.network" \ | ||
- "${unitdir}/70-${iface}.network.d" || true | ||
+ "${unitdir}/07-${iface}.network" \ | ||
+ "${unitdir}/07-${iface}.network.d" || true | ||
touch "$reload_flag" | ||
;; | ||
stop|cleanup) | ||
-- | ||
2.25.1 | ||
|