From c682bee0a84eae65923786151b2187ebcbfe9f27 Mon Sep 17 00:00:00 2001
From: noon92 <40807970+noon92@users.noreply.github.com>
Date: Mon, 30 Dec 2024 14:23:04 +0200
Subject: [PATCH] Revert "Default password for femto is now femto. Must be
 changed on first login."

---
 environment-setup/foxbunto_env_setup.sh       |  7 ++--
 .../sysdrv/out/rootfs_uclibc_rv1106/etc/issue |  2 +-
 .../etc/pam.d/common-password                 | 33 -------------------
 3 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/pam.d/common-password

diff --git a/environment-setup/foxbunto_env_setup.sh b/environment-setup/foxbunto_env_setup.sh
index 758d549..ce3067a 100755
--- a/environment-setup/foxbunto_env_setup.sh
+++ b/environment-setup/foxbunto_env_setup.sh
@@ -22,7 +22,7 @@ sudoer=$(echo $SUDO_USER)
 install_prerequisites() {
   echo “Setting up Foxbuntu build environment…”
   apt update
-  apt install -y git ssh make gcc gcc-multilib g++-multilib module-assistant expect g++ gawk texinfo libssl-dev bison flex fakeroot cmake unzip gperf autoconf device-tree-compiler libncurses5-dev pkg-config bc python-is-python3 passwd openssl openssh-server openssh-client vim file cpio rsync qemu-user-static binfmt-support dialog
+  apt install -y git ssh make gcc gcc-multilib g++-multilib module-assistant expect g++ gawk texinfo libssl-dev bison flex fakeroot cmake unzip gperf autoconf device-tree-compiler libncurses5-dev pkg-config bc python-is-python3 passwd openssl openssh-server openssh-client vim file cpio rsync qemu-user-static binfmt-support
 }
 
 clone_repos() {
@@ -190,7 +190,7 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 echo "Installing packages..."
 
 apt update
-DEBIAN_FRONTEND=noninteractive apt install -y --option Dpkg::Options::="--force-confold" linux-firmware wireless-tools git python3.10-venv libgpiod-dev libyaml-cpp-dev libbluetooth-dev openssl libssl-dev libulfius-dev liborcania-dev evtest screen avahi-daemon protobuf-compiler telnet fonts-noto-color-emoji ninja-build chrony qrencode
+DEBIAN_FRONTEND=noninteractive apt install -y --option Dpkg::Options::="--force-confold" linux-firmware wireless-tools git python3.10-venv libgpiod-dev libyaml-cpp-dev libbluetooth-dev openssl libssl-dev libulfius-dev liborcania-dev evtest screen avahi-daemon protobuf-compiler telnet fonts-noto-color-emoji ninja-build chrony
 if [[ $? -eq 2 ]]; then echo "Error, step failed..."; fi
 DEBIAN_FRONTEND=noninteractive apt upgrade -y --option Dpkg::Options::="--force-confold"
 
@@ -248,8 +248,7 @@ find / -group pico -exec chgrp femto {} \
 find / -user pico -exec chown femto {} \
 usermod -d /home/femto -m femto
 ls -ld /home/femto
-echo 'femto:femto' | chpasswd
-sudo chage -d 0 femto
+echo 'femto:fox' | chpasswd
 usermod -a -G tty femto
 usermod -a -G dialout femto
 
diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/issue b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/issue
index 0f52a0a..2b85869 100644
--- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/issue
+++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/issue
@@ -1,4 +1,4 @@
 Ubuntu 22.04.3 LTS \n \l
 
-[username:password] root:root femto:femto (default)
+[username:password] root:root femto:fox
 
diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/pam.d/common-password b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/pam.d/common-password
deleted file mode 100644
index aad381d..0000000
--- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/etc/pam.d/common-password
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# /etc/pam.d/common-password - password-related modules common to all services
-#
-# This file is included from other service-specific PAM config files,
-# and should contain a list of modules that define the services to be
-# used to change user passwords.  The default is pam_unix.
-
-# Explanation of pam_unix options:
-# The "yescrypt" option enables
-#hashed passwords using the yescrypt algorithm, introduced in Debian
-#11.  Without this option, the default is Unix crypt.  Prior releases
-#used the option "sha512"; if a shadow password hash will be shared
-#between Debian 11 and older releases replace "yescrypt" with "sha512"
-#for compatibility .  The "obscure" option replaces the old
-#`OBSCURE_CHECKS_ENAB' option in login.defs.  See the pam_unix manpage
-#for other options.
-
-# As of pam 1.0.1-6, this file is managed by pam-auth-update by default.
-# To take advantage of this, it is recommended that you configure any
-# local modules either before or after the default block, and use
-# pam-auth-update to manage selection of other modules.  See
-# pam-auth-update(8) for details.
-
-# here are the per-package modules (the "Primary" block)
-password	[success=1 default=ignore]	pam_unix.so obscure yescrypt minlen=0
-# here's the fallback if no module succeeds
-password	requisite			pam_deny.so
-# prime the stack with a positive return value if there isn't one already;
-# this avoids us returning an error just because nothing sets a success code
-# since the modules above will each just jump around
-password	required			pam_permit.so
-# and here are more per-package modules (the "Additional" block)
-# end of pam-auth-update config