From 83bdae68d22c16e06a577663426785cc9d7af0c3 Mon Sep 17 00:00:00 2001
From: Josef-MrBeam <81746291+Josef-MrBeam@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:05:07 +0100
Subject: [PATCH] SW-4062 stable release MrBeamPlugin v0.15.0.post1 iobeam
 v1.3.1 (#107)

* include MRBeamPlugin v0.15.0.post1 iobeam v1.3.1
---
 src/modules/beamos/config                     |  4 +-
 .../mrb_check/root/etc/init.d/mrb_check       | 45 -------------------
 src/variants/beamos/config                    |  2 +-
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 src/modules/beamos/filesystem/mrb_check/root/etc/init.d/mrb_check

diff --git a/src/modules/beamos/config b/src/modules/beamos/config
index df34d962..61a33c10 100755
--- a/src/modules/beamos/config
+++ b/src/modules/beamos/config
@@ -7,12 +7,12 @@ TRUE_USER=pi
 
 # Branches
 ## Plugins
-[ -n "$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH" ] || BEAMOS_MRBEAMPLUGIN_REPO_BRANCH=v0.14.0.post0
+[ -n "$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH" ] || BEAMOS_MRBEAMPLUGIN_REPO_BRANCH=v0.15.0.post1
 [ -n "$BEAMOS_CAMERA_REPO_BRANCH" ] || BEAMOS_CAMERA_REPO_BRANCH=v0.1.2
 [ -n "$BEAMOS_FINDMYMRBEAM_REPO_BRANCH" ] || BEAMOS_FINDMYMRBEAM_REPO_BRANCH=v0.5.2
 [ -n "$BEAMOS_NETCONNECTD_PLUGIN_REPO_BRANCH" ] || BEAMOS_NETCONNECTD_PLUGIN_REPO_BRANCH=v0.3.0
 ## Dependencies
-[ -n "$BEAMOS_IOBEAM_REPO_BRANCH" ] || BEAMOS_IOBEAM_REPO_BRANCH=v1.2.1
+[ -n "$BEAMOS_IOBEAM_REPO_BRANCH" ] || BEAMOS_IOBEAM_REPO_BRANCH=v1.3.1
 [ -n "$BEAMOS_MRBHWINFO_REPO_BRANCH" ] || BEAMOS_MRBHWINFO_REPO_BRANCH=v1.0.0
 [ -n "$BEAMOS_MRBEAMLED_REPO_BRANCH" ] || BEAMOS_MRBEAMLED_REPO_BRANCH=v1.0.0
 [ -n "$BEAMOS_NETCONNECTD_REPO_BRANCH" ] || BEAMOS_NETCONNECTD_REPO_BRANCH=v1.0.0
diff --git a/src/modules/beamos/filesystem/mrb_check/root/etc/init.d/mrb_check b/src/modules/beamos/filesystem/mrb_check/root/etc/init.d/mrb_check
deleted file mode 100644
index 6ff4f7b6..00000000
--- a/src/modules/beamos/filesystem/mrb_check/root/etc/init.d/mrb_check
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          mrb_check
-# Required-Start:    beamos_first_boot
-# Required-Stop:
-# Default-Start:     3
-# Default-Stop:
-# Short-Description: Run mrb_check if the device has not been setup yet
-# Description:
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-do_start () {
-    # Debug
-    first_boot_logfile=/var/log/beamos_first_boot.log
-    # Do not run multiple times
-    [ ! -f $first_boot_logfile ] && echo "First Boot script didn't run before the mrb_check !!" && exit 1
-
-    successfile=/etc/mrb_check_success
-    # Do not run multiple times
-    [ -f $successfile ] && return 0
-
-    CHECK_BIN=/usr/bin/mrb_check
-    [ -x $CHECK_BIN ] && $CHECK_BIN
-
-    # /sbin/reboot
-}
-
-case "$1" in
-  start|"")
-        do_start
-        ;;
-  restart|reload|force-reload)
-        echo "Error: argument '$1' not supported" >&2
-        exit 3
-        ;;
-  stop)
-        # No-op
-        ;;
-  *)
-        echo "Usage: octopi_first_boot [start|stop]" >&2
-        exit 3
-        ;;
-esac
diff --git a/src/variants/beamos/config b/src/variants/beamos/config
index df6df65c..edf5b100 100755
--- a/src/variants/beamos/config
+++ b/src/variants/beamos/config
@@ -1,7 +1,7 @@
 #!/bin/sh
 # variant mrbeam, flavor default: override hostname & custom config setting
 export DIST_NAME=BeamOS
-export DIST_VERSION=0.20.2
+export DIST_VERSION=0.20.3
 export BASE_OVERRIDE_HOSTNAME=MrBeam-XXXX
 export BASE_IMAGE_ENLARGEROOT=1700