diff options
| author | Jonathan Bauer | 2019-09-18 13:56:34 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-09-18 13:56:34 +0200 |
| commit | 85b9220e2a88c5cb7cdf061f6670483105b939d6 (patch) | |
| tree | c65d626c7e02887ec23de1929884c1b9cb049108 | |
| parent | build-initramfs.sh: remove dep warning for fuse (diff) | |
| download | systemd-init-85b9220e2a88c5cb7cdf061f6670483105b939d6.tar.gz systemd-init-85b9220e2a88c5cb7cdf061f6670483105b939d6.tar.xz systemd-init-85b9220e2a88c5cb7cdf061f6670483105b939d6.zip | |
build-initramfs.sh: minor code ordering
| -rwxr-xr-x | builder/build-initramfs.sh | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 9002105f..92d329b3 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -531,24 +531,6 @@ main() { `main` ' exceptions.activate - # region sanity check kernel version and qcow handler - # if no kernel was specified as dracut argument, use the running kernel's version - logging.info "Building for:" - if [ -z "$kernel_version" ]; then - kernel_version="$(uname -r)" - fi - logging.info " * kernel version: $kernel_version" - # similar for kernel headers needed to compile dnbd3 against. - if [ -z "$kernel_headers" ]; then - kernel_headers="/lib/modules/${kernel_version}/build" - fi - if [ ! -f "${kernel_headers}/Makefile" ]; then - logging.critical 'Missing core dependency "linux-headers" for version to compile against given or current kernel.' - fi - logging.info " * kernel headers: $kernel_headers" - [ -n "$qcow_handler" ] && logging.info " * qcow2 handler: $qcow_handler" - export _QCOW_HANDLER="$qcow_handler" - # endregion # region dependency checks and command line parsing result=0 dependency_check core dependencies utils_dependency_check program || \ @@ -575,6 +557,25 @@ main() { utils_dependency_check_pkgconfig package || result=$? [[ $result == 1 ]] && exit $result # endregion + + # region sanity check kernel version and qcow handler + # if no kernel was specified as dracut argument, use the running kernel's version + logging.info "Building for:" + if [ -z "$kernel_version" ]; then + kernel_version="$(uname -r)" + fi + logging.info " * kernel version: $kernel_version" + # similar for kernel headers needed to compile dnbd3 against. + if [ -z "$kernel_headers" ]; then + kernel_headers="/lib/modules/${kernel_version}/build" + fi + if [ ! -f "${kernel_headers}/Makefile" ]; then + logging.critical 'Missing core dependency "linux-headers" for version to compile against given or current kernel.' + fi + logging.info " * kernel headers: $kernel_headers" + [ -n "$qcow_handler" ] && logging.info " * qcow2 handler: $qcow_handler" + # endregion + # region handle delegated operations to specified target if [[ "$target" != '' ]]; then _target="$target" |