[OpenWrt-Devel] [PATCH] base-files: sysupgrade: respect new profile.d infrastructure

[Bastian Bittorf]

since switch to profile.d infrastructure with r46965 it is not
the right way to make changes in /etc/profile, but have own files
under /etc/profile.d/*.sh - keep these during sysupgrade and dont
mark the old file as conffile, otherwise it will be used during
sysupgrade by the 'opkg list-changed-conffiles' call in add_uci_conffiles()

Signed-off-by: Bastian Bittorf <bittorf at bluebottle.com>
---
 package/base-files/Makefile                                      |    1 -
 package/base-files/files/lib/upgrade/keep.d/base-files-essential |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 12f9489..58287b9 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -45,7 +45,6 @@ define Package/base-files/conffiles
 /etc/group
 /etc/passwd
 /etc/shadow
-/etc/profile
 /etc/protocols
 /etc/services
 /etc/shells
diff --git a/package/base-files/files/lib/upgrade/keep.d/base-files-essential b/package/base-files/files/lib/upgrade/keep.d/base-files-essential
index 978d4b5..18a53fb 100644
--- a/package/base-files/files/lib/upgrade/keep.d/base-files-essential
+++ b/package/base-files/files/lib/upgrade/keep.d/base-files-essential
@@ -3,7 +3,7 @@
 /etc/inittab
 /etc/group
 /etc/passwd
-/etc/profile
+/etc/profile.d
 /etc/shadow
 /etc/shells
 /etc/sysctl.conf
-- 
1.7.10.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel