From 8dd54f0cca5325bd15a4710ae6378cb0b909545e Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Thu, 17 Feb 2022 09:49:37 -0700 Subject: [PATCH] correctly handle the absence of ENVIRONMENT=dev --- build/initialization.sh | 4 ++-- build/write-image.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/initialization.sh b/build/initialization.sh index edf918239..9b823459b 100755 --- a/build/initialization.sh +++ b/build/initialization.sh @@ -66,13 +66,13 @@ EOF cat /embassy-os/product_key.txt | tr -d '\n' | sha256sum | head -c 32 | sed 's/$/\n/' > /etc/machine-id -passwd -l pi - # introduce start9 username and embassy as default password usermod -l start9 -d /home/start9 -m pi groupmod --new-name start9 pi echo start9:embassy | chpasswd +passwd -l start9 + raspi-config nonint enable_overlayfs # create a copy of the cmdline *without* the quirk string, so that it can be easily amended diff --git a/build/write-image.sh b/build/write-image.sh index 0f43ab4f8..2946b1a31 100755 --- a/build/write-image.sh +++ b/build/write-image.sh @@ -85,7 +85,7 @@ sudo chmod -x /tmp/eos-mnt/etc/update-motd.d/* sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/00-embassy if [[ "$ENVIRONMENT" =~ (^|-)dev($|-) ]]; then - cat ./build/initialization.sh | grep -v "passwd -l pi" | sudo tee /tmp/eos-mnt/usr/local/bin/initialization.sh > /dev/null + cat ./build/initialization.sh | grep -v "passwd -l start9" | sudo tee /tmp/eos-mnt/usr/local/bin/initialization.sh > /dev/null sudo chmod +x /tmp/eos-mnt/usr/local/bin/initialization.sh else sudo cp ./build/initialization.sh /tmp/eos-mnt/usr/local/bin