diff options
| author | Jonathan Bauer | 2016-07-29 14:08:40 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2016-07-29 14:08:40 +0200 |
| commit | 3dd91901102174b5d7690bab4bed6f67de2ee0ab (patch) | |
| tree | 4dfab1a07c3c32adc913b62ee36f118f096eb460 /builder | |
| parent | [dns] rudimentary module parsing dns, domain and hostname from kcl (diff) | |
| download | systemd-init-3dd91901102174b5d7690bab4bed6f67de2ee0ab.tar.gz systemd-init-3dd91901102174b5d7690bab4bed6f67de2ee0ab.tar.xz systemd-init-3dd91901102174b5d7690bab4bed6f67de2ee0ab.zip | |
add dns by default in the build-initramfs logic
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/build-initramfs.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index ae00d5c0..7e2b4d63 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -43,13 +43,11 @@ if ! [[ -d "$_needed_location" ]]; then ' git submodule update --remote popd - cp --recursive \ - "${_temporary_repository_location}/builder/dnbd3-rootfs" \ - "$_needed_location" - # assume conf-tgz module is also missing - cp --recursive \ - "${_temporary_repository_location}/builder/conf-tgz" \ - "$(dirname "$_needed_location")/conf-tgz" + for mod in dnbd3-rootfs conf-tgz dns; do + cp --recursive \ + "${_temporary_repository_location}/builder/${mod}" \ + "$(dirname $_needed_location)/${mod}" + done rm --recursive --force "$_temporary_repository_location" fi set +o errexit @@ -554,8 +552,8 @@ main() { initialize_dracut fi - declare -A _dracut_modules=( [dnbd3]='../../dnbd3-rootfs' [conf]='../../conf-tgz' ) - for mod in dnbd3 conf; do + declare -A _dracut_modules=( [dnbd3]='../../dnbd3-rootfs' [conf]='../../conf-tgz' [dns]='../../dns' ) + for mod in dnbd3 conf dns; do _dracut_modules_source="${_dracut_modules[$mod]}" _dracut_modules_target="$(dirname "${BASH_SOURCE[0]}")/dracut/modules.d/90$(basename "${_dracut_modules[$mod]}")" if [[ ! -L "$_dracut_modules_target" || "$(readlink \ @@ -579,7 +577,7 @@ main() { if [ "$verbose" == 'yes' ]; then _loglevel='--verbose' fi - _modules='dnbd3-rootfs conf-tgz' + _modules='dnbd3-rootfs conf-tgz dns' if [ "$debug" == 'yes' ]; then _loglevel="$_loglevel --stdlog 4" _modules="$_modules i18n terminfo" |
