ungleich-public/cdist
ungleich-public
/
cdist
7
3
Fork 11
Code Issues 57 Pull Requests 15 Projects Releases Wiki Activity

[type/__interface_ifupdown.d] Require base interfaces file first

This commit is contained in:
Dennis Camera 2021-02-01 22:26:15 +01:00
parent 5866dda7c7
commit 3a65e5f361
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cdist/conf/type/__interface_ifupdown.d/manifest
View File

@ -1,6 +1,6 @@
#!/bin/sh -e
#
# 2020 Dennis Camera (dennis.camera@ssrq-sds-fds.ch)
# 2020-2021 Dennis Camera (dennis.camera@ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
@ -98,6 +98,7 @@ in
# The /etc/network/interfaces file is overwritten with a basic example.
__file "${INTERFACES_FILE}" --state present --owner root --mode 0644 \
--source "${__type}/files/interfaces"
export require="__file${INTERFACES_FILE}"
else
# If state is present and IFUPDOWND_LEAVE_EXISTING_CONFIG is set,
# ensure that the interfaces.d directory is sourced in the main
@ -106,6 +107,7 @@ in
--file "${INTERFACES_FILE}" \
--before '^#?[:blank:]*(auto|no-auto-down|no-scripts|allow-|iface|mapping|rename|source|source-directory)|^#[[:blank:]]*The .* interface$' \
--line "source ${INTERFACES_D_PATH}/*"
export require="__line${INTERFACES_FILE}:source_interfaces.d"
fi
__directory "${INTERFACES_D_PATH}" --state pre-exists \