Merge branch 'thingos' into dev

bortek · Aug 26, 2017 · 622a172 · 622a172
2 parents 55dc2ba + b61dc10
commit 622a172
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/board/common/overlay/etc/init.d/S00datapart b/board/common/overlay/etc/init.d/S00datapart
@@ -43,9 +43,7 @@ case "$1" in
         test $? == 0 && msg_done || msg_fail
 
         msg_begin "Creating required data files"
-        mkdir /data/etc
-        mkdir /data/log
-        mkdir -m 775 /data/media
+        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
@@ -70,5 +68,5 @@ case "$1" in
         exit 1
 esac
 
-exit $?
-
+# always exit with a successful status
+exit 0
diff --git a/board/common/overlay/usr/share/dataskel/etc/.keep b/board/common/overlay/usr/share/dataskel/etc/.keep
diff --git a/board/common/overlay/usr/share/dataskel/log/.keep b/board/common/overlay/usr/share/dataskel/log/.keep
diff --git a/board/common/overlay/usr/share/dataskel/media/.keep b/board/common/overlay/usr/share/dataskel/media/.keep