From 5de120edfe3d858839b641f79857b7c0ec218152 Mon Sep 17 00:00:00 2001
From: Igor <igor@armbian.com>
Date: Mon, 27 Mar 2023 23:04:07 +0200
Subject: [PATCH 1/4] Allow numbers in username

---
 packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
index f709cd039..3c96447a6 100644
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin
@@ -249,7 +249,7 @@ add_user()
 	while [ -f "/root/.not_logged_in_yet" ]; do
 		echo -e "\nPlease provide a username (eg. your first name): \c"
 		read -r -e username
-		if ! grep '^[a-zA-Z]*$' <<< "$username" > /dev/null ; then
+		if ! grep '^[a-zA-Z0-9]*$' <<< "$username" > /dev/null ; then
 			echo -e "\n\x1B[91mError\x1B[0m: illegal characters in username"
 			return
 		fi

From 80a5607bf5131520f0194c25625b82440ab92581 Mon Sep 17 00:00:00 2001
From: Werner <EvilOlaf@users.noreply.github.com>
Date: Tue, 21 Feb 2023 18:04:10 +0100
Subject: [PATCH 2/4] Add deprecation note (#4845)

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 0876b5768..66c9cadfc 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+# DEPRECATED:
+# This branch will not receive any further updates or fixes. Do NOT open bug reports when using it.
+
 <p align="center">
   <a href="#build-framework">
   <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">

From 6aad142ac856cbd6fed95ceb127424d97e6bc85d Mon Sep 17 00:00:00 2001
From: CueMaxX <ebhlert@gmail.com>
Date: Sat, 25 Mar 2023 10:50:31 +0100
Subject: [PATCH 3/4] Update boot-sunxi.cmd

'setenv console "display"' in boot-sunxi.cmd & in armbianEnv.txt had the same effect as 'setenv console "both"'.
That was due to a false if-statement in boot-sunxi.cmd:41
Fixed that, so 'setenv console "display"' will not co-enable the serial console anymore.
---
 config/bootscripts/boot-sunxi.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/bootscripts/boot-sunxi.cmd b/config/bootscripts/boot-sunxi.cmd
index 9570a24ac..85fc0b93e 100644
--- a/config/bootscripts/boot-sunxi.cmd
+++ b/config/bootscripts/boot-sunxi.cmd
@@ -38,8 +38,9 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	env import -t ${load_addr} ${filesize}
 fi
 
-if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
+if test "${console}" = "display"; then setenv consoleargs "console=tty1"; fi
 if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
+if test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
 if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"

From 765ff69c6e5038941b04d5d5bc6e82202a9b8587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= <igor@armbian.com>
Date: Sun, 26 Mar 2023 20:56:16 +0200
Subject: [PATCH 4/4] Update README.md

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 66c9cadfc..0876b5768 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-# DEPRECATED:
-# This branch will not receive any further updates or fixes. Do NOT open bug reports when using it.
-
 <p align="center">
   <a href="#build-framework">
   <img src=".github/armbian-logo.png" alt="Armbian logo" width="144">