* [Buildroot] [PATCH] package/ifupdown-scripts: new package
@ 2017-03-19 9:48 Yann E. MORIN
2017-03-19 14:02 ` Thomas Petazzoni
2017-03-19 22:18 ` Arnout Vandecappelle
0 siblings, 2 replies; 5+ messages in thread
From: Yann E. MORIN @ 2017-03-19 9:48 UTC (permalink / raw)
To: buildroot
The ifupdown scripts can be used independently of the init system, be it
sysv, busybox or systemd; they could even be used when there is no init
system (i.e. the user is providing his own).
Currently, those ifupdown scripts are bundled in the skeleton.
But we soon will have a skeleton specific to systemd, so we would be
missing those scripts (when systemd-networks is not enabled).
So, move those scripts to their own package.
This new package is selected by the various init systems that need it.
This means that, no longer being part of the skeleton but being selected
by the init systems, they are now available even when a custom skeleton
is used, like our initscripts are.
Previously, the systemd service was provided by systemd, while the syv
startup script was provided by initscripts. Both are moved to this new
ifupdown-scripts package for consistency with the other scripts. We
still intall the systemd service file because ifupdown-scripts cannot be
enabled when systemd-networkd is enabled.
Instead of being a target-finalize hook, the scripts are installed as
any other package are, with a package install-target command.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
package/Config.in | 1 +
package/ifupdown-scripts/Config.in | 11 +++++
.../init.d => ifupdown-scripts}/S40network | 0
package/ifupdown-scripts/ifupdown-scripts.mk | 57 ++++++++++++++++++++++
.../{systemd => ifupdown-scripts}/network.service | 0
.../ifupdown-scripts/network/if-down.d}/.empty | 0
.../network/if-post-down.d/.empty | 0
.../network/if-pre-up.d/wait_iface | 0
.../ifupdown-scripts/network/if-up.d}/.empty | 0
package/{skeleton => ifupdown-scripts}/nfs_check | 0
package/ifupdown/Config.in | 1 +
package/skeleton/skeleton.mk | 33 -------------
package/systemd/Config.in | 6 +++
package/systemd/systemd.mk | 8 ---
system/Config.in | 1 +
15 files changed, 77 insertions(+), 41 deletions(-)
create mode 100644 package/ifupdown-scripts/Config.in
rename package/{initscripts/init.d => ifupdown-scripts}/S40network (100%)
create mode 100644 package/ifupdown-scripts/ifupdown-scripts.mk
rename package/{systemd => ifupdown-scripts}/network.service (100%)
rename {system/skeleton/etc/network/if-up.d => package/ifupdown-scripts/network/if-down.d}/.empty (100%)
rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-post-down.d/.empty (100%)
rename {system/skeleton/etc => package/ifupdown-scripts}/network/if-pre-up.d/wait_iface (100%)
rename {system/skeleton/etc/network/if-down.d => package/ifupdown-scripts/network/if-up.d}/.empty (100%)
rename package/{skeleton => ifupdown-scripts}/nfs_check (100%)
diff --git a/package/Config.in b/package/Config.in
index 52b4f36..fb7b510 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1542,6 +1542,7 @@ menu "Networking applications"
source "package/ifplugd/Config.in"
source "package/iftop/Config.in"
source "package/ifupdown/Config.in"
+ source "package/ifupdown-scripts/Config.in"
source "package/igd2-for-linux/Config.in"
source "package/igh-ethercat/Config.in"
source "package/igmpproxy/Config.in"
diff --git a/package/ifupdown-scripts/Config.in b/package/ifupdown-scripts/Config.in
new file mode 100644
index 0000000..0ba405e
--- /dev/null
+++ b/package/ifupdown-scripts/Config.in
@@ -0,0 +1,11 @@
+# Package automatically enabled by the selected init-system,
+# either busybox, sysv-init or systemd (w/o networkd).
+# We use a little trick to hide the package when not available,
+# but still show it when needed (except it is forced in this case)
+
+config BR2_PACKAGE_IFUPDOWN_SCRIPTS
+ bool
+ select BR2_PACKAGE_IFUPDOWN_SCRIPTS_DUMMY
+
+config BR2_PACKAGE_IFUPDOWN_SCRIPTS_DUMMY
+ bool "ifupdown-scripts" if BR2_PACKAGE_IFUPDOWN_SCRIPTS
diff --git a/package/initscripts/init.d/S40network b/package/ifupdown-scripts/S40network
similarity index 100%
rename from package/initscripts/init.d/S40network
rename to package/ifupdown-scripts/S40network
diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk
new file mode 100644
index 0000000..fc58e0b
--- /dev/null
+++ b/package/ifupdown-scripts/ifupdown-scripts.mk
@@ -0,0 +1,57 @@
+################################################################################
+#
+# ifupdown-scripts
+#
+################################################################################
+
+IFUPDOWN_SCRIPTS_SOURCE =
+
+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
+endef
+
+IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
+
+ifneq ($(IFUPDOWN_SCRIPTS_DHCP_IFACE),)
+define IFUPDOWN_SCRIPTS_DHCP
+ ( \
+ echo ; \
+ echo "auto $(IFUPDOWN_SCRIPTS_DHCP_IFACE)"; \
+ echo "iface $(IFUPDOWN_SCRIPTS_DHCP_IFACE) inet dhcp"; \
+ echo " pre-up /etc/network/nfs_check"; \
+ echo " wait-delay 15"; \
+ ) >> $(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
+ cp -a $(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
+endef
+
+# ifupdown-scripts can not be selected when systemd-networkd is
+# enabled, so if we are enabled with systemd, we must install our
+# own service file.
+define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD
+ $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \
+ $(TARGET_DIR)/etc/systemd/system/network.service
+ mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+ ln -fs ../network.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
+endef
+
+$(eval $(generic-package))
diff --git a/package/systemd/network.service b/package/ifupdown-scripts/network.service
similarity index 100%
rename from package/systemd/network.service
rename to package/ifupdown-scripts/network.service
diff --git a/system/skeleton/etc/network/if-up.d/.empty b/package/ifupdown-scripts/network/if-down.d/.empty
similarity index 100%
rename from system/skeleton/etc/network/if-up.d/.empty
rename to package/ifupdown-scripts/network/if-down.d/.empty
diff --git a/system/skeleton/etc/network/if-post-down.d/.empty b/package/ifupdown-scripts/network/if-post-down.d/.empty
similarity index 100%
rename from system/skeleton/etc/network/if-post-down.d/.empty
rename to package/ifupdown-scripts/network/if-post-down.d/.empty
diff --git a/system/skeleton/etc/network/if-pre-up.d/wait_iface b/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
similarity index 100%
rename from system/skeleton/etc/network/if-pre-up.d/wait_iface
rename to package/ifupdown-scripts/network/if-pre-up.d/wait_iface
diff --git a/system/skeleton/etc/network/if-down.d/.empty b/package/ifupdown-scripts/network/if-up.d/.empty
similarity index 100%
rename from system/skeleton/etc/network/if-down.d/.empty
rename to package/ifupdown-scripts/network/if-up.d/.empty
diff --git a/package/skeleton/nfs_check b/package/ifupdown-scripts/nfs_check
similarity index 100%
rename from package/skeleton/nfs_check
rename to package/ifupdown-scripts/nfs_check
diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in
index e683201..74be59f 100644
--- a/package/ifupdown/Config.in
+++ b/package/ifupdown/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_IFUPDOWN
# Default/our uclibc lacks wordexp()
depends on !BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+ select BR2_PACKAGE_IFUPDOWN_SCRIPTS
# runtime for ip binary
select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
# runtime for run-parts
diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
index 1000161..7bdae55 100644
--- a/package/skeleton/skeleton.mk
+++ b/package/skeleton/skeleton.mk
@@ -145,39 +145,6 @@ endef
TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE
endif
-define SKELETON_SET_NETWORK_LOCALHOST
- ( \
- echo "# interface file auto-generated by buildroot"; \
- echo ; \
- echo "auto lo"; \
- echo "iface lo inet loopback"; \
- ) > $(TARGET_DIR)/etc/network/interfaces
-endef
-
-SKELETON_NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
-
-ifneq ($(SKELETON_NETWORK_DHCP_IFACE),)
-define SKELETON_SET_NETWORK_DHCP
- ( \
- echo ; \
- echo "auto $(SKELETON_NETWORK_DHCP_IFACE)"; \
- echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp"; \
- echo " pre-up /etc/network/nfs_check"; \
- echo " wait-delay 15"; \
- ) >> $(TARGET_DIR)/etc/network/interfaces
- $(INSTALL) -m 0755 -D $(SKELETON_PKGDIR)/nfs_check \
- $(TARGET_DIR)/etc/network/nfs_check
-endef
-endif
-
-define SKELETON_SET_NETWORK
- mkdir -p $(TARGET_DIR)/etc/network/
- $(SKELETON_SET_NETWORK_LOCALHOST)
- $(SKELETON_SET_NETWORK_DHCP)
-endef
-
-TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK
-
ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y)
ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),)
SKELETON_ROOT_PASSWORD =
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index aaed7dc..0e083b9 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -209,6 +209,12 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD
http://www.freedesktop.org/software/systemd/man/systemd-networkd.html
+config BR2_PACKAGE_SYSTEMD_IFUPDOWN_SCRIPTS
+ bool
+ default y
+ depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
+ select BR2_PACKAGE_IFUPDOWN_SCRIPTS
+
config BR2_PACKAGE_SYSTEMD_POLKIT
bool "enable polkit support"
select BR2_PACKAGE_POLKIT
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 0d2f416..f0f1cc5 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -297,13 +297,6 @@ endef
endif
else
SYSTEMD_CONF_OPTS += --disable-networkd
-define SYSTEMD_INSTALL_SERVICE_NETWORK
- $(INSTALL) -D -m 644 package/systemd/network.service \
- $(TARGET_DIR)/etc/systemd/system/network.service
- mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
- ln -fs ../network.service \
- $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
-endef
endif
ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
@@ -395,7 +388,6 @@ endif
define SYSTEMD_INSTALL_INIT_SYSTEMD
$(SYSTEMD_DISABLE_SERVICE_TTY1)
$(SYSTEMD_INSTALL_SERVICE_TTY)
- $(SYSTEMD_INSTALL_SERVICE_NETWORK)
$(SYSTEMD_INSTALL_SERVICE_TIMESYNC)
$(SYSTEMD_INSTALL_NETWORK_CONFS)
endef
diff --git a/system/Config.in b/system/Config.in
index 3ddf843..4fc037b 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -103,6 +103,7 @@ config BR2_INIT_BUSYBOX
bool "BusyBox"
select BR2_PACKAGE_BUSYBOX
select BR2_PACKAGE_INITSCRIPTS
+ select BR2_PACKAGE_IFUPDOWN_SCRIPTS
config BR2_INIT_SYSV
bool "systemV"
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH] package/ifupdown-scripts: new package
2017-03-19 9:48 [Buildroot] [PATCH] package/ifupdown-scripts: new package Yann E. MORIN
@ 2017-03-19 14:02 ` Thomas Petazzoni
2017-03-19 17:06 ` Yann E. MORIN
2017-03-19 22:18 ` Arnout Vandecappelle
1 sibling, 1 reply; 5+ messages in thread
From: Thomas Petazzoni @ 2017-03-19 14:02 UTC (permalink / raw)
To: buildroot
Hello,
Looks good to me overall. A couple of questions/comments below.
On Sun, 19 Mar 2017 10:48:14 +0100, Yann E. MORIN wrote:
> The ifupdown scripts can be used independently of the init system, be it
> sysv, busybox or systemd; they could even be used when there is no init
> system (i.e. the user is providing his own).
>
> Currently, those ifupdown scripts are bundled in the skeleton.
>
> But we soon will have a skeleton specific to systemd, so we would be
> missing those scripts (when systemd-networks is not enabled).
>
> So, move those scripts to their own package.
>
> This new package is selected by the various init systems that need it.
> This means that, no longer being part of the skeleton but being selected
> by the init systems, they are now available even when a custom skeleton
> is used, like our initscripts are.
>
> Previously, the systemd service was provided by systemd, while the syv
> startup script was provided by initscripts. Both are moved to this new
> ifupdown-scripts package for consistency with the other scripts. We
> still intall the systemd service file because ifupdown-scripts cannot be
> enabled when systemd-networkd is enabled.
>
> Instead of being a target-finalize hook, the scripts are installed as
> any other package are, with a package install-target command.
Do we know why we were doing this in a target-finalize hook? After all,
skeleton is also a package, so it could also have done this stuff in
its install-target command. Is it simply a legacy of the time where
this was done outside of the skeleton package? Or did we have a true
reason to use a target finalize hook?
> +# Package automatically enabled by the selected init-system,
> +# either busybox, sysv-init or systemd (w/o networkd).
> +# We use a little trick to hide the package when not available,
> +# but still show it when needed (except it is forced in this case)
> +
> +config BR2_PACKAGE_IFUPDOWN_SCRIPTS
> + bool
> + select BR2_PACKAGE_IFUPDOWN_SCRIPTS_DUMMY
> +
> +config BR2_PACKAGE_IFUPDOWN_SCRIPTS_DUMMY
> + bool "ifupdown-scripts" if BR2_PACKAGE_IFUPDOWN_SCRIPTS
I don't understand why we want this trick. Just make this package a
hidden package, and that's it. The skeleton package is also hidden, and
it works just fine.
> +config BR2_PACKAGE_SYSTEMD_IFUPDOWN_SCRIPTS
> + bool
> + default y
> + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
> + select BR2_PACKAGE_IFUPDOWN_SCRIPTS
What about replacing this with:
select BR2_PACKAGE_IFUPDOWN_SCRIPTS if !BR2_PACKAGE_SYSTEMD_NETWORKD
on the main BR2_PACKAGE_SYSTEMD option?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/ifupdown-scripts: new package
2017-03-19 14:02 ` Thomas Petazzoni
@ 2017-03-19 17:06 ` Yann E. MORIN
0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2017-03-19 17:06 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2017-03-19 15:02 +0100, Thomas Petazzoni spake thusly:
> Looks good to me overall. A couple of questions/comments below.
>
> On Sun, 19 Mar 2017 10:48:14 +0100, Yann E. MORIN wrote:
> > The ifupdown scripts can be used independently of the init system, be it
> > sysv, busybox or systemd; they could even be used when there is no init
> > system (i.e. the user is providing his own).
> >
> > Currently, those ifupdown scripts are bundled in the skeleton.
> >
> > But we soon will have a skeleton specific to systemd, so we would be
> > missing those scripts (when systemd-networks is not enabled).
> >
> > So, move those scripts to their own package.
> >
> > This new package is selected by the various init systems that need it.
> > This means that, no longer being part of the skeleton but being selected
> > by the init systems, they are now available even when a custom skeleton
> > is used, like our initscripts are.
> >
> > Previously, the systemd service was provided by systemd, while the syv
> > startup script was provided by initscripts. Both are moved to this new
> > ifupdown-scripts package for consistency with the other scripts. We
> > still intall the systemd service file because ifupdown-scripts cannot be
> > enabled when systemd-networkd is enabled.
> >
> > Instead of being a target-finalize hook, the scripts are installed as
> > any other package are, with a package install-target command.
>
> Do we know why we were doing this in a target-finalize hook? After all,
> skeleton is also a package, so it could also have done this stuff in
> its install-target command. Is it simply a legacy of the time where
> this was done outside of the skeleton package? Or did we have a true
> reason to use a target finalize hook?
In 7a6b83a2 (skeleton: New package), those settings were moved into the
skeleton package, from system/system.mk where they were indeed defined
as target-finalize hooks.
So yes, historical reasons.
> > +# Package automatically enabled by the selected init-system,
> > +# either busybox, sysv-init or systemd (w/o networkd).
> > +# We use a little trick to hide the package when not available,
> > +# but still show it when needed (except it is forced in this case)
> > +
> > +config BR2_PACKAGE_IFUPDOWN_SCRIPTS
> > + bool
> > + select BR2_PACKAGE_IFUPDOWN_SCRIPTS_DUMMY
> > +
> > +config BR2_PACKAGE_IFUPDOWN_SCRIPTS_DUMMY
> > + bool "ifupdown-scripts" if BR2_PACKAGE_IFUPDOWN_SCRIPTS
>
> I don't understand why we want this trick. Just make this package a
> hidden package, and that's it. The skeleton package is also hidden, and
> it works just fine.
Hmm... Not sure why I did that (it was 9 months ago)... Fixed.
> > +config BR2_PACKAGE_SYSTEMD_IFUPDOWN_SCRIPTS
> > + bool
> > + default y
> > + depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
> > + select BR2_PACKAGE_IFUPDOWN_SCRIPTS
>
> What about replacing this with:
>
> select BR2_PACKAGE_IFUPDOWN_SCRIPTS if !BR2_PACKAGE_SYSTEMD_NETWORKD
>
> on the main BR2_PACKAGE_SYSTEMD option?
Yep, works too. Fixed.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/ifupdown-scripts: new package
2017-03-19 9:48 [Buildroot] [PATCH] package/ifupdown-scripts: new package Yann E. MORIN
2017-03-19 14:02 ` Thomas Petazzoni
@ 2017-03-19 22:18 ` Arnout Vandecappelle
2017-06-04 12:55 ` Yann E. MORIN
1 sibling, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2017-03-19 22:18 UTC (permalink / raw)
To: buildroot
On 19-03-17 10:48, Yann E. MORIN wrote:
> The ifupdown scripts can be used independently of the init system, be it
> sysv, busybox or systemd; they could even be used when there is no init
> system (i.e. the user is providing his own).
>
> Currently, those ifupdown scripts are bundled in the skeleton.
>
> But we soon will have a skeleton specific to systemd, so we would be
> missing those scripts (when systemd-networks is not enabled).
>
> So, move those scripts to their own package.
>
> This new package is selected by the various init systems that need it.
I'd like to challenge this one.
This package basically populates /etc/network with the ifupdown scripts. IMO
the ifupdown scripts have nothing to do with the init system, they only have
something to do with the network management system. We have (I think) 6
different network management systems:
- busybox ifupdown
- ifupdown
- systemd-networkd
- s6-networking
- network-manager
- connman
As far as I understand, only the first two use /etc/network (I'm not sure if
/etc/network is still needed for the lo interface with network-manager and
connman, and I know nothing about s6-networking). On the other hand, even if
ifupdown is used, you may have custom scripts and not need this package. And
when you use e.g. network-manager, it doesn't hurt to also have /etc/network
scripts installed. (Ideally I should have checked this of course, to see if both
lo and eth0 come up if no /etc/network is installed but network-manager is
running...)
Therefore, I would propose to make the package freely selectable, i.e. not
selected by nor depend on anything. Perhaps the only exception is that we want
to depend on !BR2_PACKAGE_SYSTEMD_NETWORKD because the two systemd services will
slightly conflict with each other (actually I don't think they will...).
Maybe I'm wrong and S40networking is still needed for the lo interface, or
network-manager still uses the scripts in /etc/network/*.d. Even in that case, I
think one may want to enable this package e.g. when BR2_INIT_NONE - when you use
some custom init system, you still may want to call ifup to start the network.
In that case the init script won't be installed, but /etc/network is still relevant.
> This means that, no longer being part of the skeleton but being selected
> by the init systems, they are now available even when a custom skeleton
> is used, like our initscripts are.
>
> Previously, the systemd service was provided by systemd, while the syv
> startup script was provided by initscripts. Both are moved to this new
> ifupdown-scripts package for consistency with the other scripts. We
> still intall the systemd service file because ifupdown-scripts cannot be
> enabled when systemd-networkd is enabled.
>
> Instead of being a target-finalize hook, the scripts are installed as
> any other package are, with a package install-target command.
[snip]
> diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in
> index e683201..74be59f 100644
> --- a/package/ifupdown/Config.in
> +++ b/package/ifupdown/Config.in
> @@ -5,6 +5,7 @@ config BR2_PACKAGE_IFUPDOWN
> # Default/our uclibc lacks wordexp()
> depends on !BR2_TOOLCHAIN_USES_UCLIBC
> depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> + select BR2_PACKAGE_IFUPDOWN_SCRIPTS
Doesn't this lead to a circular dependency when BR2_PACKAGE_SYSTEMD_NETWORKD is
selected?
Also, I wonder why you do this for the ifupdown package, but not for busybox
ifupdown...
> # runtime for ip binary
> select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
> # runtime for run-parts
[snip]
> diff --git a/system/Config.in b/system/Config.in
> index 3ddf843..4fc037b 100644
> --- a/system/Config.in
> +++ b/system/Config.in
> @@ -103,6 +103,7 @@ config BR2_INIT_BUSYBOX
> bool "BusyBox"
> select BR2_PACKAGE_BUSYBOX
> select BR2_PACKAGE_INITSCRIPTS
> + select BR2_PACKAGE_IFUPDOWN_SCRIPTS
>
> config BR2_INIT_SYSV
> bool "systemV"
Even if you disagree with everything I wrote and keep things like you put them
now, the package should definitely also be selected when BR2_INIT_SYSV.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/ifupdown-scripts: new package
2017-03-19 22:18 ` Arnout Vandecappelle
@ 2017-06-04 12:55 ` Yann E. MORIN
0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2017-06-04 12:55 UTC (permalink / raw)
To: buildroot
Arnout, All,
Sorry to come back so late on this one...
On 2017-03-19 23:18 +0100, Arnout Vandecappelle spake thusly:
> On 19-03-17 10:48, Yann E. MORIN wrote:
> > The ifupdown scripts can be used independently of the init system, be it
> > sysv, busybox or systemd; they could even be used when there is no init
> > system (i.e. the user is providing his own).
> >
> > Currently, those ifupdown scripts are bundled in the skeleton.
> >
> > But we soon will have a skeleton specific to systemd, so we would be
> > missing those scripts (when systemd-networks is not enabled).
> >
> > So, move those scripts to their own package.
> >
> > This new package is selected by the various init systems that need it.
>
> I'd like to challenge this one.
[--SNIP--]
I see what you mean and where you're going, but as you can see in the
patch, it's not the init system that do the select, but really the
packages: ifupdown or systemd (without networkd).
The only init system that does the select is the busybox init system.,
when it should be the package that does it.
In that, the commit message is misleading; it should not mentikon init
systems at all. My bad. I'll rework the commit message.
> Therefore, I would propose to make the package freely selectable, i.e. not
> selected by nor depend on anything.
I disagree on that one: we want to have a default behaviour that just
work when busybox is selected as init system (and thus as the network
manager), or when ifupdown is selected as the network manager.
I'd like we also keep backward compatibility with existing defconfig
files, if at all possible.
> Perhaps the only exception is that we want
> to depend on !BR2_PACKAGE_SYSTEMD_NETWORKD because the two systemd services will
> slightly conflict with each other (actually I don't think they will...).
Yes, they would. At least, having both on my system somehow broke it.
I'd have to reproduce to be sure, though...
> Maybe I'm wrong and S40networking is still needed for the lo interface, or
> network-manager still uses the scripts in /etc/network/*.d. Even in that case, I
> think one may want to enable this package e.g. when BR2_INIT_NONE - when you use
> some custom init system, you still may want to call ifup to start the network.
> In that case the init script won't be installed, but /etc/network is still relevant.
So many things to test! ;-) Meh...
> > This means that, no longer being part of the skeleton but being selected
> > by the init systems, they are now available even when a custom skeleton
> > is used, like our initscripts are.
> >
> > Previously, the systemd service was provided by systemd, while the syv
> > startup script was provided by initscripts. Both are moved to this new
> > ifupdown-scripts package for consistency with the other scripts. We
> > still intall the systemd service file because ifupdown-scripts cannot be
> > enabled when systemd-networkd is enabled.
> >
> > Instead of being a target-finalize hook, the scripts are installed as
> > any other package are, with a package install-target command.
>
> [snip]
> > diff --git a/package/ifupdown/Config.in b/package/ifupdown/Config.in
> > index e683201..74be59f 100644
> > --- a/package/ifupdown/Config.in
> > +++ b/package/ifupdown/Config.in
> > @@ -5,6 +5,7 @@ config BR2_PACKAGE_IFUPDOWN
> > # Default/our uclibc lacks wordexp()
> > depends on !BR2_TOOLCHAIN_USES_UCLIBC
> > depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> > + select BR2_PACKAGE_IFUPDOWN_SCRIPTS
>
> Doesn't this lead to a circular dependency when BR2_PACKAGE_SYSTEMD_NETWORKD is
> selected?
>
> Also, I wonder why you do this for the ifupdown package, but not for busybox
> ifupdown...
Because there is not prompt for busybox ifupdown? Instead, we assume
that if Busybox is selected, then we would use its ifupdown incarnation.
But this is flawed, if one provides its own busybox config that does not
enable ifupdown. Not that this is fundamentally different than what we
currently do, anyway...
> > # runtime for ip binary
> > select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
> > # runtime for run-parts
> [snip]
> > diff --git a/system/Config.in b/system/Config.in
> > index 3ddf843..4fc037b 100644
> > --- a/system/Config.in
> > +++ b/system/Config.in
> > @@ -103,6 +103,7 @@ config BR2_INIT_BUSYBOX
> > bool "BusyBox"
> > select BR2_PACKAGE_BUSYBOX
> > select BR2_PACKAGE_INITSCRIPTS
> > + select BR2_PACKAGE_IFUPDOWN_SCRIPTS
> >
> > config BR2_INIT_SYSV
> > bool "systemV"
>
> Even if you disagree with everything I wrote and keep things like you put them
> now, the package should definitely also be selected when BR2_INIT_SYSV.
I don't think it should. It should only be selected by ifupdown.
Regards,
Yann E. MORIN.
> Regards,
> Arnout
>
>
> --
> Arnout Vandecappelle arnout at mind be
> Senior Embedded Software Architect +32-16-286500
> Essensium/Mind http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-04 12:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-19 9:48 [Buildroot] [PATCH] package/ifupdown-scripts: new package Yann E. MORIN
2017-03-19 14:02 ` Thomas Petazzoni
2017-03-19 17:06 ` Yann E. MORIN
2017-03-19 22:18 ` Arnout Vandecappelle
2017-06-04 12:55 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.