diff --git a/debian/postinst b/debian/postinst index 66b1e91..3f2400b 100644 --- a/debian/postinst +++ b/debian/postinst @@ -5,8 +5,10 @@ test $DEBIAN_SCRIPT_DEBUG && set -v -x # use debconf . /usr/share/debconf/confmodule -cd /usr/share/omr-server -LOCALFILES=no SOURCES=no sh debian9-x86_64.sh +sed -i -e "s/^LOCALFILES=.*$/LOCALFILES=no/" -e "s/^SOURCES=.*$/SOURCES=no/" debian9-x86_64.sh +echo 'To finish installation reboot' + +systemctl enable omr-update db_stop diff --git a/debian/rules b/debian/rules index 10d24ab..4db8990 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all override_dh_auto_install: mkdir -p $(CURDIR)/debian/omr-server/usr/share/omr-server - find . -type f -not -iname '*/debian/*' -not -iname '*/.git/*' -exec cp '{}' "$(CURDIR)/debian/omr-server/usr/share/omr-server/{}" ';' + find . -type f -xtype f -not -iname '*/debian/*' -not -iname '*/.git/*' -exec cp '{}' "$(CURDIR)/debian/omr-server/usr/share/omr-server/{}" ';' cp -r ./shorewall4 $(CURDIR)/debian/omr-server/usr/share/omr-server/ cp -r ./shorewall6 $(CURDIR)/debian/omr-server/usr/share/omr-server/ cp -r ./bin $(CURDIR)/debian/omr-server/usr/share/omr-server/ + cp omr-update.service.in /lib/systemd/system/omr-update.service diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh index cdd7d57..72760df 100644 --- a/debian9-x86_64.sh +++ b/debian9-x86_64.sh @@ -30,6 +30,7 @@ DSVPN=${DSVPN:-yes} WIREGUARD=${WIREGUARD:-yes} SOURCES=${SOURCES:-yes} NOINTERNET=${NOINTERNET:-no} +REINSTALL=${REINSTALL:-yes} SPEEDTEST=${SPEEDTEST:-no} LOCALFILES=${LOCALFILES:-no} INTERFACE=${INTERFACE:-$(ip -o -4 route show to default | grep -m 1 -Po '(?<=dev )(\S+)' | tr -d "\n")} @@ -133,6 +134,12 @@ if [ "$UPDATE" = "yes" ]; then echo "Update mode" fi +CURRENT_OMR="$(grep -s 'OpenMPTCProuter VPS' /etc/* | awk '{print $4}')" +if [ "$REINSTALL" = "no" ] && [ "$CURRENT_OMR" = "$OMR_VERSION" ]; then + exit 1 +fi + + echo "Remove lock and update packages list..." rm -f /var/lib/dpkg/lock rm -f /var/lib/dpkg/lock-frontend diff --git a/omr-update.service.in b/omr-update.service.in new file mode 100644 index 0000000..c543d73 --- /dev/null +++ b/omr-update.service.in @@ -0,0 +1,14 @@ +[Unit] +Description=OMR Update +After=network.target network-online.target + +[Service] +Type=simple +Restart=no +Environment="SOURCES=no" +Environment="REINSTALL=no" +Environment="LOCALFILES=yes" +ExecStart=/usr/share/omr-server/debian9-x86_64.sh + +[Install] +WantedBy=multi-user.target