diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-07-02 16:35:50 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-04 23:38:18 +0200 |
| commit | 5fb1b867821b4e8968ca7f364196a5e67e80c436 (patch) | |
| tree | ca663804f556dc9058c8146c170d41ecc404f10b /package/systemd | |
| parent | caaff41ec168d4abe083eccebb534c555b816e66 (diff) | |
| download | buildroot-5fb1b867821b4e8968ca7f364196a5e67e80c436.tar.gz buildroot-5fb1b867821b4e8968ca7f364196a5e67e80c436.zip | |
package/ifupdown-scripts: new package
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-networkd is not enabled).
So, move those scripts to their own package.
To keep the current behaviour (before it is changed in future commits),
we make that package default to y, but depend on the default skeleton.
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: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[Thomas: drop empty IFUPDOWN_SCRIPTS_SOURCE]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/network.service | 21 | ||||
| -rw-r--r-- | package/systemd/systemd.mk | 8 |
2 files changed, 0 insertions, 29 deletions
diff --git a/package/systemd/network.service b/package/systemd/network.service deleted file mode 100644 index 0d77bb824a..0000000000 --- a/package/systemd/network.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Network Connectivity -Wants=network.target -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes - -# lo is brought up earlier, which will cause the upcoming "ifup -a" to fail -# with exit code 1, due to an "ip: RTNETLINK answers: File exists" error during -# its "ip addr add ..." command, subsequently causing this unit to fail even -# though it is a benign error. Flushing the lo address with the command below -# before ifup prevents this failure. -ExecStart=/sbin/ip addr flush dev lo - -ExecStart=/sbin/ifup -a -ExecStop=/sbin/ifdown -a - -[Install] -WantedBy=multi-user.target diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index f7894b28b4..94b8b96567 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -303,13 +303,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) @@ -401,7 +394,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 |

