From ca91b06eeca7b5fb6bbe5f43cbbcc35d88c27f8b Mon Sep 17 00:00:00 2001 From: Mark Hurenkamp Date: Mon, 30 Dec 2024 21:12:46 +0100 Subject: [PATCH] Do not create bridge as part of package, this is best handled either through seperate command, or kept outside of scope completely. --- arch/proto.install | 11 ----------- debian/postinst | 11 ----------- debian/postrm | 1 - 3 files changed, 23 deletions(-) diff --git a/arch/proto.install b/arch/proto.install index 40091b3..321fc03 100644 --- a/arch/proto.install +++ b/arch/proto.install @@ -38,16 +38,6 @@ post_install() { ln -s /usr/share/edk2/x64/OVMF_CODE.4m.fd /usr/share/ezkvm/OVMF_CODE_4M.fd ln -s /usr/share/edk2/x64/OVMF_CODE.secboot.4m.fd /usr/share/ezkvm/OVMF_CODE_4M.secboot.fd - # Create the vmbr0 bridge using NetworkManager - # Both EndeavorOS gemini as well as ubuntu 24.04 use - # this by default, and so this should work for these - # distro's. Other distro's may require manual intervention - nmcli connection add type bridge ifname vmbr0 stp no - nmcli connection up bridge-vmbr0 - nmcli connection modify bridge-vmbr0 ipv4.address 192.168.92.1 - nmcli connection modify bridge-vmbr0 ipv4.method manual - nmcli connection up bridge-vmbr0 - # Since ezkvm is aimed at using proxmox vm's on other # distro's, the following rules will give read/write # access for the proxmxox vm drives to members of the @@ -75,7 +65,6 @@ post_remove() { rm -f /etc/qemu/bridge.conf rm -f /etc/udev/rules.d/92_ezkvm.rules rm -f /etc/security/limits.d/92_ezkvm.conf - nmcli connection delete bridge-vmbr0 chmod -s /usr/lib/qemu/qemu-bridge-helper } diff --git a/debian/postinst b/debian/postinst index fc94b8b..2341c05 100755 --- a/debian/postinst +++ b/debian/postinst @@ -35,14 +35,3 @@ chmod +s /usr/lib/qemu/qemu-bridge-helper ln -s /usr/share/OVMF/OVMF_CODE.fd /usr/share/ezkvm/OVMF_CODE.fd ln -s /usr/share/OVMF/OVMF_CODE_4M.fd /usr/share/ezkvm/OVMF_CODE_4M.fd ln -s /usr/share/OVMF/OVMF_CODE_4M.secboot.fd /usr/share/ezkvm/OVMF_CODE_4M.secboot.fd - -# Create the vmbr0 bridge using NetworkManager -# Both EndeavorOS gemini as well as ubuntu 24.04 use -# this by default, and so this should work for these -# distro's. Other distro's may require manual intervention -nmcli connection add type bridge ifname vmbr0 stp no -nmcli connection up bridge-vmbr0 -nmcli connection modify bridge-vmbr0 ipv4.address 192.168.92.1 -nmcli connection modify bridge-vmbr0 ipv4.method manual -nmcli connection up bridge-vmbr0 - diff --git a/debian/postrm b/debian/postrm index 37a952f..5f076ba 100755 --- a/debian/postrm +++ b/debian/postrm @@ -10,7 +10,6 @@ case $# in rm -f /etc/security/limits.d/92-ezkvm.conf rm -rf /var/ezkvm rm -rf /usr/share/ezkvm - nmcli connection delete bridge-vmbr0 chmod -s /usr/lib/qemu/qemu-bridge-helper ;;