diff options
| author | Jonathan Bauer | 2018-03-07 15:23:28 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2018-03-07 15:23:28 +0100 |
| commit | b5a318989adea4efb9fdbab2ae4e6ff6282d766c (patch) | |
| tree | e44e1781f01d625b7ae959e145cccdae87d004a9 | |
| parent | [systemd-networkd-ext] strengthen vlan matching (diff) | |
| download | systemd-init-b5a318989adea4efb9fdbab2ae4e6ff6282d766c.tar.gz systemd-init-b5a318989adea4efb9fdbab2ae4e6ff6282d766c.tar.xz systemd-init-b5a318989adea4efb9fdbab2ae4e6ff6282d766c.zip | |
[systemd-networkd-ext] fix script when resolved
not installed in stage4
| -rw-r--r-- | builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh b/builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh index 1b5badc7..ec61616c 100644 --- a/builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh +++ b/builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh @@ -13,18 +13,21 @@ for UNIT in \ systemd-resolved.service do UNIT_PATH="$(systemctl show -p FragmentPath $UNIT | cut -c 14-)" + [ -z "${UNIT_PATH}" ] && continue mkdir -p "${NEWROOT}/${UNIT_PATH%/*}" cp "${UNIT_PATH}" "${NEWROOT}/${UNIT_PATH}" ln -sf "${UNIT_PATH}" "${NEWROOT_SYSINIT_TARGET_DIR}/${UNIT}" done -# this drop-in is needed to prevent a pull-in loop sysinit.target <-> basic.target -mkdir -p "${NEWROOT_SYSTEMD_DIR}/systemd-resolved.service.d/" -cat <<-EOF > "${NEWROOT_SYSTEMD_DIR}/systemd-resolved.service.d/00-no-default-deps.conf" - [Unit] - DefaultDependencies=no -EOF +if [ -e "${NEWROOT_SYSTEMD_DIR}/systemd-resolved.service" ]; then + # this drop-in is needed to prevent a pull-in loop sysinit.target <-> basic.target + mkdir -p "${NEWROOT_SYSTEMD_DIR}/systemd-resolved.service.d/" + cat <<-EOF > "${NEWROOT_SYSTEMD_DIR}/systemd-resolved.service.d/00-no-default-deps.conf" + [Unit] + DefaultDependencies=no + EOF -# finally make sure the NEWROOT resolv.conf links to the one managed by resolved. -rm "${NEWROOT}"/etc/resolv.conf -ln -s /run/systemd/resolve/resolv.conf "${NEWROOT}"/etc/resolv.conf + # finally make sure the NEWROOT resolv.conf links to the one managed by resolved. + rm "${NEWROOT}"/etc/resolv.conf + ln -s /run/systemd/resolve/resolv.conf "${NEWROOT}"/etc/resolv.conf +fi |