summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-12-17 16:48:13 +0100
committertorben2015-12-17 16:48:13 +0100
commit0c5d9878159a7d59de0f3eac891f1d7dbdc518ed (patch)
treecb84d66a1c0422350f5c90359169acbf768e69db
parentmerge (diff)
downloadsystemd-init-0c5d9878159a7d59de0f3eac891f1d7dbdc518ed.tar.gz
systemd-init-0c5d9878159a7d59de0f3eac891f1d7dbdc518ed.tar.xz
systemd-init-0c5d9878159a7d59de0f3eac891f1d7dbdc518ed.zip
Remove fakeroot to switch root.
-rwxr-xr-xbuilder/build-initramfs.sh7
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh6
m---------builder/dnbd3-rootfs/scripts/rebash0
3 files changed, 6 insertions, 7 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index a513b752..6a81eccf 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -92,8 +92,7 @@ build_initramfs_target=''
build_initramfs_create_system_image=''
build_initramfs_cleanup='no'
build_initramfs_dependencies=(cpio git test shift mktemp cat rm sed gzip curl \
- tar grep make gcc cmake readlink dirname dmsetup fakeroot fakechroot \
- chroot qemu-nbd)
+ tar grep make gcc cmake readlink dirname dmsetup chroot qemu-nbd)
# endregion
# region functions
## region command line interface
@@ -310,8 +309,8 @@ if [[ "$build_initramfs_target" != '' ]]; then
#qemu-nbd "$build_initramfs_target" "$build_initramfs__target"
fi
if [[ -d "$build_initramfs__target" ]]; then
- build_initramfs__temporary_working_directory="$(fakeroot \
- fakechroot chroot "$build_initramfs__target" mktemp --directory)"
+ build_initramfs__temporary_working_directory="$(chroot \
+ "$build_initramfs__target" mktemp --directory)"
mount --bind "$(pwd)" \
"${build_initramfs__target}${build_initramfs__temporary_working_directory}"
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index b4440ddd..4088bc29 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -158,8 +158,8 @@ install() {
mount fdisk mkfs.xfs env busybox ps agetty \
insmod qemu-nbd blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
- basename dirname sort
+ basename dirname sort mktemp diff
# Production:
- # inst_multiple insmod qemu-nbd 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
}
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject 5a708c0c68be05b50fdb77d211912110f910c51
+Subproject b77bbd65f70f56c5941f0368c2e488c470072af