From b96bac8cd27be8d85ecec0a53707cefb080b1538 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Wed, 28 Jul 2021 18:34:48 +0000
Subject: [PATCH] Shift supermin environment variables earlier all images

---
 Dockerfile       | 6 +-----
 Dockerfile.auto  | 8 +++++---
 Dockerfile.naked | 8 +++++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 87bacc2..1e0989f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -235,13 +235,9 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
 
-USER arch
-
-ENV USER arch
-
 #### SPECIAL RUNTIME ARGUMENTS BELOW
 
 # env -e ADDITIONAL_PORTS with a comma
diff --git a/Dockerfile.auto b/Dockerfile.auto
index 317bf9a..0a58725 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -88,6 +88,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+USER arch
+
+ENV USER arch
+
 # 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 
@@ -99,10 +103,8 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
-    
-USER arch
 
 WORKDIR /home/arch/OSX-KVM
 
diff --git a/Dockerfile.naked b/Dockerfile.naked
index 8f91a4f..481bc43 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -76,6 +76,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+USER arch
+
+ENV USER arch
+
 # 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 
@@ -87,11 +91,9 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
 
-USER arch
-
 WORKDIR /home/arch/OSX-KVM
 
 RUN mkdir -p ~/.ssh \