PATCH-000002 Improve first boot output

NEMSLinux · Mar 16, 2019 · e693405 · e693405
1 parent bb11c0e
commit e693405
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/nems-cleanup.sh b/nems-cleanup.sh
@@ -264,6 +264,12 @@ nameserver 2001:4860:4860::8844
   # This script removes any MOTD that were added during installs (annoying!)
   /root/nems/nems-admin/build/230-motd
 
+  # Clear patches.log
+  if [[ -e /var/log/nems/patches.log ]]; then
+    rm /var/log/nems/patches.log
+  fi
+  touch /var/log/nems/patches.log
+
   # Cleanup lingering logs and so-on
   /root/nems/nems-admin/build/999-cleanup
 

diff --git a/resize_rootfs/odroid-stage1 b/resize_rootfs/odroid-stage1
@@ -33,5 +33,6 @@ EOF
 
 do_resize
 touch /forcefsck
+
 sync
 reboot
diff --git a/resize_rootfs/odroid-stage2 b/resize_rootfs/odroid-stage2
@@ -17,5 +17,12 @@ echo "Done" >> $rslog
 df -h / >> $rslog
 # Force FSCK to run at next boot just for good measure
 touch /forcefsck
+
+# Log that patch (resize) has been applied to this system
+# Activates features such as bootscreen.sh
+if ! grep -q "PATCH-000002" /var/log/nems/patches.log; then
+  echo "PATCH-000002" >> /var/log/nems/patches.log
+fi
+
 sync
 reboot
diff --git a/resize_rootfs/pine64 b/resize_rootfs/pine64
@@ -45,6 +45,12 @@ EOF
 
 resize
 
+# Log that patch (resize) has been applied to this system
+# Activates features such as bootscreen.sh
+if ! grep -q "PATCH-000002" /var/log/nems/patches.log; then
+  echo "PATCH-000002" >> /var/log/nems/patches.log
+fi
+
 echo "Done!"
 
 sed -i "s,/root/nems/nems-admin/resize_rootfs/pine64,,g" /etc/rc.local

diff --git a/resize_rootfs/raspi b/resize_rootfs/raspi
@@ -8,4 +8,11 @@ fi
 
 /bin/sed -i~ '/\/root\/nems\/nems-admin\/resize_rootfs\/raspi/d' /etc/rc.local
 
+# Log that patch (resize) has been applied to this system
+# Activates features such as bootscreen.sh
+if ! grep -q "PATCH-000002" /var/log/nems/patches.log; then
+  echo "PATCH-000002" >> /var/log/nems/patches.log
+fi
+
+sync
 reboot
diff --git a/resize_rootfs/rock64-stage1 b/resize_rootfs/rock64-stage1
@@ -31,5 +31,6 @@ EOF
 }
 
 do_resize
+
 sync
-#reboot
+reboot
diff --git a/resize_rootfs/rock64-stage2 b/resize_rootfs/rock64-stage2
@@ -5,3 +5,13 @@ PLATFORM=rock64 # Must match the filename $PLATFORM-stage#
 
 /sbin/resize2fs /dev/${BOOTDEVICE}p${PARTITION}
 sed -i "s,/root/nems/nems-admin/resize_rootfs/"'${PLATFORM}'"-stage2,,g" /etc/rc.local
+
+# Log that patch (resize) has been applied to this system
+# Activates features such as bootscreen.sh
+if ! grep -q "PATCH-000002" /var/log/nems/patches.log; then
+  echo "PATCH-000002" >> /var/log/nems/patches.log
+fi
+
+# Is reboot needed on this platform? Do it anyways until can test.
+sync
+reboot