From 5defa5f7ddf5032fd51a19598b11b97a54703bb0 Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Mon, 28 Jan 2019 16:44:59 +0100 Subject: [PATCH] fix SSL on installed system --- README.md | 1 + manjaro-arm-installer | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ada1592..456fbef 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ To use this script, please make sure that the following is correct: ## Usage: To use this script, simple run it as normal user after you make it executable: + ``` chmod +x manjaro-arm-installer bash manjaro-arm-installer diff --git a/manjaro-arm-installer b/manjaro-arm-installer index e2c9b5c..666d52f 100644 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -139,7 +139,10 @@ create_install() { msg "Setting up system settings..." #system setup $NSPAWN $TMPDIR/root chmod u+s /usr/bin/ping 1> /dev/null 2>&1 - $NSPAWN $TMPDIR/root update-ca-trust 1> /dev/null 2>&1 + sudo rm -f $ROOTFS_IMG/rootfs_$ARCH/etc/ssl/certs/ca-certificates.crt + sudo rm -f $ROOTFS_IMG/rootfs_$ARCH/etc/ca-certificates/extracted/tls-ca-bundle.pem + sudo cp -a /etc/ssl/certs/ca-certificates.crt $ROOTFS_IMG/rootfs_$ARCH/etc/ssl/certs/ + sudo cp -a /etc/ca-certificates/extracted/tls-ca-bundle.pem $ROOTFS_IMG/rootfs_$ARCH/etc/ca-certificates/extracted/ $NSPAWN $TMPDIR/root ln -sf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime 1> /dev/null 2>&1 $NSPAWN $TMPDIR/root sed -i s/"#$LOCALE"/"$LOCALE"/g /etc/locale.gen 1> /dev/null 2>&1 echo "LANG=$LOCALE" | sudo tee --append $TMPDIR/root/etc/locale.conf 1> /dev/null 2>&1