diff -Naur dracut-045/50-dracut.install dracut-045-busybox/50-dracut.install --- dracut-045/50-dracut.install 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/50-dracut.install 2017-04-04 14:42:58.434257706 +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-045/51-dracut-rescue.install dracut-045-busybox/51-dracut-rescue.install --- dracut-045/51-dracut-rescue.install 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/51-dracut-rescue.install 2017-04-04 14:45:14.468616117 +0200 @@ -18,7 +18,7 @@ [[ -f $i ]] && echo ${i##*/} done shift - done | sort -Vu + done | sort -u ) for f in $files; do @@ -78,7 +78,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-045/51-dracut-rescue-postinst.sh dracut-045-busybox/51-dracut-rescue-postinst.sh --- dracut-045/51-dracut-rescue-postinst.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/51-dracut-rescue-postinst.sh 2017-04-04 14:46:00.620061393 +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-045/dracut-init.sh dracut-045-busybox/dracut-init.sh --- dracut-045/dracut-init.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/dracut-init.sh 2017-04-04 14:53:07.840962042 +0200 @@ -20,9 +20,9 @@ export LC_MESSAGES=C if [[ "$EUID" = "0" ]]; then - export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr,links -dfr" + export DRACUT_CP="cp -dfrp" else - export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,links -dfr" + export DRACUT_CP="cp -dfrp" fi # is_func @@ -1006,7 +1006,7 @@ return $_ret } -if [[ "$(ln --help)" == *--relative* ]]; then +if [[ "$(ln --help &> /dev/null)" == *--relative* ]]; then ln_r() { ln -sfnr "${initdir}/$1" "${initdir}/$2" } diff -Naur dracut-045/dracut.sh dracut-045-busybox/dracut.sh --- dracut-045/dracut.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/dracut.sh 2017-04-04 16:57:56.773680048 +0200 @@ -262,7 +262,7 @@ printf "%s\n" "${i##*/}" fi done - done | sort -Vu | { + done | sort -u | { readarray -t files for f in "${files[@]}"; do @@ -1557,11 +1557,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 - $DRACUT_CP -t "$object_destdir" "$objectname"/* + $DRACUT_CP "$objectname"/* "$object_destdir" else - $DRACUT_CP -t "$destdir" "$objectname" + $DRACUT_CP "$objectname" "$destdir" fi done fi @@ -1783,7 +1783,7 @@ --add-section .linux="$kernel_image" --change-section-vma .linux=0x40000 \ --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd=0x3000000 \ "$uefi_stub" "${uefi_outdir}/linux.efi" \ - && cp --reflink=auto "${uefi_outdir}/linux.efi" "$outfile"; then + && cp "${uefi_outdir}/linux.efi" "$outfile"; then dinfo "*** Creating UEFI image file '$outfile' done ***" else rm -f -- "$outfile" @@ -1791,7 +1791,7 @@ exit 1 fi else - if cp --reflink=auto "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then + if cp "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then dinfo "*** Creating initramfs image file '$outfile' done ***" else rm -f -- "$outfile" diff -Naur dracut-045/install/dracut-install.c dracut-045-busybox/install/dracut-install.c --- dracut-045/install/dracut-install.c 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/install/dracut-install.c 2017-04-04 14:56:27.200596937 +0200 @@ -301,10 +301,10 @@ pid = fork(); if (pid == 0) { if (geteuid() == 0) - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,xattr,timestamps", "-fL", src, dst, + execlp("cp", "cp", "-pfL", src, dst, NULL); else - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, + execlp("cp", "cp", "-pfL", src, dst, NULL); _exit(EXIT_FAILURE); } @@ -313,10 +313,10 @@ if (errno != EINTR) { ret = -1; if (geteuid() == 0) - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,xattr,timestamps -fL %s %s", src, + log_error("Failed: cp -pfL %s %s", src, dst); else - 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-045/modules.d/10i18n/module-setup.sh dracut-045-busybox/modules.d/10i18n/module-setup.sh --- dracut-045/modules.d/10i18n/module-setup.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/modules.d/10i18n/module-setup.sh 2017-04-04 17:04:08.430627818 +0200 @@ -115,7 +115,7 @@ for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do inst_dir "$_src" - $DRACUT_CP -L -t "${initdir}/${_src}" "$_src"/* + $DRACUT_CP -L "$_src"/* "${initdir}/${_src}" done # remove unnecessary files diff -Naur dracut-045/modules.d/45url-lib/module-setup.sh dracut-045-busybox/modules.d/45url-lib/module-setup.sh --- dracut-045/modules.d/45url-lib/module-setup.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/modules.d/45url-lib/module-setup.sh 2017-04-04 16:54:36.633879291 +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 "$_crt"; then diff -Naur dracut-045/modules.d/95terminfo/module-setup.sh dracut-045-busybox/modules.d/95terminfo/module-setup.sh --- dracut-045/modules.d/95terminfo/module-setup.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/modules.d/95terminfo/module-setup.sh 2017-04-04 17:03:40.130935364 +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%/*}" - $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" + $DRACUT_CP -L "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" done fi } diff -Naur dracut-045/modules.d/99base/dracut-lib.sh dracut-045-busybox/modules.d/99base/dracut-lib.sh --- dracut-045/modules.d/99base/dracut-lib.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/modules.d/99base/dracut-lib.sh 2017-04-04 17:07:29.208442424 +0200 @@ -685,7 +685,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-045/test/TEST-01-BASIC/create-root.sh dracut-045-busybox/test/TEST-01-BASIC/create-root.sh --- dracut-045/test/TEST-01-BASIC/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-01-BASIC/create-root.sh 2017-04-04 17:03:13.312226939 +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-045/test/TEST-02-SYSTEMD/create-root.sh dracut-045-busybox/test/TEST-02-SYSTEMD/create-root.sh --- dracut-045/test/TEST-02-SYSTEMD/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-02-SYSTEMD/create-root.sh 2017-04-04 17:01:25.550399891 +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-045/test/TEST-03-USR-MOUNT/create-root.sh dracut-045-busybox/test/TEST-03-USR-MOUNT/create-root.sh --- dracut-045/test/TEST-03-USR-MOUNT/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2017-04-04 17:01:08.946580828 +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-045/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-045-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh --- dracut-045/test/TEST-04-FULL-SYSTEMD/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2017-04-04 17:02:15.538855502 +0200 @@ -31,7 +31,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-045/test/TEST-10-RAID/create-root.sh dracut-045-busybox/test/TEST-10-RAID/create-root.sh --- dracut-045/test/TEST-10-RAID/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-10-RAID/create-root.sh 2017-04-04 17:00:31.721986705 +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-045/test/TEST-11-LVM/create-root.sh dracut-045-busybox/test/TEST-11-LVM/create-root.sh --- dracut-045/test/TEST-11-LVM/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-11-LVM/create-root.sh 2017-04-04 17:02:36.184630814 +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-045/test/TEST-12-RAID-DEG/create-root.sh dracut-045-busybox/test/TEST-12-RAID-DEG/create-root.sh --- dracut-045/test/TEST-12-RAID-DEG/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-12-RAID-DEG/create-root.sh 2017-04-04 17:01:59.911025636 +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-045/test/TEST-12-RAID-DEG/test.sh dracut-045-busybox/test/TEST-12-RAID-DEG/test.sh --- dracut-045/test/TEST-12-RAID-DEG/test.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-12-RAID-DEG/test.sh 2017-04-04 17:05:36.604670340 +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 \ @@ -33,7 +33,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 @@ -122,7 +122,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-045/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh --- dracut-045/test/TEST-13-ENC-RAID-LVM/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2017-04-04 16:59:13.278843128 +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-045/test/TEST-13-ENC-RAID-LVM/test.sh dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/test.sh --- dracut-045/test/TEST-13-ENC-RAID-LVM/test.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2017-04-04 16:53:55.650331792 +0200 @@ -115,7 +115,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-045/test/TEST-14-IMSM/create-root.sh dracut-045-busybox/test/TEST-14-IMSM/create-root.sh --- dracut-045/test/TEST-14-IMSM/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-14-IMSM/create-root.sh 2017-04-04 17:00:51.407772021 +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-045/test/TEST-14-IMSM/test.sh dracut-045-busybox/test/TEST-14-IMSM/test.sh --- dracut-045/test/TEST-14-IMSM/test.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-14-IMSM/test.sh 2017-04-04 16:53:44.293457336 +0200 @@ -108,7 +108,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-045/test/TEST-15-BTRFSRAID/create-root.sh dracut-045-busybox/test/TEST-15-BTRFSRAID/create-root.sh --- dracut-045/test/TEST-15-BTRFSRAID/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2017-04-04 16:59:33.229625156 +0200 @@ -21,7 +21,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-045/test/TEST-17-LVM-THIN/create-root.sh dracut-045-busybox/test/TEST-17-LVM-THIN/create-root.sh --- dracut-045/test/TEST-17-LVM-THIN/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-17-LVM-THIN/create-root.sh 2017-04-04 17:02:54.403432599 +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-045/test/TEST-30-ISCSI/create-root.sh dracut-045-busybox/test/TEST-30-ISCSI/create-root.sh --- dracut-045/test/TEST-30-ISCSI/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-30-ISCSI/create-root.sh 2017-04-04 17:00:11.684205317 +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-045/test/TEST-40-NBD/create-root.sh dracut-045-busybox/test/TEST-40-NBD/create-root.sh --- dracut-045/test/TEST-40-NBD/create-root.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-40-NBD/create-root.sh 2017-04-04 17:01:43.066209080 +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 diff -Naur dracut-045/test/TEST-99-RPM/test.sh dracut-045-busybox/test/TEST-99-RPM/test.sh --- dracut-045/test/TEST-99-RPM/test.sh 2017-04-03 10:26:25.000000000 +0200 +++ dracut-045-busybox/test/TEST-99-RPM/test.sh 2017-04-04 16:51:45.611773715 +0200 @@ -26,7 +26,7 @@ mount -t devtmpfs devtmpfs "$rootdir/dev" mkdir -p "$rootdir/$TESTDIR" - cp --reflink=auto -a \ + cp -a \ "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \ "$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \ "$rootdir/$TESTDIR/"