From 1ddd765431f9777b838bf069aa025a4a0cc5595a Mon Sep 17 00:00:00 2001
From: amy <axtlos@salyut.one>
Date: Tue, 26 Oct 2021 21:51:15 +0200
Subject: [PATCH] now actually uses the pacman.conf with the crystal repo

---
 chrooted-bootstrp.sh            | 4 +++-
 chrooted-iso.sh                 | 2 +-
 crystal/airootfs/etc/buildstamp | 2 +-
 inject.sh                       | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrooted-bootstrp.sh b/chrooted-bootstrp.sh
index 369895a..4863288 100644
--- a/chrooted-bootstrp.sh
+++ b/chrooted-bootstrp.sh
@@ -4,9 +4,11 @@
 echo "chrooted in the new system, running as $(whoami)"
 
 echo "CrystalLive" > /etc/hostname
-echo "sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
+echo "reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
 chmod +x /usr/bin/mirrorsetup
 
+cp /pacman.conf /etc/pacman.conf
+
 # We don't add crystal until here so that our packages which change
 # /etc/skel have been installed already
 useradd -m crystal
diff --git a/chrooted-iso.sh b/chrooted-iso.sh
index 723c962..70ebf5e 100644
--- a/chrooted-iso.sh
+++ b/chrooted-iso.sh
@@ -4,7 +4,7 @@
 echo "chrooted in the new system, running as $(whoami)"
 
 echo "CrystalLive" > /etc/hostname
-echo "sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
+echo "reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
 chmod +x /usr/bin/mirrorsetup
 
 # We don't add crystal until here so that our packages which change
diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp
index 98ea62a..a9f8815 100644
--- a/crystal/airootfs/etc/buildstamp
+++ b/crystal/airootfs/etc/buildstamp
@@ -1 +1 @@
-Built on 10/22/21 @ 20:50:17 EST
+Built on 10/26/21 @ 21:49:30 EST
diff --git a/inject.sh b/inject.sh
index 10e93e1..9d3ff23 100755
--- a/inject.sh
+++ b/inject.sh
@@ -4,6 +4,7 @@ echo "inject.sh started."
 
 echo "Chrooting to $1, and running chrooted.sh"
 cp chrooted.sh ${1}/.
+cp crystal/pacman.conf ${1}/.
 chmod +x ${1}/chrooted.sh
 chroot $1 /bin/bash -c ./chrooted.sh
 rm ${1}/chrooted.sh