summaryrefslogtreecommitdiffstats
path: root/builder/dnbd3-rootfs
diff options
context:
space:
mode:
authorjandob2016-02-29 15:34:55 +0100
committerjandob2016-02-29 15:34:55 +0100
commit0d67b20030a3a9f1d033a3fc37bc06d371b3b083 (patch)
tree17325f3fd9d30441d2c13dfc335e9a562acc483e /builder/dnbd3-rootfs
parentrestart dnbd3 service on failure (diff)
downloadsystemd-init-0d67b20030a3a9f1d033a3fc37bc06d371b3b083.tar.gz
systemd-init-0d67b20030a3a9f1d033a3fc37bc06d371b3b083.tar.xz
systemd-init-0d67b20030a3a9f1d033a3fc37bc06d371b3b083.zip
change xmount install prefix to /usr
Diffstat (limited to 'builder/dnbd3-rootfs')
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh2
-rw-r--r--builder/dnbd3-rootfs/scripts/build.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 7c516f6a..bbb5bce2 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -128,7 +128,7 @@ install() {
# xmount
local xmount_installation="$moddir/binaries/xmount/trunk/build/release_build"
inst "${xmount_installation}/bin/xmount" /usr/bin/xmount
- for file in ${xmount_installation}/lib/xmount/*; do
+ for file in ${xmount_installation}/usr/lib/xmount/*; do
inst "$file" /usr/lib/xmount/$(basename "$file")
done
inst "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \
diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh
index aad8370b..d3d06e6b 100644
--- a/builder/dnbd3-rootfs/scripts/build.sh
+++ b/builder/dnbd3-rootfs/scripts/build.sh
@@ -38,7 +38,7 @@ build_compile_xmount() {
local destination_directory="./release_build"
[ ! -z "$2" ] && destination_directory="$2"
- local install_prefix="/"
+ local install_prefix="/usr"
[ ! -z "$3" ] && install_prefix="$3"
mkdir --parents trunk/build