Merge pull request #166 from knuton/div-47-include-scannable-mac-outp…

…ut-on-status-console

Add MAC addresses on PlayOS status screen

application/playos-status.nix

@@ -10,6 +10,8 @@ let
       while :; do
         screen=$(xrandr --current | grep '*' | awk '{print $1}')
         networkCount=$(connmanctl services | grep wifi | wc -l)
+        ethernetMacs=$(cat /sys/class/net/e*/address 2>/dev/null | grep -v '^$' | awk '{print "Ethernet " $0}' | tr '\n' '  ')
+        wlanMacs=$(cat /sys/class/net/wl*/address 2>/dev/null | grep -v '^$' | awk '{print "WLAN " $0}' | tr '\n' '  ')
         rfid=$(opensc-tool --list-readers | pr -T -o 2)
         dataDiskFree=$(df -h /mnt/data | pr -T -o 2)
         controller=$(systemctl is-active playos-controller)
@@ -23,8 +25,13 @@ let
           "Persistent storage:" \
           "$dataDiskFree" \
           "Controller: $controller" \
-          "Updated at: $time" \
+          "Network interfaces:" \
+          "  $ethernetMacs  $wlanMacs" \
           > ${ttyPath}
+        qrencode -m 2 -t utf8 <<< "$ethernetMacs  $wlanMacs" \
+          | pr -T -o 2 \
+          > ${ttyPath}
+        printf "\n%s" "Updated at: $time" > ${ttyPath}
         sleep 5
       done
     '';
@@ -43,6 +50,7 @@ in
         xorg.xrandr
         opensc
         coreutils
+        qrencode
       ];
       description = "PlayOS status";
       wantedBy = [ "multi-user.target" ];

controller/Changelog.md

@@ -5,6 +5,7 @@
 - kiosk: Add a key combination to perform hard refresh (Ctrl-Shift-R)
 - os: Added localization options for Polish and Czech
 - controller: Add licensing page in System Settings
+- status screen: Display MAC addresses in text and QR code
 
 ## Changed