From b1bfa243bc4b7f9b3a12ff984695b24b19eb2e5b Mon Sep 17 00:00:00 2001
From: Michal S <michal@tar.black>
Date: Fri, 19 Aug 2022 16:36:26 +0100
Subject: [PATCH] fixed mirrorlist issue adn cleaned up bootstrap

---
 chrooted-bootstrap.sh                              | 14 ++++++++------
 chrooted-iso.sh                                    | 11 ++++++++---
 .../airootfs/etc/systemd/system/mirrorlist.service | 11 -----------
 3 files changed, 16 insertions(+), 20 deletions(-)
 delete mode 100644 crystal/airootfs/etc/systemd/system/mirrorlist.service

diff --git a/chrooted-bootstrap.sh b/chrooted-bootstrap.sh
index b61fc6c..4647ca0 100755
--- a/chrooted-bootstrap.sh
+++ b/chrooted-bootstrap.sh
@@ -1,14 +1,16 @@
 #!/usr/bin/env bash
 echo "Chrooted in the new system, running as $(whoami)"
 
-# Services
-systemctl enable NetworkManager
-systemctl enable mirrorlist
-systemctl enable gdm
+# Mirrorlist
+reflector > /etc/pacman.d/mirrorlist
 
-# Hostname and Locale
+# Hostname
 echo "crystal-live" > /etc/hostname
+
+# Locale
 echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-locale-gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
+locale-gen
+
+
 echo "Configured the system. Exiting chroot."
diff --git a/chrooted-iso.sh b/chrooted-iso.sh
index 02f2022..e3aec08 100755
--- a/chrooted-iso.sh
+++ b/chrooted-iso.sh
@@ -23,12 +23,17 @@ chown -R crystal:crystal /home/crystal/
 
 # Services
 systemctl enable NetworkManager
-systemctl enable mirrorlist
 systemctl enable gdm
 
-# Hostname and Locale
+# Mirrorlist
+reflector > /etc/pacman.d/mirrorlist
+
+# Hostname
 echo "crystal-live" > /etc/hostname
+
+# Locale
 echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-locale-gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
+locale-gen
+
 echo "Configured the system. Exiting chroot."
diff --git a/crystal/airootfs/etc/systemd/system/mirrorlist.service b/crystal/airootfs/etc/systemd/system/mirrorlist.service
deleted file mode 100644
index fcf9b44..0000000
--- a/crystal/airootfs/etc/systemd/system/mirrorlist.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Generates Base Crystal ISO Mirrorlist
-Requires=network-online.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/bash -c "reflector > /etc/pacman.d/mirrorlist"
-
-[Install]
-WantedBy=multi-user.target