summaryrefslogtreecommitdiffstats
path: root/builder/dnbd3-rootfs
diff options
context:
space:
mode:
authorjandob2016-01-07 16:42:58 +0100
committerjandob2016-01-07 16:42:58 +0100
commitdcd15c54bd70ef7c9cdf92a957e93053ff2bde47 (patch)
treebe41014ee47834674f96a90cef0727b65da11066 /builder/dnbd3-rootfs
parentchange hooks variable scoping (diff)
parentIntegrate new systemd cli option. (diff)
downloadsystemd-init-dcd15c54bd70ef7c9cdf92a957e93053ff2bde47.tar.gz
systemd-init-dcd15c54bd70ef7c9cdf92a957e93053ff2bde47.tar.xz
systemd-init-dcd15c54bd70ef7c9cdf92a957e93053ff2bde47.zip
merge
Diffstat (limited to 'builder/dnbd3-rootfs')
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh6
m---------builder/dnbd3-rootfs/scripts/rebash0
2 files changed, 3 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 3b60417d..87484fb3 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -188,10 +188,10 @@ install() {
mount fdisk mkfs.xfs env busybox ps agetty \
insmod blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
- basename dirname sort diff mktemp nohup genfstab mountpoint qemu-img
+ basename dirname sort mktemp diff qemu-img
# Production:
- # inst_multiple insmod blockdev partx dmsetup cat cut awk tr \
- # losetup dd mkfs.ext4 grep
+ # inst_multiple insmod qemu-nbd blockdev partx dmsetup sed cat cut awk tr \
+ # losetup dd mkfs.ext4 grep basename dirname mktemp diff
}
# region vim modline
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject b77bbd65f70f56c5941f0368c2e488c470072af
+Subproject 46681d9d6caef2c14b10f4512f12176a7b0c1f4