From 18b120a4b78636483a0d7d66d1e071e0903ec633 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Thu, 13 Oct 2016 10:00:25 +0200
Subject: [PATCH] sensible defaults

---
 config      | 27 ++++++++++++++++++---------
 lib/helpers |  5 ++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/config b/config
index 826893f..ca5e9f1 100644
--- a/config
+++ b/config
@@ -17,29 +17,38 @@
 # You should have received a copy of the GNU General Public License
 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
 
+
 ## arm-sdk configuration
 ## ---------------------
 
+
 ## options for `make` when building kernel
 MAKEOPTS="-j$(expr $(grep -c 'processor' /proc/cpuinfo) + 1)"
 
-## devuan packaged toolchain
-#compiler="arm-none-eabi-"
-#export PATH="$PATH:/sbin"
 
 ## custom toolchain (armv7+armhf; gcc 4.9.3)
 ## https://pub.parazyd.cf/mirror/
 compiler="armv7-devuan-linux-gnueabihf-"
 export PATH="$R/gcc/armv7-devuan-linux-gnueabihf/bin:$PATH:/sbin"
 
-## custom toolchain (DEPRECATED!)
+
+## custom toolchain (aarch64+arm64; gcc 4.9.3)
 ## https://pub.parazyd.cf/mirror/
-#compiler="arm-linux-gnueabihf-"
-#export PATH="$R/gcc/gcc-arm-linux-gnueabihf-4.7/bin:$PATH:/sbin"
+#compiler="aarch64-devuan-linux-gnueabi-"
+#export PATH="$R/gcc/aarch64-devuan-linux-gnueabi/bin:$PATH:/sbin"
+
+
+## devuan packaged toolchain
+#compiler="arm-none-eabi-"
+#export PATH="$PATH:/sbin"
+
 
 ## static qemu arm binary
-qemu_bin="/usr/bin/qemu-arm-static" # Devuan
-#qemu_bin="/usr/bin/qemu-arm" # Gentoo
+qemu_bin="/usr/bin/qemu-arm-static"      # Devuan
+#qemu_bin="/usr/bin/qemu-aarch64-static" # Devuan
+#qemu_bin="/usr/bin/qemu-arm"            # Gentoo
+#qemu_bin="/usr/bin/qemu-aarch"          # Gentoo
+
 
 ## extra_packages for all images
-extra_packages=(wpasupplicant rdate)
+extra_packages=()
diff --git a/lib/helpers b/lib/helpers
index 9facc26..02976c1 100644
--- a/lib/helpers
+++ b/lib/helpers
@@ -88,8 +88,7 @@ copy-zram-init() {
 	ckreq || return 1
 
 	notice "installing zram init"
-	sudo cp $R/extra/zram $strapdir/etc/init.d/zram
-	sudo chmod +x $strapdir/etc/init.d/zram
+	sudo cp $CPVERBOSE $R/extra/zram $strapdir/root/
 }
 
 copy-kernel-config() {
@@ -106,7 +105,7 @@ write-fstab() {
 	fn write-fstab
 	req=(strapdir)
 	ckreq || return 1
-	cat <<EOF | sudo tee ${strapdir}/etc/fstab ${TEEVERBOSE}
+	cat <<EOF | sudo tee ${strapdir}/etc/fstab
 ## <file system>  <mount point> <type> <options>           <dump><pass>
 ## proc
 proc              /proc         proc   nodev,noexec,nosuid    0    0