[v3] fff-sysupgrade: use keep.d and spread to packages

Submitted by Tim Niemeyer on Feb. 2, 2019, 11:33 a.m.

Details

Message ID 20190202113316.1780-1-tim@tn-x.org
State Rejected
Headers show

Commit Message

Tim Niemeyer Feb. 2, 2019, 11:33 a.m. 
Currently only one package can define what files are upgrade-save and
what not. With this change, we
- remove the nasty 0001-sysupgrade-no-config-save path
- support more packages to define upgrade-save files
- move the upgrade save definition to the packages owning the files

Signed-off-by: Tim Niemeyer <tim@tn-x.org>

---

Changes in v3:
- Just a stupid resend

Changes in v2:
- remove sector file

 .../openwrt/0001-sysupgrade-no-config-save.patch   | 25 ----------------------
 .../fff-config/files/lib/upgrade/keep.d/fff-config |  1 +
 src/packages/fff/fff-fastd/Makefile                |  4 ++++
 .../fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd |  0
 .../fff-hoods/files/lib/upgrade/keep.d/fff-hoods   |  1 +
 .../files/lib/upgrade/keep.d/fff-network           |  1 +
 src/packages/fff/fff-sysupgrade/Makefile           |  4 ++++
 .../files/etc/uci-defaults/99-fff-sysupgrade       | 13 -----------
 .../files/lib/upgrade/keep.d/fff-sysupgrade        |  4 ++++
 .../overlay/lib/upgrade/keep.d/base-files          |  0
 .../lib/upgrade/keep.d/base-files-essential        |  0
 .../overlay/lib/upgrade/keep.d/uboot-envtools      |  0
 12 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 build_patches/openwrt/0001-sysupgrade-no-config-save.patch
 create mode 100644 src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
 create mode 100644 src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
 create mode 100644 src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
 create mode 100644 src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
 delete mode 100644 src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
 create mode 100644 src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
 create mode 100644 src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files
 create mode 100644 src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential
 create mode 100644 src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools

diff --git a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files
new file mode 100644
index 0000000..e69de29
diff --git a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential
new file mode 100644
index 0000000..e69de29
diff --git a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools
new file mode 100644
index 0000000..e69de29

Patch hide | download patch | download mbox 

diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
deleted file mode 100644
index 9cec414..0000000
--- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-From 758b72379e994960ee1dcb0bf4f6db37140f59f0 Mon Sep 17 00:00:00 2001
-From: Tim Niemeyer <tim@tn-x.org>
-Date: Sat, 8 Jul 2017 10:46:59 +0200
-Subject: [PATCH 1/4] sysupgrade no config save
-
----
- package/base-files/files/sbin/sysupgrade | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index bf5428a..e7d6f90 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -118,7 +118,7 @@ list_changed_conffiles() {
- add_uci_conffiles() {
- 	local file="$1"
- 	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
--		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
-+		/etc/sysupgrade.conf 2>/dev/null) \
- 		-type f -o -type l 2>/dev/null;
- 	  list_changed_conffiles ) | sort -u > "$file"
- 	return 0
--- 
-2.7.4
-
diff --git a/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
new file mode 100644
index 0000000..95c1329
--- /dev/null
+++ b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
@@ -0,0 +1 @@ 
+/etc/config/fff
diff --git a/src/packages/fff/fff-fastd/Makefile b/src/packages/fff/fff-fastd/Makefile
index b6ee5fb..4d48c7a 100644
--- a/src/packages/fff/fff-fastd/Makefile
+++ b/src/packages/fff/fff-fastd/Makefile
@@ -38,6 +38,10 @@  define Build/Compile
 	# nothing
 endef
 
+define Package/$(PKG_NAME)/install-overlay
+    $(CP) ./overlay/* $(1)/
+endef
+
 define Package/$(PKG_NAME)/install
 	$(CP) ./files/* $(1)/
 endef
diff --git a/src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd b/src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
new file mode 100644
index 0000000..e69de29
diff --git a/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
new file mode 100644
index 0000000..1b659ca
--- /dev/null
+++ b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
@@ -0,0 +1 @@ 
+/etc/hoodfile
diff --git a/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
new file mode 100644
index 0000000..fa879f3
--- /dev/null
+++ b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
@@ -0,0 +1 @@ 
+/etc/network.config
diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index 1ed3d46..383eabb 100644
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/src/packages/fff/fff-sysupgrade/Makefile
@@ -33,6 +33,10 @@  define Build/Compile
     # nothing
 endef
 
+define Package/$(PKG_NAME)/install-overlay
+    $(CP) ./overlay/* $(1)/
+endef
+
 define Package/$(PKG_NAME)/install
     $(CP) ./files/* $(1)/
 endef
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
deleted file mode 100644
index 7ff83f5..0000000
--- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
+++ /dev/null
@@ -1,13 +0,0 @@ 
-#!/bin/sh
-# Copyright 2017 Tim Niemeyer
-# License GPLv3
-
-cat > /etc/sysupgrade.conf <<-__EOF__
-/etc/shadow
-/etc/dropbear/dropbear_dss_host_key
-/etc/dropbear/dropbear_rsa_host_key
-/etc/dropbear/authorized_keys
-/etc/network.config
-/etc/config/fff
-/etc/hoodfile
-__EOF__
diff --git a/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
new file mode 100644
index 0000000..0a1b46b
--- /dev/null
+++ b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
@@ -0,0 +1,4 @@ 
+/etc/shadow
+/etc/dropbear/dropbear_dss_host_key
+/etc/dropbear/dropbear_rsa_host_key
+/etc/dropbear/authorized_keys

Comments

Christian Dresel Feb. 10, 2019, 2:58 p.m. 
hi

noch nicht intensiver angeguckt aber das Patch applied aktuell bei mir
nicht. Gibts da irgendwas, was ich zuvor einspielen muss und vergessen habe?

Gruß

Christian

On 02.02.19 12:33, Tim Niemeyer wrote:
> Currently only one package can define what files are upgrade-save and
> what not. With this change, we
> - remove the nasty 0001-sysupgrade-no-config-save path
> - support more packages to define upgrade-save files
> - move the upgrade save definition to the packages owning the files
>
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
>
> ---
>
> Changes in v3:
> - Just a stupid resend
>
> Changes in v2:
> - remove sector file
>
>  .../openwrt/0001-sysupgrade-no-config-save.patch   | 25 ----------------------
>  .../fff-config/files/lib/upgrade/keep.d/fff-config |  1 +
>  src/packages/fff/fff-fastd/Makefile                |  4 ++++
>  .../fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd |  0
>  .../fff-hoods/files/lib/upgrade/keep.d/fff-hoods   |  1 +
>  .../files/lib/upgrade/keep.d/fff-network           |  1 +
>  src/packages/fff/fff-sysupgrade/Makefile           |  4 ++++
>  .../files/etc/uci-defaults/99-fff-sysupgrade       | 13 -----------
>  .../files/lib/upgrade/keep.d/fff-sysupgrade        |  4 ++++
>  .../overlay/lib/upgrade/keep.d/base-files          |  0
>  .../lib/upgrade/keep.d/base-files-essential        |  0
>  .../overlay/lib/upgrade/keep.d/uboot-envtools      |  0
>  12 files changed, 15 insertions(+), 38 deletions(-)
>  delete mode 100644 build_patches/openwrt/0001-sysupgrade-no-config-save.patch
>  create mode 100644 src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
>  create mode 100644 src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
>  create mode 100644 src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
>  create mode 100644 src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
>  delete mode 100644 src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
>  create mode 100644 src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
>  create mode 100644 src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files
>  create mode 100644 src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential
>  create mode 100644 src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools
>
> diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> deleted file mode 100644
> index 9cec414..0000000
> --- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From 758b72379e994960ee1dcb0bf4f6db37140f59f0 Mon Sep 17 00:00:00 2001
> -From: Tim Niemeyer <tim@tn-x.org>
> -Date: Sat, 8 Jul 2017 10:46:59 +0200
> -Subject: [PATCH 1/4] sysupgrade no config save
> -
> ----
> - package/base-files/files/sbin/sysupgrade | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
> -index bf5428a..e7d6f90 100755
> ---- a/package/base-files/files/sbin/sysupgrade
> -+++ b/package/base-files/files/sbin/sysupgrade
> -@@ -118,7 +118,7 @@ list_changed_conffiles() {
> - add_uci_conffiles() {
> - 	local file="$1"
> - 	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
> --		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
> -+		/etc/sysupgrade.conf 2>/dev/null) \
> - 		-type f -o -type l 2>/dev/null;
> - 	  list_changed_conffiles ) | sort -u > "$file"
> - 	return 0
> --- 
> -2.7.4
> -
> diff --git a/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> new file mode 100644
> index 0000000..95c1329
> --- /dev/null
> +++ b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> @@ -0,0 +1 @@
> +/etc/config/fff
> diff --git a/src/packages/fff/fff-fastd/Makefile b/src/packages/fff/fff-fastd/Makefile
> index b6ee5fb..4d48c7a 100644
> --- a/src/packages/fff/fff-fastd/Makefile
> +++ b/src/packages/fff/fff-fastd/Makefile
> @@ -38,6 +38,10 @@ define Build/Compile
>  	# nothing
>  endef
>  
> +define Package/$(PKG_NAME)/install-overlay
> +    $(CP) ./overlay/* $(1)/
> +endef
> +
>  define Package/$(PKG_NAME)/install
>  	$(CP) ./files/* $(1)/
>  endef
> diff --git a/src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd b/src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
> new file mode 100644
> index 0000000..e69de29
> diff --git a/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> new file mode 100644
> index 0000000..1b659ca
> --- /dev/null
> +++ b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> @@ -0,0 +1 @@
> +/etc/hoodfile
> diff --git a/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
> new file mode 100644
> index 0000000..fa879f3
> --- /dev/null
> +++ b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
> @@ -0,0 +1 @@
> +/etc/network.config
> diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
> index 1ed3d46..383eabb 100644
> --- a/src/packages/fff/fff-sysupgrade/Makefile
> +++ b/src/packages/fff/fff-sysupgrade/Makefile
> @@ -33,6 +33,10 @@ define Build/Compile
>      # nothing
>  endef
>  
> +define Package/$(PKG_NAME)/install-overlay
> +    $(CP) ./overlay/* $(1)/
> +endef
> +
>  define Package/$(PKG_NAME)/install
>      $(CP) ./files/* $(1)/
>  endef
> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
> deleted file mode 100644
> index 7ff83f5..0000000
> --- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -#!/bin/sh
> -# Copyright 2017 Tim Niemeyer
> -# License GPLv3
> -
> -cat > /etc/sysupgrade.conf <<-__EOF__
> -/etc/shadow
> -/etc/dropbear/dropbear_dss_host_key
> -/etc/dropbear/dropbear_rsa_host_key
> -/etc/dropbear/authorized_keys
> -/etc/network.config
> -/etc/config/fff
> -/etc/hoodfile
> -__EOF__
> diff --git a/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
> new file mode 100644
> index 0000000..0a1b46b
> --- /dev/null
> +++ b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
> @@ -0,0 +1,4 @@
> +/etc/shadow
> +/etc/dropbear/dropbear_dss_host_key
> +/etc/dropbear/dropbear_rsa_host_key
> +/etc/dropbear/authorized_keys
> diff --git a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files
> new file mode 100644
> index 0000000..e69de29
> diff --git a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential
> new file mode 100644
> index 0000000..e69de29
> diff --git a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools
> new file mode 100644
> index 0000000..e69de29
Adrian Schmutzler Feb. 10, 2019, 4:16 p.m. 
Hallo,

ich bin nach wie vor ein Fan der jetzigen Lösung und eher dagegen, den Patch einbauen.

Ist aber hier ein bisschen Abwägungssache.

Ein ausführlichere Diskussion dazu gab es ja glaube ich bei der v2.

Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Christian Dresel
> Sent: Sonntag, 10. Februar 2019 15:58
> To: Tim Niemeyer <tim@tn-x.org>; franken-dev@freifunk.net
> Subject: Re: [PATCH v3] fff-sysupgrade: use keep.d and spread to packages
> 
> hi
> 
> noch nicht intensiver angeguckt aber das Patch applied aktuell bei mir nicht.
> Gibts da irgendwas, was ich zuvor einspielen muss und vergessen habe?
> 
> Gruß
> 
> Christian
> 
> On 02.02.19 12:33, Tim Niemeyer wrote:
> > Currently only one package can define what files are upgrade-save and
> > what not. With this change, we
> > - remove the nasty 0001-sysupgrade-no-config-save path
> > - support more packages to define upgrade-save files
> > - move the upgrade save definition to the packages owning the files
> >
> > Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> >
> > ---
> >
> > Changes in v3:
> > - Just a stupid resend
> >
> > Changes in v2:
> > - remove sector file
> >
> >  .../openwrt/0001-sysupgrade-no-config-save.patch   | 25 ---------------------
> -
> >  .../fff-config/files/lib/upgrade/keep.d/fff-config |  1 +
> >  src/packages/fff/fff-fastd/Makefile                |  4 ++++
> >  .../fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd |  0
> >  .../fff-hoods/files/lib/upgrade/keep.d/fff-hoods   |  1 +
> >  .../files/lib/upgrade/keep.d/fff-network           |  1 +
> >  src/packages/fff/fff-sysupgrade/Makefile           |  4 ++++
> >  .../files/etc/uci-defaults/99-fff-sysupgrade       | 13 -----------
> >  .../files/lib/upgrade/keep.d/fff-sysupgrade        |  4 ++++
> >  .../overlay/lib/upgrade/keep.d/base-files          |  0
> >  .../lib/upgrade/keep.d/base-files-essential        |  0
> >  .../overlay/lib/upgrade/keep.d/uboot-envtools      |  0
> >  12 files changed, 15 insertions(+), 38 deletions(-)  delete mode
> > 100644 build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> >  create mode 100644
> > src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> >  create mode 100644
> > src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
> >  create mode 100644
> > src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> >  create mode 100644
> > src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
> >  delete mode 100644
> > src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgra
> > de  create mode 100644
> > src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrad
> > e  create mode 100644
> > src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files
> >  create mode 100644
> > src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-files-
> > essential  create mode 100644
> > src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-envto
> > ols
> >
> > diff --git
> > a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> > b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> > deleted file mode 100644
> > index 9cec414..0000000
> > --- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> > +++ /dev/null
> > @@ -1,25 +0,0 @@
> > -From 758b72379e994960ee1dcb0bf4f6db37140f59f0 Mon Sep 17 00:00:00
> > 2001
> > -From: Tim Niemeyer <tim@tn-x.org>
> > -Date: Sat, 8 Jul 2017 10:46:59 +0200
> > -Subject: [PATCH 1/4] sysupgrade no config save
> > -
> > ----
> > - package/base-files/files/sbin/sysupgrade | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/package/base-files/files/sbin/sysupgrade
> > b/package/base-files/files/sbin/sysupgrade
> > -index bf5428a..e7d6f90 100755
> > ---- a/package/base-files/files/sbin/sysupgrade
> > -+++ b/package/base-files/files/sbin/sysupgrade
> > -@@ -118,7 +118,7 @@ list_changed_conffiles() {
> > - add_uci_conffiles() {
> > - 	local file="$1"
> > - 	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
> > --		/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
> > -+		/etc/sysupgrade.conf 2>/dev/null) \
> > - 		-type f -o -type l 2>/dev/null;
> > - 	  list_changed_conffiles ) | sort -u > "$file"
> > - 	return 0
> > ---
> > -2.7.4
> > -
> > diff --git
> > a/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> > b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> > new file mode 100644
> > index 0000000..95c1329
> > --- /dev/null
> > +++ b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> > @@ -0,0 +1 @@
> > +/etc/config/fff
> > diff --git a/src/packages/fff/fff-fastd/Makefile
> > b/src/packages/fff/fff-fastd/Makefile
> > index b6ee5fb..4d48c7a 100644
> > --- a/src/packages/fff/fff-fastd/Makefile
> > +++ b/src/packages/fff/fff-fastd/Makefile
> > @@ -38,6 +38,10 @@ define Build/Compile
> >  	# nothing
> >  endef
> >
> > +define Package/$(PKG_NAME)/install-overlay
> > +    $(CP) ./overlay/* $(1)/
> > +endef
> > +
> >  define Package/$(PKG_NAME)/install
> >  	$(CP) ./files/* $(1)/
> >  endef
> > diff --git
> > a/src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
> > b/src/packages/fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd
> > new file mode 100644
> > index 0000000..e69de29
> > diff --git
> > a/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> > b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> > new file mode 100644
> > index 0000000..1b659ca
> > --- /dev/null
> > +++ b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> > @@ -0,0 +1 @@
> > +/etc/hoodfile
> > diff --git
> > a/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
> > b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-network
> > new file mode 100644
> > index 0000000..fa879f3
> > --- /dev/null
> > +++ b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-networ
> > +++ k
> > @@ -0,0 +1 @@
> > +/etc/network.config
> > diff --git a/src/packages/fff/fff-sysupgrade/Makefile
> > b/src/packages/fff/fff-sysupgrade/Makefile
> > index 1ed3d46..383eabb 100644
> > --- a/src/packages/fff/fff-sysupgrade/Makefile
> > +++ b/src/packages/fff/fff-sysupgrade/Makefile
> > @@ -33,6 +33,10 @@ define Build/Compile
> >      # nothing
> >  endef
> >
> > +define Package/$(PKG_NAME)/install-overlay
> > +    $(CP) ./overlay/* $(1)/
> > +endef
> > +
> >  define Package/$(PKG_NAME)/install
> >      $(CP) ./files/* $(1)/
> >  endef
> > diff --git
> > a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupg
> > rade
> > b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupg
> > rade
> > deleted file mode 100644
> > index 7ff83f5..0000000
> > ---
> > a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupg
> > rade
> > +++ /dev/null
> > @@ -1,13 +0,0 @@
> > -#!/bin/sh
> > -# Copyright 2017 Tim Niemeyer
> > -# License GPLv3
> > -
> > -cat > /etc/sysupgrade.conf <<-__EOF__ -/etc/shadow
> > -/etc/dropbear/dropbear_dss_host_key
> > -/etc/dropbear/dropbear_rsa_host_key
> > -/etc/dropbear/authorized_keys
> > -/etc/network.config
> > -/etc/config/fff
> > -/etc/hoodfile
> > -__EOF__
> > diff --git
> > a/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgr
> > ade
> > b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sysupgr
> > ade
> > new file mode 100644
> > index 0000000..0a1b46b
> > --- /dev/null
> > +++ b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-sys
> > +++ upgrade
> > @@ -0,0 +1,4 @@
> > +/etc/shadow
> > +/etc/dropbear/dropbear_dss_host_key
> > +/etc/dropbear/dropbear_rsa_host_key
> > +/etc/dropbear/authorized_keys
> > diff --git
> > a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-file
> > s
> > b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-file
> > s
> > new file mode 100644
> > index 0000000..e69de29
> > diff --git
> > a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-file
> > s-essential
> > b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-file
> > s-essential
> > new file mode 100644
> > index 0000000..e69de29
> > diff --git
> > a/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-env
> > tools
> > b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-env
> > tools
> > new file mode 100644
> > index 0000000..e69de29
Tim Niemeyer Feb. 12, 2019, 3:29 p.m. 
@Fabian: Erinnerst du dich an die Diskussion vom Sonntag im Auto?
Kannst du das passend zusammenfassen?

Tim

On Sat, 2019-02-02 at 12:33 +0100, Tim Niemeyer wrote:
> Currently only one package can define what files are upgrade-save and
> what not. With this change, we
> - remove the nasty 0001-sysupgrade-no-config-save path
> - support more packages to define upgrade-save files
> - move the upgrade save definition to the packages owning the files
> 
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> 
> ---
> 
> Changes in v3:
> - Just a stupid resend
> 
> Changes in v2:
> - remove sector file
> 
>  .../openwrt/0001-sysupgrade-no-config-save.patch   | 25 ------------
> ----------
>  .../fff-config/files/lib/upgrade/keep.d/fff-config |  1 +
>  src/packages/fff/fff-fastd/Makefile                |  4 ++++
>  .../fff/fff-fastd/overlay/lib/upgrade/keep.d/fastd |  0
>  .../fff-hoods/files/lib/upgrade/keep.d/fff-hoods   |  1 +
>  .../files/lib/upgrade/keep.d/fff-network           |  1 +
>  src/packages/fff/fff-sysupgrade/Makefile           |  4 ++++
>  .../files/etc/uci-defaults/99-fff-sysupgrade       | 13 -----------
>  .../files/lib/upgrade/keep.d/fff-sysupgrade        |  4 ++++
>  .../overlay/lib/upgrade/keep.d/base-files          |  0
>  .../lib/upgrade/keep.d/base-files-essential        |  0
>  .../overlay/lib/upgrade/keep.d/uboot-envtools      |  0
>  12 files changed, 15 insertions(+), 38 deletions(-)
>  delete mode 100644 build_patches/openwrt/0001-sysupgrade-no-config-
> save.patch
>  create mode 100644 src/packages/fff/fff-
> config/files/lib/upgrade/keep.d/fff-config
>  create mode 100644 src/packages/fff/fff-
> fastd/overlay/lib/upgrade/keep.d/fastd
>  create mode 100644 src/packages/fff/fff-
> hoods/files/lib/upgrade/keep.d/fff-hoods
>  create mode 100644 src/packages/fff/fff-
> network/files/lib/upgrade/keep.d/fff-network
>  delete mode 100644 src/packages/fff/fff-sysupgrade/files/etc/uci-
> defaults/99-fff-sysupgrade
>  create mode 100644 src/packages/fff/fff-
> sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
>  create mode 100644 src/packages/fff/fff-
> sysupgrade/overlay/lib/upgrade/keep.d/base-files
>  create mode 100644 src/packages/fff/fff-
> sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential
>  create mode 100644 src/packages/fff/fff-
> sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools
> 
> diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-
> save.patch b/build_patches/openwrt/0001-sysupgrade-no-config-
> save.patch
> deleted file mode 100644
> index 9cec414..0000000
> --- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From 758b72379e994960ee1dcb0bf4f6db37140f59f0 Mon Sep 17 00:00:00
> 2001
> -From: Tim Niemeyer <tim@tn-x.org>
> -Date: Sat, 8 Jul 2017 10:46:59 +0200
> -Subject: [PATCH 1/4] sysupgrade no config save
> -
> ----
> - package/base-files/files/sbin/sysupgrade | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/package/base-files/files/sbin/sysupgrade
> b/package/base-files/files/sbin/sysupgrade
> -index bf5428a..e7d6f90 100755
> ---- a/package/base-files/files/sbin/sysupgrade
> -+++ b/package/base-files/files/sbin/sysupgrade
> -@@ -118,7 +118,7 @@ list_changed_conffiles() {
> - add_uci_conffiles() {
> - 	local file="$1"
> - 	( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
> --		/etc/sysupgrade.conf /lib/upgrade/keep.d/*
> 2>/dev/null) \
> -+		/etc/sysupgrade.conf 2>/dev/null) \
> - 		-type f -o -type l 2>/dev/null;
> - 	  list_changed_conffiles ) | sort -u > "$file"
> - 	return 0
> --- 
> -2.7.4
> -
> diff --git a/src/packages/fff/fff-
> config/files/lib/upgrade/keep.d/fff-config b/src/packages/fff/fff-
> config/files/lib/upgrade/keep.d/fff-config
> new file mode 100644
> index 0000000..95c1329
> --- /dev/null
> +++ b/src/packages/fff/fff-config/files/lib/upgrade/keep.d/fff-config
> @@ -0,0 +1 @@
> +/etc/config/fff
> diff --git a/src/packages/fff/fff-fastd/Makefile
> b/src/packages/fff/fff-fastd/Makefile
> index b6ee5fb..4d48c7a 100644
> --- a/src/packages/fff/fff-fastd/Makefile
> +++ b/src/packages/fff/fff-fastd/Makefile
> @@ -38,6 +38,10 @@ define Build/Compile
>  	# nothing
>  endef
>  
> +define Package/$(PKG_NAME)/install-overlay
> +    $(CP) ./overlay/* $(1)/
> +endef
> +
>  define Package/$(PKG_NAME)/install
>  	$(CP) ./files/* $(1)/
>  endef
> diff --git a/src/packages/fff/fff-
> fastd/overlay/lib/upgrade/keep.d/fastd b/src/packages/fff/fff-
> fastd/overlay/lib/upgrade/keep.d/fastd
> new file mode 100644
> index 0000000..e69de29
> diff --git a/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-
> hoods b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> new file mode 100644
> index 0000000..1b659ca
> --- /dev/null
> +++ b/src/packages/fff/fff-hoods/files/lib/upgrade/keep.d/fff-hoods
> @@ -0,0 +1 @@
> +/etc/hoodfile
> diff --git a/src/packages/fff/fff-
> network/files/lib/upgrade/keep.d/fff-network b/src/packages/fff/fff-
> network/files/lib/upgrade/keep.d/fff-network
> new file mode 100644
> index 0000000..fa879f3
> --- /dev/null
> +++ b/src/packages/fff/fff-network/files/lib/upgrade/keep.d/fff-
> network
> @@ -0,0 +1 @@
> +/etc/network.config
> diff --git a/src/packages/fff/fff-sysupgrade/Makefile
> b/src/packages/fff/fff-sysupgrade/Makefile
> index 1ed3d46..383eabb 100644
> --- a/src/packages/fff/fff-sysupgrade/Makefile
> +++ b/src/packages/fff/fff-sysupgrade/Makefile
> @@ -33,6 +33,10 @@ define Build/Compile
>      # nothing
>  endef
>  
> +define Package/$(PKG_NAME)/install-overlay
> +    $(CP) ./overlay/* $(1)/
> +endef
> +
>  define Package/$(PKG_NAME)/install
>      $(CP) ./files/* $(1)/
>  endef
> diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-
> defaults/99-fff-sysupgrade b/src/packages/fff/fff-
> sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
> deleted file mode 100644
> index 7ff83f5..0000000
> --- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-
> sysupgrade
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -#!/bin/sh
> -# Copyright 2017 Tim Niemeyer
> -# License GPLv3
> -
> -cat > /etc/sysupgrade.conf <<-__EOF__
> -/etc/shadow
> -/etc/dropbear/dropbear_dss_host_key
> -/etc/dropbear/dropbear_rsa_host_key
> -/etc/dropbear/authorized_keys
> -/etc/network.config
> -/etc/config/fff
> -/etc/hoodfile
> -__EOF__
> diff --git a/src/packages/fff/fff-
> sysupgrade/files/lib/upgrade/keep.d/fff-sysupgrade
> b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-
> sysupgrade
> new file mode 100644
> index 0000000..0a1b46b
> --- /dev/null
> +++ b/src/packages/fff/fff-sysupgrade/files/lib/upgrade/keep.d/fff-
> sysupgrade
> @@ -0,0 +1,4 @@
> +/etc/shadow
> +/etc/dropbear/dropbear_dss_host_key
> +/etc/dropbear/dropbear_rsa_host_key
> +/etc/dropbear/authorized_keys
> diff --git a/src/packages/fff/fff-
> sysupgrade/overlay/lib/upgrade/keep.d/base-files
> b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-
> files
> new file mode 100644
> index 0000000..e69de29
> diff --git a/src/packages/fff/fff-
> sysupgrade/overlay/lib/upgrade/keep.d/base-files-essential
> b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/base-
> files-essential
> new file mode 100644
> index 0000000..e69de29
> diff --git a/src/packages/fff/fff-
> sysupgrade/overlay/lib/upgrade/keep.d/uboot-envtools
> b/src/packages/fff/fff-sysupgrade/overlay/lib/upgrade/keep.d/uboot-
> envtools
> new file mode 100644
> index 0000000..e69de29
Fabian Blaese June 16, 2019, 8:20 a.m. 
Zwar finde ich das so sehr viel schöner, allerdings müssen wir dann:
- Penibel drauf achten, alle OpenWRT Dinge in keep.d zu entfernen.
- Weiterhin einen build_patch haben, der den anderen OpenWRT Mechanismus zu deaktivieren. (siehe "Disable another openwrt mechanism for configuration restore")

Daher ist es glaube ich insgesamt sinnvoller beim aktuellen Weg zu bleiben, auch wenn sich /etc/sysupgrade.conf nicht ganz so schön erweitern lässt, sondern nur per append von Zeilen.

Gruß
Fabian