From 1172d821e307f5a34f4fe4f49647f59e25be820d Mon Sep 17 00:00:00 2001 From: rluzuriaga Date: Sat, 29 Jul 2023 18:48:17 -0700 Subject: [PATCH 1/3] Add debug information for network issues Resolves #42 --- .../board/FOG/FOS/rootfs_overlay/etc/init.d/S40network | 6 ++++++ .../board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network b/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network index 9d4abb9c..5899217b 100755 --- a/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network +++ b/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network @@ -56,7 +56,13 @@ if [[ -z "$(echo $ifaces | tr -d ' ')" ]]; then # because ifaces is constructed else echo "Failed to get an IP via DHCP! Tried on interface(s): $ifaces" fi +initversion=$(cat /usr/share/fog/lib/funcs.sh | awk -F "=" '/export initversion=/{gsub(/"/,""); iv=$NF; print iv}') echo "Please check your network setup and try again!" +echo "Debug information:" +echo " Kernel Version: $(uname -r)" +echo " Init Version: $initversion" +echo " Network Adapter:" +echo $(lshw -c network -businfo) [[ -z $isdebug ]] && sleep 60 && reboot echo "Press enter to continue" read -t 60 diff --git a/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh b/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh index 0c87c7b3..1a1a8e1b 100644 --- a/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh +++ b/Buildroot/board/FOG/FOS/rootfs_overlay/usr/share/fog/lib/funcs.sh @@ -1,5 +1,5 @@ #!/bin/bash -export initversion=19800101 +export initversion="2022.02.9" . /usr/share/fog/lib/partition-funcs.sh REG_LOCAL_MACHINE_XP="/ntfs/WINDOWS/system32/config/system" REG_LOCAL_MACHINE_7="/ntfs/Windows/System32/config/SYSTEM" @@ -45,7 +45,8 @@ displayBanner() { echo " ==================================" echo " == Released under GPL Version 3 ==" echo " ==================================" - echo " Version: $version" + echo " FOG Version: $version" + echo " Kernel Version: $(uname -r)" echo " Init Version: $initversion" } # Gets all system mac addresses except for loopback From 76df2be8603f329e845793ca1a075fd53a10b59f Mon Sep 17 00:00:00 2001 From: rluzuriaga Date: Sat, 29 Jul 2023 18:52:01 -0700 Subject: [PATCH 2/3] Add indenting for network adapter output --- Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network b/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network index 5899217b..6dfc495d 100755 --- a/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network +++ b/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network @@ -62,7 +62,7 @@ echo "Debug information:" echo " Kernel Version: $(uname -r)" echo " Init Version: $initversion" echo " Network Adapter:" -echo $(lshw -c network -businfo) +echo $(lshw -c network -businfo) | 's/^/ /' [[ -z $isdebug ]] && sleep 60 && reboot echo "Press enter to continue" read -t 60 From 84a24b5981d20a5f642a27b40d9bf613ca0f28a0 Mon Sep 17 00:00:00 2001 From: rluzuriaga Date: Sun, 30 Jul 2023 19:43:12 -0700 Subject: [PATCH 3/3] Add the forgotten command for indenting --- Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network b/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network index 6dfc495d..45124305 100755 --- a/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network +++ b/Buildroot/board/FOG/FOS/rootfs_overlay/etc/init.d/S40network @@ -62,7 +62,7 @@ echo "Debug information:" echo " Kernel Version: $(uname -r)" echo " Init Version: $initversion" echo " Network Adapter:" -echo $(lshw -c network -businfo) | 's/^/ /' +echo $(lshw -c network -businfo) | sed 's/^/ /' [[ -z $isdebug ]] && sleep 60 && reboot echo "Press enter to continue" read -t 60