Merge branch 'devel' of https://github.com/guysoft/CustomPiOS into devel

README.rst

@@ -167,7 +167,7 @@ List of Distributions using CustomPiOS
 * `HotSpotOS <https://github.com/guysoft/HostSpotOS>`_ - Makes a Raspberry Pi start a hotspot, if no wifi was found to connect to
 * `MtigOS <https://github.com/guysoft/MtigOS>`_ - Distro that lets you receive, store and graph sensor information from ESP8266 chips. It uses and MTIG stack: Mosquitto, Telegraf, InfluxDB and Grafana which are all pre-configured to work together. They automatically update using Docker.
 * `Tilti-Pi <https://github.com/myoung34/tilty-pi>`_ - Distro that lets you submit BLE data for the  `tilt hydrometer <https://tilthydrometer.com/>`_ via the `tilty <https://github.com/myoung34/tilty>`_ package and a built in `dashboard <https://github.com/myoung34/tilty-dashboard>`_
-* `MainsailOS <https://github.com/raymondh2/MainsailOS>`_ - Distro that packages the `Mainsail <https://github.com/meteyou/mainsail>`_ web UI, the `Moonraker <https://github.com/Arksine/moonraker>`_ API, and the `Klipper <https://github.com/KevinOConnor/klipper>`_ 3D printer firmware in an easy to package.
+* `MainsailOS <https://github.com/mainsail-crew/mainsailos>`_ - Distro that packages the `Mainsail <https://github.com/mainsail-crew/mainsail>`_ web UI, the `Moonraker <https://github.com/Arksine/moonraker>`_ API, and the `Klipper <https://github.com/klipper3d/klipper>`_ 3D printer firmware in an easy to package.
 * `UbuntuDockerPi <https://github.com/guysoft/UbuntuDockerPi>`_ - Distro ships with Ubuntu ARM 64bit Docker and docker-compose ready to build stuff for arm64v8/aarch64 or host whatever you like.
 * `FluiddPi <https://github.com/cadriel/fluiddpi>`_ - Distro that packages `Fluidd <https://github.com/cadriel/fluidd>`_, `Moonraker <https://github.com/Arksine/moonraker>`_, and `Klipper <https://github.com/KevinOConnor/klipper>`_ into the ultimate 3D printer firmware package.
 * `My Naturewatch Camera <https://github.com/interactionresearchstudio/NaturewatchCameraServer>`_ - A Python / OpenCV camera server to stream Pi camera content to a remote client through a website.

src/modules/admin-toolkit/start_chroot_script

@@ -95,7 +95,7 @@ fi
 # Begin general section
 if [ "$ADMIN_TOOLKIT_UPDATE_PACKAGES" == "yes" ]
 then
-    apt-get update && apt-get upgrade -y
+    apt-get update --allow-releaseinfo-change && apt-get upgrade -y
 fi
 
 # Install packages if listed

src/modules/auto-hotspot/start_chroot_script

@@ -10,7 +10,7 @@ set -e
 
 source /common.sh
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get -y purge dns-root-data
 apt-get -y install iw
 

src/modules/auto-mount-removable/start_chroot_script

@@ -9,7 +9,7 @@ set -e
 
 source /common.sh
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get install -y usbmount
 
 unpack /filesystem/root /

src/modules/base/start_chroot_script

@@ -20,7 +20,7 @@ if [ "${BASE_DISTRO}" == "ubuntu" ]; then
   echo "nameserver 8.8.4.4" >> /etc/resolv.conf
   echo "nameserver 1.1.1.1" >> /etc/resolv.conf
 
-  apt-get update
+  apt-get update --allow-releaseinfo-change
   apt-get install -y net-tools wireless-tools dhcpcd5
   if [ $( is_in_apt policykit-1 ) -eq 1 ]; then
     apt-get -y install policykit-1

src/modules/disable-services/start_chroot_script

@@ -9,7 +9,7 @@ set -ex
 source /common.sh
 install_cleanup_trap
 
-apt-get update --allow-releaseinfo-change
+apt-get update --allow-releaseinfo-change --allow-releaseinfo-change
 if [ $( is_in_apt policykit-1 ) -eq 1 ]; then
   sudo apt-get -y install policykit-1
 fi

src/modules/docker/start_chroot_script

@@ -21,7 +21,7 @@ elif [ "${BASE_DISTRO}" == "ubuntu" ]; then
         echo "Error, not implemented Ubuntu 32bit"
 	exit 1
     fi
-    apt-get update
+    apt-get update --allow-releaseinfo-change
     apt-get install -y docker-ce
 fi
 

src/modules/ffmpeg/start_chroot_script

@@ -9,7 +9,7 @@ set -ex
 source /common.sh
 install_cleanup_trap
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get install -y checkinstall git
 
 pushd /usr/src

src/modules/gui/start_chroot_script

@@ -14,11 +14,11 @@ unpack /filesystem/root_init /
 echo exit 101 > /usr/sbin/policy-rc.d
 chmod +x /usr/sbin/policy-rc.d
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get install -y --force-yes matchbox-window-manager xorg lightdm
 if [ "$GUI_INCLUDE_ACCELERATION" == "yes" ]
     then
-        apt-get update
+        apt-get update --allow-releaseinfo-change
         apt-get -y --force-yes install xcompmgr libgl1-mesa-dri mesa-utils compton libconfig9
 
         # Hack to pass non-interactive install

src/modules/install-linux-modules-extra/start_chroot_script

@@ -15,7 +15,7 @@ install_cleanup_trap
 
 # unpack /filesystem/root /
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 # workwround to intall linux-modules-extra-raspi
 sudo umount /boot
 

src/modules/kernel/start_chroot_script

@@ -14,7 +14,7 @@ install_cleanup_trap
 
 
 pushd /home/pi
-    sudo apt-get update
+    sudo apt-get update --allow-releaseinfo-change
     sudo apt-get -y install make gcc git bc p7zip-full bison flex libssl-dev
 
     # git clone --depth=1 https://github.com/raspberrypi/linux

src/modules/mysql/start_chroot_script

@@ -10,7 +10,7 @@ set -e
 source /common.sh
 install_cleanup_trap
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get install -y mariadb-server expect
 
 mysqld_safe &

src/modules/network/start_chroot_script

@@ -44,7 +44,7 @@ if [ ! -f "/etc/rc.local" ];then
 fi
 
 # prevent ntp updates from failing due to some Rpi3 weirdness, see also "Fix SSH" further below
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get install -y iptables
 sed -i 's@exit 0@@' /etc/rc.local
 echo '/sbin/iptables -t mangle -I POSTROUTING 1 -o wlan0 -p udp --dport 123 -j TOS --set-tos 0x00' >> /etc/rc.local

src/modules/pkgupgrade/start_chroot_script

@@ -18,7 +18,7 @@ if [ -z "${DEBIAN_FRONTEND}" ]; then
 fi
 
 ## Force Update
-apt update
+apt update --allow-releaseinfo-change
 
 ### Pre Update Section
 if [ "${PKGUPGRADE_DISTUPGRADE}" = "y" ]; then

src/modules/usage-statistics/start_chroot_script

@@ -9,7 +9,7 @@ set -e
 
 source /common.sh
 
-apt-get update
+apt-get update --allow-releaseinfo-change
 apt-get -y install curl
 
 unpack /filesystem/root /

src/variants/armbian/pre_chroot_script

@@ -52,7 +52,7 @@ if [ -n "$BASE_APT_CACHE" ] && [ "$BASE_APT_CACHE" != "no" ]; then
 else
   apt-get clean
 fi
-apt-get update || true
+apt-get update --allow-releaseinfo-change || true
 apt-get -y --force-yes install avahi-daemon || true
 apt-get -y --force-yes install iptables