Merge branch 'devel'

Author: FooDeas

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## raspberrypi-ua-netinst v2.2.2
+
+- build improvements
+
+**Bugfixes:**
+
+- fix compatibility with version 1 model B (with 256MB RAM)
+
 ## raspberrypi-ua-netinst v2.2.1
 
 - fix compatibility with onboard wireless lan on version 3 model B+ (with BCM2837B0)

build.sh

@@ -745,7 +745,7 @@ mv raspberrypi-ua-netinst.cpio.gz bootfs/raspberrypi-ua-netinst/
 	echo "enable_uart=1"
 } >> bootfs/config.txt
 
-echo "dwc_otg.lpm_enable=0 consoleblank=0 console=serial0,115200 console=tty1 elevator=deadline rootwait" > bootfs/cmdline.txt
+echo "rootfstype=ramfs dwc_otg.lpm_enable=0 consoleblank=0 console=serial0,115200 console=tty1 elevator=deadline rootwait" > bootfs/cmdline.txt
 
 if [ ! -f bootfs/TIMEOUT ] ; then
 	touch bootfs/TIMEOUT

scripts/opt/raspberrypi-ua-netinst/install.sh

@@ -674,13 +674,6 @@ echo "=================================================="
 echo "https://github.com/FooDeas/raspberrypi-ua-netinst/"
 echo "=================================================="
 
-echo -n "Starting HWRNG... "
-if /usr/sbin/rngd -r /dev/hwrng; then
-	echo "OK"
-else
-	echo "FAILED! (continuing to use the software RNG)"
-fi
-
 echo -n "Mounting boot partition... "
 mount "${bootpartition}" /boot || fail
 echo "OK"
@@ -1546,6 +1539,13 @@ if [ "$(free -m | awk '/^Mem:/{print $2}')" -lt "384" ]; then
 	echo "OK"
 fi
 
+echo -n "Starting HWRNG... "
+if /usr/sbin/rngd -r /dev/hwrng; then
+	echo "OK"
+else
+	echo "FAILED! (continuing to use the software RNG)"
+fi
+
 if [ "${kernel_module}" = true ]; then
 	if [ "${rootfstype}" != "ext4" ]; then
 		mkdir -p /rootfs/etc/initramfs-tools

update.sh

@@ -122,9 +122,15 @@ packages_sha256=
 download_file() {
 	local download_source=$1
 	local download_target=$2
+	local progress_option
+	if wget --show-progress --version &> /dev/null; [ "${?}" -eq 2 ]; then
+	    progress_option=()
+	else
+	    progress_option=("--show-progress")
+	fi
 	if [ -z "${download_target}" ]; then
 		for i in $(seq 1 5); do
-			if ! wget -q --show-progress --no-cache "${download_source}"; then
+			if ! wget "${progress_option[@]}" -q --no-cache "${download_source}"; then
 				if [ "${i}" != "5" ]; then
 					sleep 5
 				else
@@ -137,7 +143,7 @@ download_file() {
 		done
 	else
 		for i in $(seq 1 5); do
-			if ! wget -q --show-progress --no-cache -O "${download_target}" "${download_source}"; then
+			if ! wget "${progress_option[@]}" -q --no-cache -O "${download_target}" "${download_source}"; then
 				if [ "${i}" != "5" ]; then
 					sleep 5
 				else