diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-10-05 11:32:28 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-10-05 11:32:28 +0200 |
| commit | 41def4c27d8eb859ace91c00eefa915dbb4c38fc (patch) | |
| tree | d128906ed2071c85d10f3c2a466f90062eee27c4 | |
| parent | d2e69f4a4a54cf63e57c672919a2e714eb601d36 (diff) | |
| download | archiso32-41def4c27d8eb859ace91c00eefa915dbb4c38fc.tar.xz | |
Run dhcpcd on all devices
As we did with initscripts, run dhcpcd on all devices and not just eth0.
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
| -rwxr-xr-x | configs/releng/build.sh | 2 | ||||
| -rw-r--r-- | configs/releng/root-image/etc/conf.d/dhcpcd | 6 | ||||
| -rw-r--r-- | configs/releng/root-image/etc/systemd/system/dhcpcd.service | 13 |
3 files changed, 14 insertions, 7 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0d93ccd..3601dff 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -194,7 +194,7 @@ make_customize_root_image() { -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd@.service || true' \ + -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd.service || true' \ run : > ${work_dir}/build.${FUNCNAME} fi diff --git a/configs/releng/root-image/etc/conf.d/dhcpcd b/configs/releng/root-image/etc/conf.d/dhcpcd deleted file mode 100644 index 76b56ff..0000000 --- a/configs/releng/root-image/etc/conf.d/dhcpcd +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-qb" - diff --git a/configs/releng/root-image/etc/systemd/system/dhcpcd.service b/configs/releng/root-image/etc/systemd/system/dhcpcd.service new file mode 100644 index 0000000..dd030d5 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on all interfaces +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd.pid +ExecStart=/sbin/dhcpcd -A -b -q +ExecStop=/sbin/dhcpcd -k + +[Install] +WantedBy=multi-user.target |