package/ifupdown-scripts: add openrc support
cover package/ifupdown-scripts: add openrc support
From: Carlos Santos <[email protected]>
Currently if we set BR2_SYSTEM_DHCP but don't select netifrc nothing happens, which is a bit confusing.
Adapt ifupdown-scripts to support the BR2_SYSTEM_DHCP config with openrc, so we don't need to depend on netifrc.
Carlos Santos (3):
package/ifupdown-scripts: always install /etc/network/nfs_check package/ifupdown-scripts: relocate the generation the interfaces file package/ifupdown-scripts: add openrc support
package/ifupdown-scripts/Config.in | 2 +- package/ifupdown-scripts/ifupdown-scripts.mk | 31 ++++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-)
Signature · 1 line
2.18.2
PATCH 1/3 package/ifupdown-scripts: always install /etc/network/nfs_check
From: Carlos Santos <[email protected]>
The script is minuscle and can be useful to configure an interface via DHCP at run-time.
--- package/ifupdown-scripts/ifupdown-scripts.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
package/ifupdown-scripts/ifupdown-scripts.mk +2 -3
@@ -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)
Signature · 1 line
2.18.2
Yann E. MORIN
AppliedPATCH 1/3 package/ifupdown-scripts: always install /etc/network/nfs_check
Carlos, All,
On 2020-03-08 23:50 -0300, unixmania at gmail.com spake thusly:
Quoted 6 lines
From: Carlos Santos <[email protected]>
The script is minuscle and can be useful to configure an interface via DHCP at run-time.
Signed-off-by Carlos Santos <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 31 lines
--- package/ifupdown-scripts/ifupdown-scripts.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)package/ifupdown-scripts/ifupdown-scripts.mk +2
-3@@ -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)Signature · 6 lines
2.18.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/3 package/ifupdown-scripts: relocate the generation the interfaces file
In reply to unixmania at gmail.comFrom: Carlos Santos <[email protected]>
Generate it in the IFUPDOWN_SCRIPTS_INSTALL_INIT_<FOO> hook. This will allow creating a file to configure an interface via DHCP for the openrc network service, in a forthcoming change.
--- package/ifupdown-scripts/ifupdown-scripts.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
package/ifupdown-scripts/ifupdown-scripts.mk +4 -2
@@ -32,13 +32,13 @@ define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS $(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) endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef # ifupdown-scripts can not be selected when systemd-networkd is
@@ -47,6 +47,8 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef $(eval $(generic-package))
Signature · 1 line
2.18.2
Yann E. MORIN
AppliedPATCH 2/3 package/ifupdown-scripts: relocate the generation the interfaces file
Carlos, All,
On 2020-03-08 23:50 -0300, unixmania at gmail.com spake thusly:
Quoted 7 lines
From: Carlos Santos <[email protected]>
Generate it in the IFUPDOWN_SCRIPTS_INSTALL_INIT_<FOO> hook. This will allow creating a file to configure an interface via DHCP for the openrc network service, in a forthcoming change.
Signed-off-by Carlos Santos <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 40 lines
--- package/ifupdown-scripts/ifupdown-scripts.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)package/ifupdown-scripts/ifupdown-scripts.mk +4
-2@@ -32,13 +32,13 @@ define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS $(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) endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef # ifupdown-scripts can not be selected when systemd-networkd is@@ -47,6 +47,8 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef $(eval $(generic-package))Signature · 6 lines
2.18.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/3 package/ifupdown-scripts: add openrc support
In reply to unixmania at gmail.comFrom: Carlos Santos <[email protected]>
The "network" script allows configuring an interface by means of two /etc/ifup.<if_name> and /etc/ifdown.<if_name> files with the commands required to bring it up and down, respectively. So we can support the BR2_SYSTEM_DHCP config if netifrc is not selected.
- Replace the dependency on !BR2_PACKAGE_OPENRC in Config.in by a dependency on !BR2_PACKAGE_NETIFRC.
- Add an IFUPDOWN_SCRIPTS_PREAMBLE macro to create an empty interfaces file.
- Make the IFUPDOWN_SCRIPTS_LOCALHOST macro append the "lo" setup to the interfaces file.
- Add an IFUPDOWN_SCRIPTS_DHCP_OPENRC macro to create the ifup.<if_name> and ifdown.<if_name> files.
- Add an IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC hook that includes the IFUPDOWN_SCRIPTS_{PREAMBLE,DHCP,DHCP_OPENRC} macros. LOCALHOST is not required, since "lo" is configured by the "loopback" script.
--- package/ifupdown-scripts/Config.in | 2 +- package/ifupdown-scripts/ifupdown-scripts.mk | 22 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-)
package/ifupdown-scripts/Config.in +1 -1
@@ -1,7 +1,7 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" default y if BR2_ROOTFS_SKELETON_DEFAULT - depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC help Set of scripts used by ifupdown (either the standalone one, or the busybox one) to bring network up, or tear it down.
package/ifupdown-scripts/ifupdown-scripts.mk +20 -2
@@ -4,13 +4,17 @@ # ################################################################################ +define IFUPDOWN_SCRIPTS_PREAMBLE + echo "# interface file auto-generated by buildroot" \ + > $(TARGET_DIR)/etc/network/interfaces +endef + define IFUPDOWN_SCRIPTS_LOCALHOST ( \ - echo "# interface file auto-generated by buildroot"; \ echo ; \ echo "auto lo"; \ echo "iface lo inet loopback"; \ - ) > $(TARGET_DIR)/etc/network/interfaces + ) >> $(TARGET_DIR)/etc/network/interfaces endef IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
@@ -26,6 +30,12 @@ define IFUPDOWN_SCRIPTS_DHCP echo " hostname \$$(hostname)"; \ ) >> $(TARGET_DIR)/etc/network/interfaces endef +define IFUPDOWN_SCRIPTS_DHCP_OPENRC + echo "ifup $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifup.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) + echo "ifdown $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifdown.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) +endef endif define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
@@ -34,9 +44,16 @@ define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS $(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network) endef +define IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC + $(IFUPDOWN_SCRIPTS_PREAMBLE) + $(IFUPDOWN_SCRIPTS_DHCP) + $(IFUPDOWN_SCRIPTS_DHCP_OPENRC) +endef + define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_LOCALHOST) $(IFUPDOWN_SCRIPTS_DHCP) endef
@@ -47,6 +64,7 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_LOCALHOST) $(IFUPDOWN_SCRIPTS_DHCP) endef
Signature · 1 line
2.18.2
PATCH 3/3 package/ifupdown-scripts: add openrc support
CarloS< All,
On 2020-03-08 23:50 -0300, [email protected] spake thusly:
Quoted 7 lines
From: Carlos Santos <[email protected]>
The "network" script allows configuring an interface by means of two /etc/ifup.<if_name> and /etc/ifdown.<if_name> files with the commands required to bring it up and down, respectively. So we can support the
BR2_SYSTEM_DHCPconfig if netifrc is not selected.
Quoted 5 lines
- Replace the dependency on !BR2_PACKAGE_OPENRC in Config.in by a dependency on !BR2_PACKAGE_NETIFRC.
- Add an
IFUPDOWN_SCRIPTS_PREAMBLEmacro to create an empty interfaces file.
I've split that to its own patch. Thus, the patch adding openrc support is smaller and more self-contained.
Thanks for your work on OpenRC, it's nice to see someone taking care of it :-) Now, if we could have even more runtime test of it (network, etc..) that would be even better! ;-]
Regards,
Yann E. MORIN.
Quoted 98 lines
- Make the
IFUPDOWN_SCRIPTS_LOCALHOSTmacro append the "lo" setup to the interfaces file.- Add an
IFUPDOWN_SCRIPTS_DHCP_OPENRCmacro to create the ifup.<if_name> and ifdown.<if_name> files.- Add an
IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRChook that includes the IFUPDOWN_SCRIPTS_{PREAMBLE,DHCP,DHCP_OPENRC} macros. LOCALHOST is not required, since "lo" is configured by the "loopback" script.Signed-off-by Carlos Santos <[email protected]>--- package/ifupdown-scripts/Config.in | 2 +- package/ifupdown-scripts/ifupdown-scripts.mk | 22 ++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-)package/ifupdown-scripts/Config.in +1
-1@@ -1,7 +1,7 @@ config BR2_PACKAGE_IFUPDOWN_SCRIPTS bool "ifupdown scripts" default y if BR2_ROOTFS_SKELETON_DEFAULT - depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_OPENRC + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD && !BR2_PACKAGE_NETIFRC help Set of scripts used by ifupdown (either the standalone one, or the busybox one) to bring network up, or tear it down.package/ifupdown-scripts/ifupdown-scripts.mk +20
-2@@ -4,13 +4,17 @@ # ################################################################################ +define IFUPDOWN_SCRIPTS_PREAMBLE + echo "# interface file auto-generated by buildroot" \ + > $(TARGET_DIR)/etc/network/interfaces +endef + define IFUPDOWN_SCRIPTS_LOCALHOST ( \ - echo "# interface file auto-generated by buildroot"; \ echo ; \ echo "auto lo"; \ echo "iface lo inet loopback"; \ - ) > $(TARGET_DIR)/etc/network/interfaces + ) >> $(TARGET_DIR)/etc/network/interfaces endef IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))@@ -26,6 +30,12 @@ define IFUPDOWN_SCRIPTS_DHCP echo " hostname \$$(hostname)"; \ ) >> $(TARGET_DIR)/etc/network/interfaces endef +define IFUPDOWN_SCRIPTS_DHCP_OPENRC + echo "ifup $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifup.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) + echo "ifdown $(IFUPDOWN_SCRIPTS_DHCP_IFACE)" \ + > $(TARGET_DIR)/etc/ifdown.$(IFUPDOWN_SCRIPTS_DHCP_IFACE) +endef endif define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS@@ -34,9 +44,16 @@ define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS $(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network) endef +define IFUPDOWN_SCRIPTS_INSTALL_INIT_OPENRC + $(IFUPDOWN_SCRIPTS_PREAMBLE) + $(IFUPDOWN_SCRIPTS_DHCP) + $(IFUPDOWN_SCRIPTS_DHCP_OPENRC) +endef + define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_LOCALHOST) $(IFUPDOWN_SCRIPTS_DHCP) endef@@ -47,6 +64,7 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_PREAMBLE) $(IFUPDOWN_SCRIPTS_LOCALHOST) $(IFUPDOWN_SCRIPTS_DHCP) endefSignature · 6 lines
2.18.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'