diff options
| author | jandob | 2016-01-28 14:34:34 +0100 |
|---|---|---|
| committer | jandob | 2016-01-28 14:34:34 +0100 |
| commit | 2d50672a93f4aeb21db0512866a31fa82bd7f472 (patch) | |
| tree | f3565050738cc21429ba9d0041f9678094c9f204 /builder/dnbd3-rootfs | |
| parent | add dependencies (diff) | |
| parent | Add more centos support. (diff) | |
| download | systemd-init-2d50672a93f4aeb21db0512866a31fa82bd7f472.tar.gz systemd-init-2d50672a93f4aeb21db0512866a31fa82bd7f472.tar.xz systemd-init-2d50672a93f4aeb21db0512866a31fa82bd7f472.zip | |
merge
Diffstat (limited to 'builder/dnbd3-rootfs')
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 9798172f..dcc96766 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -28,12 +28,21 @@ check() { exceptions.activate # NOTE: xmount must be compiled before qemu_xmount - if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]] - then - build_compile_xmount "$moddir/binaries/xmount/" + if [[ ! -f "$moddir/binaries/xmount/trunk/build/src/xmount" ]]; then + if build_compile_xmount "$moddir/binaries/xmount/"; then + local xmount_was_successfull=true + else + local xmount_was_successfull=false + logging.warn \ + "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)." + fi fi - if [[ ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" ]]; then - build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" + if $xmount_was_successfull && [[ \ + ! -f "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \ + ]]; then + build_compile_qemu_xmount "$moddir/binaries/qemu-xmount/" || \ + logging.warn \ + "Compiling \"xmount\" fails. So we aren't able to support container files (only raw images)." fi if [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3.ko" ]] || \ [[ ! -f "$moddir/binaries/dnbd3/build/dnbd3-client" ]] |