From 588b1f5d49090e4c42b478d1186f4e44bee7f77e Mon Sep 17 00:00:00 2001 From: Edu4rdSHL Date: Thu, 13 May 2021 16:53:44 -0500 Subject: [PATCH] Update Signed-off-by: Edu4rdSHL --- etc/systemd/nspawn/20-machines-profile.sh | 2 +- etc/systemd/nspawn/BlackArch.nspawn | 8 ++++---- etc/systemd/nspawn/Debian.nspawn | 1 - etc/systemd/nspawn/Fedora34.nspawn | 12 ++++++++++++ etc/systemd/nspawn/KaliLinux.nspawn | 5 +++-- 5 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 etc/systemd/nspawn/Fedora34.nspawn diff --git a/etc/systemd/nspawn/20-machines-profile.sh b/etc/systemd/nspawn/20-machines-profile.sh index 8f3a1e4..c8ef68f 100755 --- a/etc/systemd/nspawn/20-machines-profile.sh +++ b/etc/systemd/nspawn/20-machines-profile.sh @@ -1,5 +1,5 @@ export DISPLAY=":0.0" export LC_ALL="en_US.UTF-8" -export PULSE_SERVER="/tmp/pulse_server" +export PULSE_SERVER="unix:/tmp/pa_containers.socket" # Fix Qt4 GUIs ("invalid Pixmap or Window parameter") export QT_X11_NO_MITSHM=1 diff --git a/etc/systemd/nspawn/BlackArch.nspawn b/etc/systemd/nspawn/BlackArch.nspawn index c3d2f6a..158093c 100644 --- a/etc/systemd/nspawn/BlackArch.nspawn +++ b/etc/systemd/nspawn/BlackArch.nspawn @@ -1,12 +1,12 @@ [Exec] Boot=true -Capability=CAP_NET_ADMIN -PrivateUsers=false +Capability=CAP_NET_ADMIN CAP_NET_RAW +PrivateUsers=pick [Files] Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh -Bind=/proc/sys/net/ipv4/ip_forward BindReadOnly=/tmp/.X11-unix +BindReadOnly=/etc/systemd/nspawn/10-macvlan.network:/etc/systemd/network/10-macvlan.network [Network] -VirtualEthernet=false +MACVLAN=bond1 diff --git a/etc/systemd/nspawn/Debian.nspawn b/etc/systemd/nspawn/Debian.nspawn index 0ba6a96..da561ba 100644 --- a/etc/systemd/nspawn/Debian.nspawn +++ b/etc/systemd/nspawn/Debian.nspawn @@ -6,7 +6,6 @@ PrivateUsers=pick [Files] Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh BindReadOnly=/tmp/.X11-unix -BindReadOnly=/etc/systemd/nspawn/10-macvlan.network:/etc/systemd/network/10-macvlan.network [Network] MACVLAN=bond1 diff --git a/etc/systemd/nspawn/Fedora34.nspawn b/etc/systemd/nspawn/Fedora34.nspawn new file mode 100644 index 0000000..0ba6a96 --- /dev/null +++ b/etc/systemd/nspawn/Fedora34.nspawn @@ -0,0 +1,12 @@ +[Exec] +Boot=true +Capability=CAP_NET_ADMIN +PrivateUsers=pick + +[Files] +Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh +BindReadOnly=/tmp/.X11-unix +BindReadOnly=/etc/systemd/nspawn/10-macvlan.network:/etc/systemd/network/10-macvlan.network + +[Network] +MACVLAN=bond1 diff --git a/etc/systemd/nspawn/KaliLinux.nspawn b/etc/systemd/nspawn/KaliLinux.nspawn index 5a0f00c..0ba6a96 100644 --- a/etc/systemd/nspawn/KaliLinux.nspawn +++ b/etc/systemd/nspawn/KaliLinux.nspawn @@ -1,11 +1,12 @@ [Exec] Boot=true Capability=CAP_NET_ADMIN -PrivateUsers=false +PrivateUsers=pick [Files] Bind=/etc/systemd/nspawn/20-machines-profile.sh:/etc/profile.d/20-machines-profile.sh BindReadOnly=/tmp/.X11-unix +BindReadOnly=/etc/systemd/nspawn/10-macvlan.network:/etc/systemd/network/10-macvlan.network [Network] -VirtualEthernet=false +MACVLAN=bond1