From c81dafff6ec826a5fbf1a368b951f2404fd5ff81 Mon Sep 17 00:00:00 2001
From: Evangelos Lioudakis <elioudakis123@gmail.com>
Date: Mon, 4 Sep 2023 19:02:49 +0300
Subject: [PATCH] update calamares

---
 iso/archiso/airootfs/usr/local/bin/fix-hosts         | 12 ++++++++++++
 .../etc/calamares/modules/shellprocess-final.conf    |  4 +++-
 iso/archiso/profiledef.sh                            |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 iso/archiso/airootfs/usr/local/bin/fix-hosts

diff --git a/iso/archiso/airootfs/usr/local/bin/fix-hosts b/iso/archiso/airootfs/usr/local/bin/fix-hosts
new file mode 100644
index 00000000..100f560b
--- /dev/null
+++ b/iso/archiso/airootfs/usr/local/bin/fix-hosts
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+hostn=$(cat /etc/hostname)
+echo -ne "
+# Standard host addresses
+127.0.0.1  localhost
+::1        localhost ip6-localhost ip6-loopback
+ff02::1    ip6-allnodes
+ff02::2    ip6-allrouters
+# This host address
+127.0.1.1 ${hostn}
+" >/etc/hosts
diff --git a/iso/archiso/custom_repos/elarch_repo/packages/elarch-calamares-config/etc/calamares/modules/shellprocess-final.conf b/iso/archiso/custom_repos/elarch_repo/packages/elarch-calamares-config/etc/calamares/modules/shellprocess-final.conf
index 50aa4cbd..5208e7c1 100644
--- a/iso/archiso/custom_repos/elarch_repo/packages/elarch-calamares-config/etc/calamares/modules/shellprocess-final.conf
+++ b/iso/archiso/custom_repos/elarch_repo/packages/elarch-calamares-config/etc/calamares/modules/shellprocess-final.conf
@@ -74,15 +74,17 @@ timeout: 999
 # ignored; the slowloris command has a different timeout from the
 # other commands in the list):
 script:
+- command: "/usr/bin/local/fix-hosts"
 - "-rm ${ROOT}/etc/sudoers.d/g_wheel"
 - "-rm -r ${ROOT}/etc/systemd/system/getty@tty1.service.d"
 - "-rm -r ${ROOT}/etc/systemd/system/multi-user.target.wants/pacman-init.service"
 - "-rm -r ${ROOT}/etc/systemd/system/pacman-init.service"
 - "-rm ${ROOT}/etc/systemd/system/etc-pacman.d-gnupg.mount"
 - "-rm ${ROOT}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules"
-# Remove calamares and installer
+# Remove calamares and installer and helpers
 - "-rm ${ROOT}/var/log/Calamares*"
 - "-rm /usr/local/bin/installer"
+- "-rm /usr/bin/local/fix-hosts"
 # remove the /root/.bashrc lines from ### AUTOMATED INSTALLATION START ### to ### AUTOMATED INSTALLATION END ###
 - command: "sed -i '/### AUTOMATED INSTALLATION START ###/,/### AUTOMATED INSTALLATION END ###/d' ${ROOT}/root/.bashrc"
 # Re-Apply dotfiles to new user
diff --git a/iso/archiso/profiledef.sh b/iso/archiso/profiledef.sh
index b48adf3b..ce344ce2 100755
--- a/iso/archiso/profiledef.sh
+++ b/iso/archiso/profiledef.sh
@@ -15,6 +15,7 @@ airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
     ["/usr/local/bin/installer"]="0:0:755"
+    ["/usr/local/bin/fix-hosts"]="0:0:755"
     ["/etc/shadow"]="0:0:400"
     ["/root"]="0:0:750"
     ["/usr/local/bin/livecd-sound"]="0:0:755"