diff options
| -rwxr-xr-x | builder/build-initramfs.sh | 40 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 4 |
2 files changed, 24 insertions, 20 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 28137603..8a6497f6 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -59,6 +59,7 @@ core.import change_root # region properties +dracut_resource_url='https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-043.tar.gz' file_path='/boot/initramfs.img' dracut_parameter='--force --no-hostonly' verbose='no' @@ -280,25 +281,28 @@ initialize_dracut() { # # >>> initialize_dracut # ... - mkdir --parents "$(dirname "${BASH_SOURCE[0]}")/dracut" - logging.info 'Download and extract dracut.' - curl --location \ - https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-043.tar.gz | \ - tar --extract --gzip --directory \ - "$(dirname "${BASH_SOURCE[0]}")/dracut" --strip-components 1 - pushd "$(dirname "${BASH_SOURCE[0]}")/dracut" - # NOTE: On virtualbox shared folder symlinks are not allowed. - # NOTE: make the dracut-install binary (dracut-install resolves - # dependencies etc.) - logging.info 'Compiling dracut.' - make install/dracut-install - # NOTE: We have to copy the binary to current instead of symlinking them - # since this feature isn't supported in shared virtual box machine folders. - # If symlinks would be available we could simply use: - # >>> make dracut-install + if [[ ! -f "$(dirname "${BASH_SOURCE[0]}")/dracut/install/dracut-install" ]] + then + mkdir --parents "$(dirname "${BASH_SOURCE[0]}")/dracut" + logging.info 'Download and extract dracut.' + curl --location "$dracut_resource_url" | tar --extract --gzip \ + --directory "$(dirname "${BASH_SOURCE[0]}")/dracut" \ + --strip-components 1 + pushd "$(dirname "${BASH_SOURCE[0]}")/dracut" + # NOTE: On virtualbox shared folder symlinks are not allowed. + # NOTE: make the dracut-install binary (dracut-install resolves + # dependencies etc.) + logging.info 'Compiling dracut.' + make install/dracut-install + # NOTE: We have to copy the binary to current instead of symlinking + # them since this feature isn't supported in shared virtual box machine + # folders. + # If symlinks would be available we could simply use: + # >>> make dracut-install + popd + fi cp "$(dirname "${BASH_SOURCE[0]}")/dracut/install/dracut-install" \ "$(dirname "${BASH_SOURCE[0]}")/dracut/dracut-install" - popd return $? } cleanup() { @@ -403,7 +407,7 @@ fi ## region handle dependencies which can be resolved automatically logging.info 'Checking dracut.' -if ! [[ -f "$(dirname "${BASH_SOURCE[0]}")/dracut/dracut-install" ]]; then +if [[ ! -f "$(dirname "${BASH_SOURCE[0]}")/dracut/dracut-install" ]]; then logging.info "Dracut isn't available yet loading it." initialize_dracut fi diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index a1514f91..081b641b 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -12,8 +12,8 @@ core.import utils #[[ ${dracut_args[$i]} == "--regenerate-all" ]] && \ #unset dracut_args[$i] #done -logging.set_log_level debug -logging.set_commands_log_level debug +logging.set_level debug +logging.set_commands_level debug core.import "$(core_abs_path "$(dirname "${BASH_SOURCE[0]}")/scripts/build.sh")" |