summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjandob2016-01-22 15:10:49 +0100
committerjandob2016-01-22 15:10:49 +0100
commitd75e70ba0ac5423162b901f084f07ce736626190 (patch)
treed3abfbd2303517aff0e71cec1453b08c5371ec2f
parentMerge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff)
downloadsystemd-init-d75e70ba0ac5423162b901f084f07ce736626190.tar.gz
systemd-init-d75e70ba0ac5423162b901f084f07ce736626190.tar.xz
systemd-init-d75e70ba0ac5423162b901f084f07ce736626190.zip
bugfix
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh2
-rw-r--r--builder/dnbd3-rootfs/scripts/build.sh7
2 files changed, 4 insertions, 5 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index cd314b45..fa6c4871 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -188,7 +188,7 @@ install() {
mount fdisk mkfs.xfs env busybox ps agetty tree \
insmod blockdev partx dmsetup sed cut awk tr insmod \
blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
- basename dirname sort mktemp diff qemu-img genfstab mountpoint xmount
+ basename dirname sort mktemp diff qemu-img genfstab mountpoint
# Production:
# inst_multiple insmod blockdev partx dmsetup sed cat cut awk tr touch \
# losetup grep basename dirname mktemp diff sleep wget mount sort \
diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/dnbd3-rootfs/scripts/build.sh
index cff6a2bd..f8180488 100644
--- a/builder/dnbd3-rootfs/scripts/build.sh
+++ b/builder/dnbd3-rootfs/scripts/build.sh
@@ -2,13 +2,12 @@ source "$(dirname "${BASH_SOURCE[0]}")/rebash/core.sh"
core.import logging
build_compile_qemu_xmount() {
- # Downloads and compiles qemu libxmount.
+ # Compiles qemu libxmount.
# NOTE: expects xmount installation under
- # ../xmount/trunk/build/release_build/
+ # $1/../xmount/trunk/build/release_build/
#
# Provides the following file:
# "$1/libxmount_input_qemu.so"
-
pushd "$1"
./configure --enable-xmount-input --python=$(which python2) \
--extra-cflags="-fPIC" \
@@ -26,7 +25,7 @@ build_clean_qemu_xmount() {
return $?
}
build_compile_xmount() {
- # Downloads and compiles xmount
+ # Compiles xmount
#
# Provides the xmount installation under:
# "$1/trunk/build/release_build/"