diff -Naur dracut-043/50-dracut.install dracut-043-busybox/50-dracut.install --- dracut-043/50-dracut.install 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/50-dracut.install 2015-07-15 14:54:22.463440923 +0200 @@ -12,7 +12,7 @@ if [[ -f ${INITRD_IMAGE_PREGENERATED} ]]; then # we found an initrd at the same place as the kernel # use this and don't generate a new one - cp --reflink=auto "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/initrd" \ + cp "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/initrd" \ && chown root:root "$BOOT_DIR_ABS/initrd" \ && chmod 0600 "$BOOT_DIR_ABS/initrd" \ && exit 0 diff -Naur dracut-043/51-dracut-rescue.install dracut-043-busybox/51-dracut-rescue.install --- dracut-043/51-dracut-rescue.install 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/51-dracut-rescue.install 2015-07-15 14:54:36.631285073 +0200 @@ -18,7 +18,7 @@ [[ -f $i ]] && echo ${i##*/} done shift - done | sort -Vu + done | sort -u ) for f in $files; do @@ -79,7 +79,7 @@ [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS" - if ! cp --reflink=auto "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then + if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&2 fi diff -Naur dracut-043/51-dracut-rescue-postinst.sh dracut-043-busybox/51-dracut-rescue-postinst.sh --- dracut-043/51-dracut-rescue-postinst.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/51-dracut-rescue-postinst.sh 2015-07-15 14:54:47.304167563 +0200 @@ -31,7 +31,7 @@ [[ -f $i ]] && echo ${i##*/} done shift - done | sort -Vu + done | sort -u ) for f in $files; do @@ -57,7 +57,7 @@ fi if [[ ! -f $NEW_KERNEL_IMAGE ]]; then - cp --reflink=auto "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE" + cp "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE" ((ret+=$?)) fi diff -Naur dracut-043/dracut-functions.sh dracut-043-busybox/dracut-functions.sh --- dracut-043/dracut-functions.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/dracut-functions.sh 2015-07-15 14:38:05.595359723 +0200 @@ -284,7 +284,7 @@ printf "%s\n" "$__newpath" } -if [[ "$(ln --help)" == *--relative* ]]; then +if [[ "$(ln --help &> /dev/null)" == *--relative* ]]; then ln_r() { ln -sfnr "${initdir}/$1" "${initdir}/$2" } diff -Naur dracut-043/dracut.sh dracut-043-busybox/dracut.sh --- dracut-043/dracut.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/dracut.sh 2015-07-15 14:40:57.626369645 +0200 @@ -290,7 +290,7 @@ printf "%s\n" "${i##*/}" fi done - done | sort -Vu | { + done | sort -u | { readarray -t files for f in "${files[@]}"; do @@ -1573,11 +1573,11 @@ object_destdir=${destdir}/${objectname#$src/} if ! [[ -e "$object_destdir" ]]; then mkdir -m 0755 -p "$object_destdir" - chmod --reference="$objectname" "$object_destdir" + chmod $(stat -c %a "$objectname") "$object_destdir" fi - cp --reflink=auto --sparse=auto -fa -t "$object_destdir" "$objectname"/* + cp -fa "$objectname"/* "$object_destdir" else - cp --reflink=auto --sparse=auto -fa -t "$destdir" "$objectname" + cp -fa "$objectname" "$destdir" fi done fi diff -Naur dracut-043/install/dracut-install.c dracut-043-busybox/install/dracut-install.c --- dracut-043/install/dracut-install.c 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/install/dracut-install.c 2015-07-15 14:42:13.778488714 +0200 @@ -242,7 +242,7 @@ normal_copy: pid = fork(); if (pid == 0) { - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, + execlp("cp", "cp", "-pfL", src, dst, NULL); _exit(EXIT_FAILURE); } @@ -250,7 +250,7 @@ while (waitpid(pid, &ret, 0) < 0) { if (errno != EINTR) { ret = -1; - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, + log_error("Failed: cp -pfL %s %s", src, dst); break; } diff -Naur dracut-043/modules.d/10i18n/module-setup.sh dracut-043-busybox/modules.d/10i18n/module-setup.sh --- dracut-043/modules.d/10i18n/module-setup.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/modules.d/10i18n/module-setup.sh 2015-07-15 14:42:55.139010252 +0200 @@ -107,7 +107,7 @@ for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do inst_dir "$_src" - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/* + cp -prfL "$_src"/* "${initdir}/${_src}" done # remove unnecessary files diff -Naur dracut-043/modules.d/45url-lib/module-setup.sh dracut-043-busybox/modules.d/45url-lib/module-setup.sh --- dracut-043/modules.d/45url-lib/module-setup.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/modules.d/45url-lib/module-setup.sh 2015-07-15 14:56:00.111363696 +0200 @@ -29,7 +29,7 @@ [[ -d $_dir ]] || continue for _lib in $_dir/libcurl.so.*; do [[ -e $_lib ]] || continue - _crt=$(grep -F --binary-files=text -z .crt $_lib) + _crt=$(grep -F .crt $_lib) [[ $_crt ]] || continue [[ $_crt == /*/* ]] || continue if ! inst_simple "$_crt"; then diff -Naur dracut-043/modules.d/95terminfo/module-setup.sh dracut-043-busybox/modules.d/95terminfo/module-setup.sh --- dracut-043/modules.d/95terminfo/module-setup.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/modules.d/95terminfo/module-setup.sh 2015-07-15 14:43:27.874631566 +0200 @@ -11,7 +11,7 @@ if [ -d ${_terminfodir} ]; then for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do inst_dir "$_terminfodir/${i%/*}" - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" + cp -prfL "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" done fi } diff -Naur dracut-043/modules.d/99base/dracut-lib.sh dracut-043-busybox/modules.d/99base/dracut-lib.sh --- dracut-043/modules.d/99base/dracut-lib.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/modules.d/99base/dracut-lib.sh 2015-07-15 14:44:11.068131902 +0200 @@ -676,7 +676,7 @@ copytree() { local src="$1" dest="$2" mkdir -p "$dest"; dest=$(readlink -e -q "$dest") - ( cd "$src"; cp -af . -t "$dest" ) + ( cd "$src"; cp -af . "$dest" ) } # Evaluates command for UUIDs either given as arguments for this function or all diff -Naur dracut-043/test/TEST-01-BASIC/create-root.sh dracut-043-busybox/test/TEST-01-BASIC/create-root.sh --- dracut-043/test/TEST-01-BASIC/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-01-BASIC/create-root.sh 2015-07-15 14:45:07.665477184 +0200 @@ -16,7 +16,7 @@ mkfs.ext3 -L dracut /dev/sda2 mkdir -p /root mount /dev/sda2 /root -cp -a -t /root /source/* +cp -a /source/* /root mkdir -p /root/run umount /root echo "dracut-root-block-created" >/dev/sda1 diff -Naur dracut-043/test/TEST-02-SYSTEMD/create-root.sh dracut-043-busybox/test/TEST-02-SYSTEMD/create-root.sh --- dracut-043/test/TEST-02-SYSTEMD/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-02-SYSTEMD/create-root.sh 2015-07-15 14:45:39.371110413 +0200 @@ -16,7 +16,7 @@ mkfs.ext3 -L dracut /dev/sda2 mkdir -p /root mount /dev/sda2 /root -cp -a -t /root /source/* +cp -a /source/* /root mkdir -p /root/run umount /root echo "dracut-root-block-created" >/dev/sda1 diff -Naur dracut-043/test/TEST-03-USR-MOUNT/create-root.sh dracut-043-busybox/test/TEST-03-USR-MOUNT/create-root.sh --- dracut-043/test/TEST-03-USR-MOUNT/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2015-07-15 14:46:09.793758485 +0200 @@ -30,7 +30,7 @@ btrfs subvolume create /root/usr/usr umount /root/usr mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr -cp -a -t /root /source/* +cp -a /source/* /root mkdir -p /root/run umount /root/usr umount /root diff -Naur dracut-043/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-043-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh --- dracut-043/test/TEST-04-FULL-SYSTEMD/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2015-07-15 14:46:33.209487613 +0200 @@ -30,7 +30,7 @@ btrfs subvolume create /root/usr/usr umount /root/usr mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr -cp -a -t /root /source/* +cp -a /source/* /root mkdir -p /root/run umount /root/usr umount /root diff -Naur dracut-043/test/TEST-10-RAID/create-root.sh dracut-043-busybox/test/TEST-10-RAID/create-root.sh --- dracut-043/test/TEST-10-RAID/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-10-RAID/create-root.sh 2015-07-15 14:47:01.041186650 +0200 @@ -29,7 +29,7 @@ mke2fs /dev/dracut/root mkdir -p /sysroot mount /dev/dracut/root /sysroot -cp -a -t /sysroot /source/* +cp -a /source/* /sysroot umount /sysroot lvm lvchange -a n /dev/dracut/root udevadm settle diff -Naur dracut-043/test/TEST-11-LVM/create-root.sh dracut-043-busybox/test/TEST-11-LVM/create-root.sh --- dracut-043/test/TEST-11-LVM/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-11-LVM/create-root.sh 2015-07-15 14:47:30.600877617 +0200 @@ -22,7 +22,7 @@ mke2fs /dev/dracut/root && \ mkdir -p /sysroot && \ mount /dev/dracut/root /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot && \ sleep 1 && \ lvm lvchange -a n /dev/dracut/root && \ diff -Naur dracut-043/test/TEST-12-RAID-DEG/create-root.sh dracut-043-busybox/test/TEST-12-RAID-DEG/create-root.sh --- dracut-043/test/TEST-12-RAID-DEG/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-12-RAID-DEG/create-root.sh 2015-07-15 14:47:56.425606331 +0200 @@ -32,7 +32,7 @@ mke2fs -L root /dev/dracut/root mkdir -p /sysroot mount /dev/dracut/root /sysroot -cp -a -t /sysroot /source/* +cp -a /source/* /sysroot mkdir /sysroot/run umount /sysroot lvm lvchange -a n /dev/dracut/root diff -Naur dracut-043/test/TEST-12-RAID-DEG/test.sh dracut-043-busybox/test/TEST-12-RAID-DEG/test.sh --- dracut-043/test/TEST-12-RAID-DEG/test.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-12-RAID-DEG/test.sh 2015-07-15 14:56:43.662881111 +0200 @@ -11,8 +11,8 @@ client_run() { echo "CLIENT TEST START: $@" - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new $testdir/run-qemu \ -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 256M -nographic -smp 2 \ @@ -32,7 +32,7 @@ } test_run() { - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) echo "MD_UUID=$MD_UUID" read LUKS_UUID < $TESTDIR/luksuuid @@ -121,7 +121,7 @@ -initrd $TESTDIR/initramfs.makeroot || return 1 grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) echo $ID_FS_UUID > $TESTDIR/luksuuid diff -Naur dracut-043/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh --- dracut-043/test/TEST-13-ENC-RAID-LVM/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2015-07-15 14:48:55.408982495 +0200 @@ -32,7 +32,7 @@ mke2fs /dev/dracut/root && \ mkdir -p /sysroot && \ mount /dev/dracut/root /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot && \ sleep 2 && \ lvm lvchange -a n /dev/dracut/root && \ diff -Naur dracut-043/test/TEST-13-ENC-RAID-LVM/test.sh dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/test.sh --- dracut-043/test/TEST-13-ENC-RAID-LVM/test.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2015-07-15 14:57:05.606637509 +0200 @@ -112,7 +112,7 @@ -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ -initrd $TESTDIR/initramfs.makeroot || return 1 grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) for uuid in $cryptoUUIDS; do eval $uuid printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID diff -Naur dracut-043/test/TEST-14-IMSM/create-root.sh dracut-043-busybox/test/TEST-14-IMSM/create-root.sh --- dracut-043/test/TEST-14-IMSM/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-14-IMSM/create-root.sh 2015-07-15 14:49:19.552725564 +0200 @@ -62,7 +62,7 @@ mke2fs -L root /dev/dracut/root && \ mkdir -p /sysroot && \ mount /dev/dracut/root /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot && \ lvm lvchange -a n /dev/dracut/root && \ udevadm settle diff -Naur dracut-043/test/TEST-14-IMSM/test.sh dracut-043-busybox/test/TEST-14-IMSM/test.sh --- dracut-043/test/TEST-14-IMSM/test.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-14-IMSM/test.sh 2015-07-15 14:57:25.166420133 +0200 @@ -107,7 +107,7 @@ -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ -initrd $TESTDIR/initramfs.makeroot || return 1 grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) echo $MD_UUID > $TESTDIR/mduuid ( export initdir=$TESTDIR/overlay diff -Naur dracut-043/test/TEST-15-BTRFSRAID/create-root.sh dracut-043-busybox/test/TEST-15-BTRFSRAID/create-root.sh --- dracut-043/test/TEST-15-BTRFSRAID/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2015-07-15 14:49:47.889422924 +0200 @@ -20,7 +20,7 @@ set -e mkdir -p /sysroot mount -t btrfs /dev/sda5 /sysroot -cp -a -t /sysroot /source/* +cp -a /source/* /sysroot umount /sysroot echo "dracut-root-block-created" >/dev/sda1 poweroff -f diff -Naur dracut-043/test/TEST-17-LVM-THIN/create-root.sh dracut-043-busybox/test/TEST-17-LVM-THIN/create-root.sh --- dracut-043/test/TEST-17-LVM-THIN/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-17-LVM-THIN/create-root.sh 2015-07-15 14:50:15.073131552 +0200 @@ -23,7 +23,7 @@ mke2fs /dev/dracut/root && \ mkdir -p /sysroot && \ mount /dev/dracut/root /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot && \ sleep 1 && \ lvm lvchange -a n /dev/dracut/root && \ diff -Naur dracut-043/test/TEST-30-ISCSI/create-root.sh dracut-043-busybox/test/TEST-30-ISCSI/create-root.sh --- dracut-043/test/TEST-30-ISCSI/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-30-ISCSI/create-root.sh 2015-07-15 14:50:58.608662908 +0200 @@ -8,7 +8,7 @@ mkfs.ext3 -j -L singleroot -F /dev/sda && \ mkdir -p /sysroot && \ mount /dev/sda /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot && \ mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ mdadm -W /dev/md0 || : && \ @@ -18,7 +18,7 @@ lvm vgchange -ay && \ mkfs.ext3 -j -L sysroot /dev/dracut/root && \ mount /dev/dracut/root /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot && \ lvm lvchange -a n /dev/dracut/root && \ echo "dracut-root-block-created" >/dev/sdb diff -Naur dracut-043/test/TEST-40-NBD/create-root.sh dracut-043-busybox/test/TEST-40-NBD/create-root.sh --- dracut-043/test/TEST-40-NBD/create-root.sh 2015-06-15 12:27:21.000000000 +0200 +++ dracut-043-busybox/test/TEST-40-NBD/create-root.sh 2015-07-15 14:51:27.816347202 +0200 @@ -17,7 +17,7 @@ /sbin/tune2fs -e continue /dev/dracut/root && \ mkdir -p /sysroot && \ mount /dev/dracut/root /sysroot && \ -cp -a -t /sysroot /source/* && \ +cp -a /source/* /sysroot && \ umount /sysroot sleep 1 lvm lvchange -a n /dev/dracut/root