forge/qports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

qubes-vm-core: fix setup-ip

Browse source
This commit is contained in:
Antoine Martin 2023-09-10 23:14:33 -04:00
parent 9bf9b57855
commit 04a40cece8
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qubes-vm-core/APKBUILD
View file

@ -75,6 +75,7 @@ source="
qubes-updates-proxy-forwarder.openrc qubes-updates-proxy-forwarder.openrc
qubes-updates-proxy.openrc qubes-updates-proxy.openrc
qvm-sync-clock.sh qvm-sync-clock.sh
setupip-do-not-use-systemctl.patch
" "
builddir="$srcdir"/qubes-core-agent-linux-${_gittag/v} builddir="$srcdir"/qubes-core-agent-linux-${_gittag/v}
@ -172,4 +173,5 @@ e9096560e4ee4cad836b686e18eb6dbac729227683eda2f0c8b3541c909f64de3489dbb66e375201
b1e8af2335955e52cf1817c56296f94f8c472e68d7a17a28f516fe4f5fa8a8053d4f9333efbb007a82a06f9442a4a6cfe5f9c751de07f337e47ee04cb18b9395 qubes-updates-proxy-forwarder.openrc b1e8af2335955e52cf1817c56296f94f8c472e68d7a17a28f516fe4f5fa8a8053d4f9333efbb007a82a06f9442a4a6cfe5f9c751de07f337e47ee04cb18b9395 qubes-updates-proxy-forwarder.openrc
29d316b9f48cad15f6e22aaa67b228a5e4893ded86463dbe25b3cc68301b961473e79c01f003b1665e217ad4af2e618625442250d5607c1c16462e3f5eed069c qubes-updates-proxy.openrc 29d316b9f48cad15f6e22aaa67b228a5e4893ded86463dbe25b3cc68301b961473e79c01f003b1665e217ad4af2e618625442250d5607c1c16462e3f5eed069c qubes-updates-proxy.openrc
cca9f49422fa25cd5f3942dce8edd3ecff080bf5c407a7a790b438bedea054f39a4a3d8c179b44c4c08fc490b597e14d00dad9b0240861e83957e0af7aa6475d qvm-sync-clock.sh cca9f49422fa25cd5f3942dce8edd3ecff080bf5c407a7a790b438bedea054f39a4a3d8c179b44c4c08fc490b597e14d00dad9b0240861e83957e0af7aa6475d qvm-sync-clock.sh
fc115d8cb9a279232bad8362903cb74dafbeac988a9d519ef3b6ff2849ab80fb77d648589974d05e565933444dd04c4b3427cdba69c167310f9a57916c5f0499 setupip-do-not-use-systemctl.patch
" "

20
qubes-vm-core/setupip-do-not-use-systemctl.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git a/./network/setup-ip.orig b/./network/setup-ip
index d82a593..8e44847 100755
--- a/./network/setup-ip.orig
+++ b/./network/setup-ip
@@ -244,15 +244,6 @@ if [ "$ACTION" == "add" ]; then
primary_dns=$(/usr/bin/qubesdb-read /qubes-primary-dns 2>/dev/null) || primary_dns=
secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns 2>/dev/null) || secondary_dns=
- /usr/lib/systemd/systemd-sysctl \
- "--prefix=/net/ipv4/conf/all" \
- "--prefix=/net/ipv4/neigh/all" \
- "--prefix=/net/ipv6/conf/all" \
- "--prefix=/net/ipv6/neigh/all" \
- "--prefix=/net/ipv4/conf/$INTERFACE" \
- "--prefix=/net/ipv4/neigh/$INTERFACE" \
- "--prefix=/net/ipv6/conf/$INTERFACE" \
- "--prefix=/net/ipv6/neigh/$INTERFACE"
if [ -n "$ip4" ]; then
# If NetworkManager is enabled, let it configure the network