diff options
author | torben | 2015-12-11 15:32:02 +0100 |
---|---|---|
committer | torben | 2015-12-11 15:32:02 +0100 |
commit | e2358257220386f3687ddb5efaed8fdb746ddc5a (patch) | |
tree | 378a6ba2c1be61cd1f745456646b2081090eb0c1 /builder/build-initramfs.sh | |
parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
download | systemd-init-e2358257220386f3687ddb5efaed8fdb746ddc5a.tar.gz systemd-init-e2358257220386f3687ddb5efaed8fdb746ddc5a.tar.xz systemd-init-e2358257220386f3687ddb5efaed8fdb746ddc5a.zip |
Fix many paths which breaks installing from another directory than the
home of build-initramfs.sh
Diffstat (limited to 'builder/build-initramfs.sh')
-rwxr-xr-x | builder/build-initramfs.sh | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 1d48f5ef..ffbb55db 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -220,22 +220,24 @@ function build_initramfs_initialize_dracut() { # # >>> build_initramfs_initialize_dracut # ... - mkdir dracut + mkdir "$(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 dracut --strip-components 1 - pushd dracut + 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 + make "$(dirname "${BASH_SOURCE[0]}")/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 - cp install/dracut-install dracut-install + cp "$(dirname "${BASH_SOURCE[0]}")/install/dracut-install" \ + "$(dirname "${BASH_SOURCE[0]}")dracut-install" popd return $? } @@ -256,9 +258,10 @@ function build_initramfs_cleanup() { # Examples: # # >>> build_initramfs_cleanup - source dnbd3-rootfs/module-setup.sh - moddir="$(dirname "$(readlink --canonicalize \ - dnbd3-rootfs/module-setup.sh)")" + source "$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs/module-setup.sh" + moddir="$(dirname "${BASH_SOURCE[0]}")$(dirname "$(readlink \ + --canonicalize "$(dirname \ + "${BASH_SOURCE[0]}")dnbd3-rootfs/module-setup.sh")")" clean return $? } @@ -304,7 +307,9 @@ if [[ "$build_initramfs_target" != '' ]]; then build_initramfs__parameter_to_forward+=("$build_initramfs__parameter") fi done - fakeroot fakechroot chroot "${build_initramfs__target}" \ + # TODO check FAKECHROOT_CMD_SUBST + FAKECHROOT_CMD_SUBST=/usr/bin/ldconfig=/usr/bin/ldconfig fakeroot \ + fakechroot chroot "${build_initramfs__target}" \ "${build_initramfs__temporary_working_directory}/${BASH_SOURCE[0]}" \ ${build_initramfs__parameter_to_forward[*]} # TODO grap result from /boot/initramfs-test.img |