diff --git a/CHANGELOG.md b/CHANGELOG.md index 9806b034ce2883011e838a6b685b9fb5f3b2eff3..5433fcf2903dec917de075bed83b7fdfc6dad089 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] +### Fixed +- block of execution when package is removed or reinstalled using opkg +- do not attempt recovery of journal on package installation + + ## [1.5.0] - 2022-02-16 ### Added - Reboot requirement info to approval message diff --git a/files/immediate_reboot.init b/files/immediate_reboot.init index 9d4ee083c37f857d12c8b7253f1a6e8b2b2bc1be..89bd602073b8ee2fb9a840980156d43c79046081 100755 --- a/files/immediate_reboot.init +++ b/files/immediate_reboot.init @@ -12,6 +12,9 @@ status() { } start() { + # Make sure that this is not executed from package. Recovery when package is + # being installed is not desirable. + [ -z "$PKG_UPGRADE" ] || return 0 # Recover updater's journal if it exists if [ -e "/usr/share/updater/journal" ]; then # Note: supervisor runs pkgupdate that recovers run from journal and later @@ -23,6 +26,9 @@ start() { } stop() { + # Make sure that this is not executed from package. We do not want to block + # the removal of package. + [ -z "$PKG_UPGRADE" ] || return 0 # Block shutdown when update is running # We have to use Python3 as there seems to be no shell tool to simply use # POSIX file locks (lockf instead of flock)