Persistent config storage

Author: jbatonnet

build/deploy-dev.sh

@@ -67,7 +67,7 @@ echo "dev" > /tmp/target/.version
 
 # Push to the Kobra
 rclone -v sync --absolute \
-    --filter "- *.log" --filter "- *.pyc" --filter "- __pycache__/**" --filter "- /home/rinkhals/printer_data/**" \
+    --filter "- *.log" --filter "- *.pyc" --filter "- __pycache__/**" \
     --filter "+ /*.*" --filter "+ /bin/**" --filter "+ /sbin/**" --filter "+ /usr/**" --filter "+ /etc/**" --filter "+ /home/**" --filter "+ /lib/**" --filter "+ /.version" \
     --filter "- *" \
     /tmp/target Kobra:/useremain/rinkhals/dev

files/4-rinkhals/start.sh

@@ -197,13 +197,18 @@ log "> Preparing mounts..."
 
 mkdir -p /userdata/app/gk/printer_data
 umount -l /userdata/app/gk/printer_data 2> /dev/null
-mount --bind ./home/rinkhals/printer_data /userdata/app/gk/printer_data
+mount --bind /useremain/home/rinkhals/printer_data /userdata/app/gk/printer_data
+
+mkdir -p /userdata/app/gk/printer_data/config/default
+umount -l /userdata/app/gk/printer_data/config/default 2> /dev/null
+mount --bind -o ro $RINKHALS_ROOT/home/rinkhals/printer_data/config /userdata/app/gk/printer_data/config/default
 
 mkdir -p /userdata/app/gk/printer_data/gcodes
 umount -l /userdata/app/gk/printer_data/gcodes 2> /dev/null
 mount --bind /useremain/app/gk/gcodes /userdata/app/gk/printer_data/gcodes
 
-# TODO: Mount config directory to something persistent
+[ -f /userdata/app/gk/printer_data/config/moonraker.conf ] || cp /userdata/app/gk/printer_data/config/default/moonraker.conf /userdata/app/gk/printer_data/config/
+[ -f /userdata/app/gk/printer_data/config/printer.cfg ] || cp /userdata/app/gk/printer_data/config/default/printer.cfg /userdata/app/gk/printer_data/config/
 
 
 ################
@@ -256,7 +261,7 @@ fi
 ################
 log "> Waiting for everything to start..."
 
-n=30
+n=60
 while [ "$n" != "0" ]; do
     n=$(( $n - 1 ))
     sleep 1

files/update.sh

@@ -23,15 +23,15 @@ function log() {
     echo "`date`: ${*}" >> /mnt/udisk/aGVscF9zb3Nf/install.log
 }
 function progress() {
-    if [[ "${*}" == "success" ]]; then
+    if [ "$1" == "success" ]; then
         fb_draw "drawbox=x=16:y=16:w=32:h=ih-32:t=fill:color=black,drawbox=x=20:y=20:w=24:h=ih-40:t=fill:color=green"
         return
     fi
-    if [[ "${*}" == "error" ]]; then
+    if [ "$1" == "error" ]; then
         fb_draw "drawbox=x=16:y=16:w=32:h=ih-32:t=fill:color=black,drawbox=x=20:y=20:w=24:h=ih-40:t=fill:color=red"
         return
     fi
-    if [[ ${*} == 0 ]]; then
+    if [ $1 == 0 ]; then
         fb_draw "drawbox=x=16:y=16:w=32:h=ih-32:t=fill:color=black"
         return
     fi
@@ -55,6 +55,7 @@ function fb_draw() {
 }
 
 
+log
 log "Starting Rinkhals installation..."
 
 
@@ -81,9 +82,20 @@ if [[ "$KOBRA_VERSION" != "2.3.5.3" ]]; then
 fi
 
 
-# Backup the machine-specific files
+# Stop Rinkhals if it is running already
 progress 0.1
+if [ -f /useremain/rinkhals/.current/stop.sh ]; then
+    log "Stopping Rinkhals"
+
+    chmod +x /useremain/rinkhals/.current/stop.sh
+    /useremain/rinkhals/.current/stop.sh
+fi
+
 
+# Backup the machine-specific files
+progress 0.2
+
+log "Backing up machine-specific files"
 rm -f /mnt/udisk/aGVscF9zb3Nf/device.ini
 rm -f /mnt/udisk/aGVscF9zb3Nf/device_account.json
 cp /userdata/app/gk/config/device.ini /mnt/udisk/aGVscF9zb3Nf/device.ini
@@ -94,18 +106,20 @@ cp /userdata/app/gk/config/device_account.json /mnt/udisk/aGVscF9zb3Nf/device_ac
 
 
 # Copy Rinkhals
-progress 0.2
+progress 0.3
 
 RINKHALS_VERSION=`cat ${update_file_path}/.version`
 log "Installing Rinkhals version $RINKHALS_VERSION"
 
+log "Copying Rinkhals files"
 mkdir -p /useremain/rinkhals/${RINKHALS_VERSION}
 rm -rf /useremain/rinkhals/${RINKHALS_VERSION}/*
 cp -r ${update_file_path}/rinkhals/* /useremain/rinkhals/${RINKHALS_VERSION}
 echo ${RINKHALS_VERSION} > /useremain/rinkhals/${RINKHALS_VERSION}/.version
 
 progress 0.8
 
+log "Copying Rinkhals startup files"
 rm -f /useremain/rinkhals/*.*
 cp ${update_file_path}/start-rinkhals.sh /useremain/rinkhals/start-rinkhals.sh
 cp ${update_file_path}/start.sh.patch /useremain/rinkhals/start.sh.patch
@@ -127,6 +141,7 @@ else
     log "Rinkhals loader was detected, skipping installation"
 fi
 
+log "Removing update files"
 rm -rf ${update_file_path}
 rm -rf ${to_gcode_path}/update.swu
 rm -rf ${swu_path}/update.swu