diff mbox series

[v2] audit: do not remove file installed by netplug

Message ID 20180605020842.12761-1-casantos@datacom.com.br
State Accepted
Headers show
Series [v2] audit: do not remove file installed by netplug | expand

Commit Message

Carlos Santos June 5, 2018, 2:08 a.m. UTC
The package recipe uses a post-install hook to remove useless files from
$(TARGET_DIR)/etc/rc.d/init.d and $(TARGET_DIR)/etc/sysconfig. This may
damage packages that install useful files on those directories (such as
netplug, which installs $(TARGET_DIR)/etc/rc.d/init.d/netplugd).

In the future[1] we will reorganize the init scripts and possibly get
rid of /etc/rc.d and /etc/sysconfig but for the moment let's restrict
the file removal to those installed by audit.

1. http://lists.busybox.net/pipermail/buildroot/2018-May/221549.html

Signed-off-by: Carlos Santos <casantos@datacom.com.br>
---
Changes v1->v2
  - Remove file from /etc/rc.d/init.d/, not /etc/rc.d/
---
 package/audit/audit.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni June 5, 2018, 7:59 a.m. UTC | #1
Hello,

On Mon,  4 Jun 2018 23:08:42 -0300, Carlos Santos wrote:
> The package recipe uses a post-install hook to remove useless files from
> $(TARGET_DIR)/etc/rc.d/init.d and $(TARGET_DIR)/etc/sysconfig. This may
> damage packages that install useful files on those directories (such as
> netplug, which installs $(TARGET_DIR)/etc/rc.d/init.d/netplugd).
> 
> In the future[1] we will reorganize the init scripts and possibly get
> rid of /etc/rc.d and /etc/sysconfig but for the moment let's restrict
> the file removal to those installed by audit.
> 
> 1. http://lists.busybox.net/pipermail/buildroot/2018-May/221549.html
> 
> Signed-off-by: Carlos Santos <casantos@datacom.com.br>
> ---
> Changes v1->v2
>   - Remove file from /etc/rc.d/init.d/, not /etc/rc.d/
> ---
>  package/audit/audit.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
Peter Korsgaard June 17, 2018, 3:50 p.m. UTC | #2
>>>>> "Carlos" == Carlos Santos <casantos@datacom.com.br> writes:

 > The package recipe uses a post-install hook to remove useless files from
 > $(TARGET_DIR)/etc/rc.d/init.d and $(TARGET_DIR)/etc/sysconfig. This may
 > damage packages that install useful files on those directories (such as
 > netplug, which installs $(TARGET_DIR)/etc/rc.d/init.d/netplugd).

 > In the future[1] we will reorganize the init scripts and possibly get
 > rid of /etc/rc.d and /etc/sysconfig but for the moment let's restrict
 > the file removal to those installed by audit.

 > 1. http://lists.busybox.net/pipermail/buildroot/2018-May/221549.html

 > Signed-off-by: Carlos Santos <casantos@datacom.com.br>
 > ---
 > Changes v1->v2
 >   - Remove file from /etc/rc.d/init.d/, not /etc/rc.d/

Committed to 2018.02.x, thanks.
Peter Korsgaard July 17, 2018, 7:28 a.m. UTC | #3
>>>>> "Carlos" == Carlos Santos <casantos@datacom.com.br> writes:

 > The package recipe uses a post-install hook to remove useless files from
 > $(TARGET_DIR)/etc/rc.d/init.d and $(TARGET_DIR)/etc/sysconfig. This may
 > damage packages that install useful files on those directories (such as
 > netplug, which installs $(TARGET_DIR)/etc/rc.d/init.d/netplugd).

 > In the future[1] we will reorganize the init scripts and possibly get
 > rid of /etc/rc.d and /etc/sysconfig but for the moment let's restrict
 > the file removal to those installed by audit.

 > 1. http://lists.busybox.net/pipermail/buildroot/2018-May/221549.html

 > Signed-off-by: Carlos Santos <casantos@datacom.com.br>
 > ---
 > Changes v1->v2
 >   - Remove file from /etc/rc.d/init.d/, not /etc/rc.d/

Committed to 2018.05.x, thanks.
diff mbox series

Patch

diff --git a/package/audit/audit.mk b/package/audit/audit.mk
index f5aa00d2f0..2f6e6653b3 100644
--- a/package/audit/audit.mk
+++ b/package/audit/audit.mk
@@ -51,8 +51,8 @@  define AUDIT_INSTALL_INIT_SYSTEMD
 endef
 
 define AUDIT_INSTALL_CLEANUP
-	$(RM) -rf $(TARGET_DIR)/etc/rc.d
-	$(RM) -rf $(TARGET_DIR)/etc/sysconfig
+	$(RM) $(TARGET_DIR)/etc/rc.d/init.d/auditd
+	$(RM) $(TARGET_DIR)/etc/sysconfig/auditd
 endef
 AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP