git » mk-builders.git » commit 630cb7c

diff --git a/bootstrapper-initial.sh b/bootstrapper-initial.sh
index 33bc522..930dc01 100755
--- a/bootstrapper-initial.sh
+++ b/bootstrapper-initial.sh
@@ -4,13 +4,5 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 locale-gen
 export LANG="en_US.UTF-8"
-# Only for VM:
-if [ "$(uname -m)" = "armv8l" ]; then
-	mv /usr/bin/uname /usr/bin/uname.real
-	echo '#!/bin/sh' > /usr/bin/uname
-	echo "/usr/bin/uname.real \"\$@\" | sed 's/armv8l/armv7l/'" >> /usr/bin/uname
-	chmod +x /usr/bin/uname
-fi
-# VM hack end
 mkdir -p /home/builder
 chown builder:builder /home/builder
diff --git a/exec-initial.sh b/exec-initial.sh
index 75fb21a..ff7e70e 100755
--- a/exec-initial.sh
+++ b/exec-initial.sh
@@ -28,6 +28,7 @@ useradd -U -G users,wheel -u 2000 -m builder
 
 # The root user could use the skel files, too.
 cp /etc/skel/.bash* /root/
+echo "export VISUAL=nano" >> /root/.bashrc
 
 # Null out the passwords
 passwd -d root
diff --git a/make-bootstrapper.sh b/make-bootstrapper.sh
index 2bfdd0a..a5d7fc0 100755
--- a/make-bootstrapper.sh
+++ b/make-bootstrapper.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 set -e
-cd /sources
 BSN=bootstrapper
 BS=/$BSN
 mkdir -p $BS/var/lib/pacman
 pacman -Sy -b $BS/var/lib/pacman -r $BS
 pacman -S --noconfirm --noscriptlet -b $BS/var/lib/pacman -r $BS bootstrap
 mkdir -p /sources/pkg-$BSN
+cp bootstrapper-initial.sh $BS/initial.sh
 cd $BS
 echo '[core]' >> etc/pacman.conf
 echo "Server = file:///sources/pkg-$BSN" >> etc/pacman.conf
@@ -14,9 +14,10 @@ cp /etc/makepkg.conf etc/
 mount -t proc proc proc
 mount -t sysfs sys sys
 mount --bind /dev dev
-cp /sources/bootstrapper-initial.sh initial.sh
 chmod +x ./initial.sh
 chroot . ./initial.sh
 systemd-machine-id-setup --root=$BS
 umount proc sys dev
 rm ./initial.sh
+cd -
+echo "Done."