diff mbox series

[1/3] package/ifupdown-scripts: always install /etc/network/nfs_check

Message ID 20200309025003.26466-2-unixmania@gmail.com
State Accepted
Headers show
Series package/ifupdown-scripts: add openrc support | expand

Commit Message

Carlos Santos March 9, 2020, 2:50 a.m. UTC 
From: Carlos Santos <unixmania@gmail.com>

The script is minuscle and can be useful to configure an interface via
DHCP at run-time.

Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
 package/ifupdown-scripts/ifupdown-scripts.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Yann E. MORIN March 11, 2020, 8:31 p.m. UTC | #1 
Carlos, All,

On 2020-03-08 23:50 -0300, unixmania@gmail.com spake thusly:
> From: Carlos Santos <unixmania@gmail.com>
> 
> The script is minuscle and can be useful to configure an interface via
> DHCP at run-time.
> 
> Signed-off-by: Carlos Santos <unixmania@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/ifupdown-scripts/ifupdown-scripts.mk | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk
> index abb4575777..d387c530f1 100644
> --- a/package/ifupdown-scripts/ifupdown-scripts.mk
> +++ b/package/ifupdown-scripts/ifupdown-scripts.mk
> @@ -25,13 +25,12 @@ define IFUPDOWN_SCRIPTS_DHCP
>  		echo "  wait-delay 15"; \
>  		echo "  hostname \$$(hostname)"; \
>  	) >> $(TARGET_DIR)/etc/network/interfaces
> -	$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
> -		$(TARGET_DIR)/etc/network/nfs_check
>  endef
>  endif
>  
>  define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
> -	mkdir -p $(TARGET_DIR)/etc/network
> +	$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
> +		$(TARGET_DIR)/etc/network/nfs_check
>  	$(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network)
>  	$(IFUPDOWN_SCRIPTS_LOCALHOST)
>  	$(IFUPDOWN_SCRIPTS_DHCP)
> -- 
> 2.18.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk
index abb4575777..d387c530f1 100644
--- a/package/ifupdown-scripts/ifupdown-scripts.mk
+++ b/package/ifupdown-scripts/ifupdown-scripts.mk
@@ -25,13 +25,12 @@  define IFUPDOWN_SCRIPTS_DHCP
 		echo "  wait-delay 15"; \
 		echo "  hostname \$$(hostname)"; \
 	) >> $(TARGET_DIR)/etc/network/interfaces
-	$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
-		$(TARGET_DIR)/etc/network/nfs_check
 endef
 endif
 
 define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/etc/network
+	$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
+		$(TARGET_DIR)/etc/network/nfs_check
 	$(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network)
 	$(IFUPDOWN_SCRIPTS_LOCALHOST)
 	$(IFUPDOWN_SCRIPTS_DHCP)