From 749e3cdc4da744725c0c8ac43a044956f15b3726 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 2 Feb 2020 18:23:58 +0200
Subject: [PATCH] Add /etc/init.d/S02defaultdata to handle default data files

---
 board/common/overlay/etc/init.d/S00datapart   | 16 +------
 .../common/overlay/etc/init.d/S02defaultdata  | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 board/common/overlay/etc/init.d/S02defaultdata

diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
index 5c76f928fa..70e880cb95 100755
--- a/board/common/overlay/etc/init.d/S00datapart
+++ b/board/common/overlay/etc/init.d/S00datapart
@@ -41,24 +41,12 @@ case "$1" in
         test $? == 0 && msg_done || msg_fail
 
         msg_begin "Mounting data partition"
-        mount -T /etc/fstab.disk /data
-        test $? == 0 && msg_done || msg_fail
+        mount -T /etc/fstab.disk /data && msg_done || msg_fail
 
-        msg_begin "Creating required data files"
+        msg_begin "Copying data skeleton"
         cp -pur /usr/share/dataskel/* /data
-        cp /etc/version /data/etc/version
-        ln -s /usr/share/zoneinfo/UTC /data/etc/localtime
-        touch /data/etc/adjtime
         sync
         msg_done
-        
-        msg_begin "Setting empty root password"
-        PASSWORD="" adminpasswd
-        msg_done
-
-        # mount other partitions depending on data
-        mount -T /etc/fstab.disk -a
-        mount -T /etc/fstab.extra -a
         ;;
 
     stop)
diff --git a/board/common/overlay/etc/init.d/S02defaultdata b/board/common/overlay/etc/init.d/S02defaultdata
new file mode 100644
index 0000000000..62bf91454e
--- /dev/null
+++ b/board/common/overlay/etc/init.d/S02defaultdata
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+test -n "${OS_VERSION}" || source /etc/init.d/base
+
+
+set_empty_root_passwd() {
+    msg_begin "Setting empty root password"
+    PASSWORD="" adminpasswd
+    sync
+    msg_done
+}
+
+copy_version() {
+    msg_begin "Copying version file"
+    cp /etc/version /data/etc/version
+    sync
+    msg_done
+}
+
+set_utc_timezone() {
+    msg_begin "Setting UTC timezone"
+    ln -s /usr/share/zoneinfo/UTC /data/etc/localtime
+    touch /data/etc/adjtime
+    sync
+    msg_done
+}
+
+
+case "$1" in
+    start)
+        test -s /data/etc/shadow || set_empty_root_passwd
+        test -s /data/etc/version || copy_version
+        test -s /data/etc/localtime || set_utc_timezone
+        ;;
+
+    stop)
+        true
+        ;;
+
+    *)
+        echo "Usage: $0 {start}"
+        exit 1
+esac
+
+exit $?