Skip to content
Snippets Groups Projects
Verified Commit 0fff6372 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

patches/openwrt: run switch-branch with force in base-files postinst

parent 25d672af
Branches
Tags
1 merge request!123Turris OS 5.0 (HBK)
From 55904d335d88e2126545bb9660bb8429b8909c57 Mon Sep 17 00:00:00 2001 From 1aaef52d5d11c18a62e5f83271a5b33743da7b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz> From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 16 May 2019 15:52:45 +0200 Date: Thu, 16 May 2019 15:52:45 +0200
Subject: [PATCH] base-files: run switch-brach --verify after update Subject: [PATCH] base-files: run switch-brach --verify after update
...@@ -8,12 +8,15 @@ moves it from selected branch back to deploy. We are unable to do that ...@@ -8,12 +8,15 @@ moves it from selected branch back to deploy. We are unable to do that
change only on server because some branches are just binary copies of change only on server because some branches are just binary copies of
less stable branch. This solves it just by setting current branch back less stable branch. This solves it just by setting current branch back
in distfeeds. in distfeeds.
We use --verify to not nest updater runs and --force to set any branch
user chooses not only standard ones.
--- ---
package/base-files/Makefile | 4 +++- package/base-files/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index c16091b6bc..dd57ebb297 100644 index f96228a..0f2e03d 100644
--- a/package/base-files/Makefile --- a/package/base-files/Makefile
+++ b/package/base-files/Makefile +++ b/package/base-files/Makefile
@@ -37,7 +37,7 @@ endif @@ -37,7 +37,7 @@ endif
...@@ -25,15 +28,15 @@ index c16091b6bc..dd57ebb297 100644 ...@@ -25,15 +28,15 @@ index c16091b6bc..dd57ebb297 100644
TITLE:=Base filesystem for OpenWrt TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/ URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION) VERSION:=$(PKG_RELEASE)-$(REVISION)
@@ -208,6 +208,8 @@ define Package/base-files/postinst @@ -203,6 +203,8 @@ define Package/base-files/postinst
"/etc/init.d/$$L" enable "/etc/init.d/$$L" enable
fi fi
done < /etc/services_wanted done < /etc/services_wanted
+ # Update new /etc/opkg/distfeeds.conf to point to correct repository + # Update new /etc/opkg/distfeeds.conf to point to correct repository
+ switch-branch --verify + switch-branch --force --verify
} }
endef endef
-- --
2.21.0 2.22.0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment