From dafc1f6c1297cf69826aecae5047702816b66ce7 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 5 Oct 2021 16:08:23 +0200
Subject: [PATCH] fix naming of new latest config files

---
 usr/lib/initcpio/install/archboot_base_latest |  2 +-
 .../install/archboot_installer_latest         |  2 +-
 .../archboot/latest_installer/etc/passwd      | 23 -------------------
 .../etc/profile.d/latest-installer.sh         |  5 ----
 4 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 usr/share/archboot/latest_installer/etc/passwd
 delete mode 100644 usr/share/archboot/latest_installer/etc/profile.d/latest-installer.sh

diff --git a/usr/lib/initcpio/install/archboot_base_latest b/usr/lib/initcpio/install/archboot_base_latest
index e37b22ef7..7ffa833e7 100644
--- a/usr/lib/initcpio/install/archboot_base_latest
+++ b/usr/lib/initcpio/install/archboot_base_latest
@@ -49,7 +49,7 @@ build ()
     for i in $(find /usr/share/archboot/base/etc/* ! -type d ! -name passwd); do
         add_file "$i" "$(echo $i | sed -e 's#/usr/share/archboot/base##g')"
     done
-    add_file "/usr/share/archboot/latest_installer/etc/passwd" "/etc/passwd"
+    add_file "/usr/share/archboot/installer_latest/etc/passwd" "/etc/passwd"
     add_file "/etc/profile"
     add_file "/etc/group"
     add_file "/etc/gshadow"
diff --git a/usr/lib/initcpio/install/archboot_installer_latest b/usr/lib/initcpio/install/archboot_installer_latest
index baba610c7..a1de292eb 100644
--- a/usr/lib/initcpio/install/archboot_installer_latest
+++ b/usr/lib/initcpio/install/archboot_installer_latest
@@ -5,7 +5,7 @@ build ()
 {
     add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer.sh"
     add_file "/usr/bin/archboot-create-container.sh"
-    add_file "/usr/share/archboot/latest_installer/etc/profile.d/latest-installer.sh" "/etc/profile.d/latest-installer.sh"
+    add_file "/usr/share/archboot/installer_latest/etc/profile.d/latest-installer.sh" "/etc/profile.d/latest-installer.sh"
 }
 
 help ()
diff --git a/usr/share/archboot/latest_installer/etc/passwd b/usr/share/archboot/latest_installer/etc/passwd
deleted file mode 100644
index 598aecd6d..000000000
--- a/usr/share/archboot/latest_installer/etc/passwd
+++ /dev/null
@@ -1,23 +0,0 @@
-root:x:0:0:root:/root:/bin/sh
-bin:x:1:1::/:/usr/bin/nologin
-daemon:x:2:2::/:/usr/bin/nologin
-mail:x:8:12::/var/spool/mail:/usr/bin/nologin
-ftp:x:14:11::/srv/ftp:/usr/bin/nologin
-http:x:33:33::/srv/http:/usr/bin/nologin
-nobody:x:65534:65534:Nobody:/:/usr/bin/nologin
-dbus:x:81:81:System Message Bus:/:/usr/bin/nologin
-systemd-journal-remote:x:981:981:systemd Journal Remote:/:/usr/bin/nologin
-systemd-network:x:980:980:systemd Network Management:/:/usr/bin/nologin
-systemd-oom:x:979:979:systemd Userspace OOM Killer:/:/usr/bin/nologin
-systemd-resolve:x:978:978:systemd Resolver:/:/usr/bin/nologin
-systemd-timesync:x:977:977:systemd Time Synchronization:/:/usr/bin/nologin
-systemd-coredump:x:976:976:systemd Core Dumper:/:/usr/bin/nologin
-uuidd:x:68:68::/:/usr/bin/nologin
-avahi:x:975:975:Avahi mDNS/DNS-SD daemon:/:/usr/bin/nologin
-named:x:40:40:BIND DNS Server:/:/usr/bin/nologin
-dhcpcd:x:974:974:dhcpcd privilege separation:/:/usr/bin/nologin
-dnsmasq:x:973:973:dnsmasq daemon:/:/usr/bin/nologin
-git:x:972:972:git daemon user:/:/usr/bin/git-shell
-ntp:x:87:87:Network Time Protocol:/var/lib/ntp:/bin/false
-openvpn:x:971:971:OpenVPN:/:/usr/bin/nologin
-rpc:x:32:32:Rpcbind Daemon:/var/lib/rpcbind:/usr/bin/nologin
diff --git a/usr/share/archboot/latest_installer/etc/profile.d/latest-installer.sh b/usr/share/archboot/latest_installer/etc/profile.d/latest-installer.sh
deleted file mode 100644
index 17d417ca3..000000000
--- a/usr/share/archboot/latest_installer/etc/profile.d/latest-installer.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-cd /
-sed -i -e 's#zsh#sh#g' /etc/passwd
-echo "Waiting 10 seconds for getting an internet connection through dhcpcd..."
-sleep 10
-update-installer.sh -latest-install