From ce81cb1f3de26d8888478966b2e223cc24ea6dc7 Mon Sep 17 00:00:00 2001
From: m2Giles <69128853+m2Giles@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:55:39 -0500
Subject: [PATCH] chore: make distrobox quadlets match dryrun Make the
 distrobox create -d output match our quadlet.

---
 quadlets/bluefin-cli/bluefin-cli.container                | 7 ++-----
 quadlets/bluefin-cli/bluefin-dx-cli.container             | 7 ++-----
 .../fedora-toolbox/fedora-distrobox-quadlet.container     | 8 ++------
 .../ubuntu-toolbox/ubuntu-distrobox-quadlet.container     | 8 ++------
 quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container  | 7 ++-----
 .../wolfi-toolbox/wolfi-dx-distrobox-quadlet.container    | 7 ++-----
 6 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/quadlets/bluefin-cli/bluefin-cli.container b/quadlets/bluefin-cli/bluefin-cli.container
index e448ce3..6918432 100644
--- a/quadlets/bluefin-cli/bluefin-cli.container
+++ b/quadlets/bluefin-cli/bluefin-cli.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=bluefin
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/bluefin-cli:latest
 HostName=bluefin.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host
diff --git a/quadlets/bluefin-cli/bluefin-dx-cli.container b/quadlets/bluefin-cli/bluefin-dx-cli.container
index f05cc0e..0cc45bc 100644
--- a/quadlets/bluefin-cli/bluefin-dx-cli.container
+++ b/quadlets/bluefin-cli/bluefin-dx-cli.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=bluefin
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/bluefin-dx-cli:latest
 HostName=bluefin-dx.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host
diff --git a/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container b/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
index 0ee9c21..7bdee8f 100644
--- a/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
+++ b/quadlets/fedora-toolbox/fedora-distrobox-quadlet.container
@@ -7,19 +7,15 @@ AutoUpdate=registry
 ContainerName=fedora-distrobox-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/fedora-toolbox:latest
 HostName=fedora-toolbox.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--label com.github.containers.toolbox=true
-PodmanArgs=--label manager=distrobox
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
diff --git a/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container b/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container
index e01a0cf..fd5bdb9 100644
--- a/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container
+++ b/quadlets/ubuntu-toolbox/ubuntu-distrobox-quadlet.container
@@ -7,19 +7,15 @@ AutoUpdate=registry
 ContainerName=ubuntu-distrobox-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/ubuntu-toolbox:latest
 HostName=ubuntu-toolbox.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--label com.github.containers.toolbox=true
-PodmanArgs=--label manager=distrobox
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
diff --git a/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container b/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container
index a07635a..6abc3b9 100644
--- a/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container
+++ b/quadlets/wolfi-toolbox/wolfi-distrobox-quadlet.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=wolfi-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/wolfi-toolbox:latest
 HostName=wolfi-quadlet.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host
diff --git a/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container b/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container
index cdc8b5a..08851e3 100644
--- a/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container
+++ b/quadlets/wolfi-toolbox/wolfi-dx-distrobox-quadlet.container
@@ -7,19 +7,16 @@ AutoUpdate=registry
 ContainerName=wolfi-quadlet
 Environment=SHELL=%s
 Environment=HOME=%h
-Environment=XDG_RUNTIME_DIR=%t
-Environment=USER=%u
-Environment=USERNAME=%u
 Environment=container=podman
 Exec=--verbose --name %u --user %U --group %G --home %h --init "0" --nvidia "1" --pre-init-hooks " " --additional-packages " " -- " "
 Image=ghcr.io/ublue-os/wolfi-dx-toolbox:latest
 HostName=wolfi-quadlet.%l
+Label=manager=distrobox
 Network=host
 PodmanArgs=--entrypoint /usr/bin/entrypoint
 PodmanArgs=--ipc host
-PodmanArgs=--no-hosts
+PodmanArgs=--pid host
 PodmanArgs=--privileged
-PodmanArgs=--label manager=distrobox
 PodmanArgs=--security-opt label=disable
 PodmanArgs=--security-opt apparmor=unconfined
 Ulimit=host