From 72a732cb59adaf2ec8f68efca0b1539cded75eec Mon Sep 17 00:00:00 2001
From: "Kevin Veen-Birkenbach [aka. Frantz]" <kevin@veen.world>
Date: Fri, 15 May 2020 18:11:30 +0200
Subject: [PATCH] Optimized chroot process

---
 scripts/image/chroot.sh | 16 ++++++++++------
 scripts/image/setup.sh  |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/image/chroot.sh b/scripts/image/chroot.sh
index 7122169..b63af77 100644
--- a/scripts/image/chroot.sh
+++ b/scripts/image/chroot.sh
@@ -18,12 +18,16 @@ mount_partitions
 mount_binds
 
 info "ld.so.preload fix" &&
-sed -i 's/^/#CHROOT /g' "$root_mount_path/etc/ld.so.preload" ||
+sed -i 's/^/#CHROOT /g' "$root_mount_path""etc/ld.so.preload" ||
+warning "Failed."
+
+info "Copy qemu binary..." &&
+cp -v /usr/bin/qemu-arm-static "$root_mount_path""usr/bin/" ||
 error
 
-info "copy qemu binary" &&
-cp -v /usr/bin/qemu-arm-static "$root_mount_path/usr/bin/" ||
-error
+info "Copy resolve.conf..."
+cp -v /etc/resolv.conf "$root_mount_path""etc/" &&
+warning "Failed. Propably there is no internet connection available."
 
 info "You will be transferred to the bash shell now." &&
 info "Issue 'exit' when you are done." &&
@@ -34,8 +38,8 @@ error
 
 info "Clean up" &&
 info "revert ld.so.preload fix" &&
-sed -i 's/^#CHROOT //g' "$root_mount_path/etc/ld.so.preload" ||
-error
+sed -i 's/^#CHROOT //g' "$root_mount_path""etc/ld.so.preload" ||
+warning "Failed."
 
 info "unmount everything" &&
 umount "$root_mount_path"/{dev/pts,dev,sys,proc,boot,} ||
diff --git a/scripts/image/setup.sh b/scripts/image/setup.sh
index 49f0951..51f0b37 100644
--- a/scripts/image/setup.sh
+++ b/scripts/image/setup.sh
@@ -272,6 +272,10 @@ if [ "$password_1" == "$password_2" ]
   else
     error "Passwords didn't match."
 fi
+# @todo add to chroot
+#pacman-key --init
+#pacman-key --populate archlinuxarm
+#pacman -Syyu
 
 question "Type in the hostname:" && read -r hostname;
 echo "$hostname" > "$root_mount_path""etc/hostname" || error "Changing hostname failed."