ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

opkg: run prerm scripts for the old version also on upgrade

Browse Source 
To make sure we properly restart services on upgrade we need to
call the prerm script of the old package, in case the init script
changes (or vanishes).

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jonas Gorski 2016-11-21 15:20:32 +01:00
parent afaa34ccd7
commit 88a14bfd1d
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/opkg/Makefile
View File

@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=opkg
PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d
PKG_VERSION:=$(PKG_REV)
PKG_RELEASE:=14
PKG_RELEASE:=15
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=$(PKG_REV)

73
package/system/opkg/patches/280-call-prerm-and-postrm-scripts-on-upgrade.patch Normal file
View File

@ -0,0 +1,73 @@
From a8555d352d2851ee1482b74b57ba9eacfb354c18 Mon Sep 17 00:00:00 2001
From: Peter Urbanec <peteru@urbanec.net>
Date: Thu, 23 Oct 2014 01:05:35 +1100
Subject: [PATCH] opkg_install: Call prerm and postrm scripts on package
upgrade
When upgrading a package from v1 to v2, run "v1-prerm upgrade v2" and
"v1-postrm upgrade v2", similarly to what dpkg does.
This patch fixes issue 104.
Signed-off-by: Peter Urbanec <openembedded-devel@urbanec.net>
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
libopkg/opkg_install.c | 40 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
@@ -528,7 +528,25 @@ prerm_upgrade_old_pkg(pkg_t *pkg, pkg_t
Error unwind, for both the above cases:
old-postinst abort-upgrade new-version
*/
- return 0;
+ int err;
+ char *script_args;
+ char *new_version;
+
+ if (!old_pkg || !pkg)
+ return 0;
+
+ new_version = pkg_version_str_alloc(pkg);
+
+ sprintf_alloc(&script_args, "upgrade %s", new_version);
+ free(new_version);
+ err = pkg_run_script(old_pkg, "prerm", script_args);
+ free(script_args);
+ if (err != 0) {
+ opkg_msg(ERROR, "prerm script for package \"%s\" failed\n",
+ old_pkg->name);
+ return -1;
+ }
+ return 0;
}
static int
@@ -925,7 +943,25 @@ postrm_upgrade_old_pkg(pkg_t *pkg, pkg_t
new-postrm failed-upgrade old-version
Error unwind, for both cases:
old-preinst abort-upgrade new-version */
- return 0;
+ int err;
+ char *script_args;
+ char *new_version;
+
+ if (!old_pkg || !pkg)
+ return 0;
+
+ new_version = pkg_version_str_alloc(pkg);
+
+ sprintf_alloc(&script_args, "upgrade %s", new_version);
+ free(new_version);
+ err = pkg_run_script(old_pkg, "postrm", script_args);
+ free(script_args);
+ if (err != 0) {
+ opkg_msg(ERROR, "postrm script for package \"%s\" failed\n",
+ old_pkg->name);
+ return -1;
+ }
+ return 0;
}
static int