diff -Naur dracut-037/51-dracut-rescue.install dracut-037-busybox/51-dracut-rescue.install --- dracut-037/51-dracut-rescue.install 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/51-dracut-rescue.install 2014-03-28 12:20:56.438000000 +0000 @@ -20,7 +20,7 @@ [[ -f $i ]] && echo ${i##*/} done shift - done | sort -Vu + done | sort -u ) for f in $files; do diff -Naur dracut-037/51-dracut-rescue-postinst.sh dracut-037-busybox/51-dracut-rescue-postinst.sh --- dracut-037/51-dracut-rescue-postinst.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/51-dracut-rescue-postinst.sh 2014-03-28 12:21:09.974000000 +0000 @@ -33,7 +33,7 @@ [[ -f $i ]] && echo ${i##*/} done shift - done | sort -Vu + done | sort -u ) for f in $files; do diff -Naur dracut-037/dracut-functions.sh dracut-037-busybox/dracut-functions.sh --- dracut-037/dracut-functions.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/dracut-functions.sh 2014-03-28 12:22:24.716000000 +0000 @@ -293,7 +293,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-037/dracut.sh dracut-037-busybox/dracut.sh --- dracut-037/dracut.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/dracut.sh 2014-03-28 12:23:17.832000000 +0000 @@ -270,7 +270,7 @@ printf "%s\n" "${i##*/}" fi done - done | sort -Vu | { + done | sort -u | { readarray -t files for f in "${files[@]}"; do @@ -1357,11 +1357,11 @@ if [[ -d "$i" ]]; then if ! [[ -e "$s" ]]; then mkdir -m 0755 -p "$s" - chmod --reference="$i" "$s" + chmod $(stat -c %a "$i") "$s" fi - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/* + cp -fa "$i"/* "$s" else - cp --reflink=auto --sparse=auto -fa -t "$s" "$i" + cp -fa "$i" "$s" fi done fi diff -Naur dracut-037/install/dracut-install.c dracut-037-busybox/install/dracut-install.c --- dracut-037/install/dracut-install.c 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/install/dracut-install.c 2014-03-28 12:24:44.263000000 +0000 @@ -240,7 +240,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); } @@ -248,7 +248,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-037/modules.d/10i18n/module-setup.sh dracut-037-busybox/modules.d/10i18n/module-setup.sh --- dracut-037/modules.d/10i18n/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/modules.d/10i18n/module-setup.sh 2014-03-28 12:25:27.271000000 +0000 @@ -109,7 +109,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-037/modules.d/95terminfo/module-setup.sh dracut-037-busybox/modules.d/95terminfo/module-setup.sh --- dracut-037/modules.d/95terminfo/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/modules.d/95terminfo/module-setup.sh 2014-03-28 12:26:20.994000000 +0000 @@ -13,7 +13,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-037/modules.d/99base/dracut-lib.sh dracut-037-busybox/modules.d/99base/dracut-lib.sh --- dracut-037/modules.d/99base/dracut-lib.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/modules.d/99base/dracut-lib.sh 2014-03-28 12:26:47.568000000 +0000 @@ -657,7 +657,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-037/test/TEST-01-BASIC/create-root.sh dracut-037-busybox/test/TEST-01-BASIC/create-root.sh --- dracut-037/test/TEST-01-BASIC/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-01-BASIC/create-root.sh 2014-03-28 12:27:25.384000000 +0000 @@ -15,7 +15,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-037/test/TEST-02-SYSTEMD/create-root.sh dracut-037-busybox/test/TEST-02-SYSTEMD/create-root.sh --- dracut-037/test/TEST-02-SYSTEMD/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-02-SYSTEMD/create-root.sh 2014-03-28 12:27:47.096000000 +0000 @@ -15,7 +15,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-037/test/TEST-03-USR-MOUNT/create-root.sh dracut-037-busybox/test/TEST-03-USR-MOUNT/create-root.sh --- dracut-037/test/TEST-03-USR-MOUNT/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2014-03-28 12:28:12.072000000 +0000 @@ -29,7 +29,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-037/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-037-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh --- dracut-037/test/TEST-04-FULL-SYSTEMD/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2014-03-28 12:28:38.472000000 +0000 @@ -29,7 +29,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-037/test/TEST-10-RAID/create-root.sh dracut-037-busybox/test/TEST-10-RAID/create-root.sh --- dracut-037/test/TEST-10-RAID/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-10-RAID/create-root.sh 2014-03-28 12:29:01.445000000 +0000 @@ -28,7 +28,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-037/test/TEST-11-LVM/create-root.sh dracut-037-busybox/test/TEST-11-LVM/create-root.sh --- dracut-037/test/TEST-11-LVM/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-11-LVM/create-root.sh 2014-03-28 12:29:22.448000000 +0000 @@ -21,7 +21,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-037/test/TEST-12-RAID-DEG/create-root.sh dracut-037-busybox/test/TEST-12-RAID-DEG/create-root.sh --- dracut-037/test/TEST-12-RAID-DEG/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-12-RAID-DEG/create-root.sh 2014-03-28 12:29:46.777000000 +0000 @@ -31,7 +31,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-037/test/TEST-12-RAID-DEG/test.sh dracut-037-busybox/test/TEST-12-RAID-DEG/test.sh --- dracut-037/test/TEST-12-RAID-DEG/test.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-12-RAID-DEG/test.sh 2014-03-28 12:30:15.921000000 +0000 @@ -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 \ -hda $TESTDIR/root.ext2 -m 256M -nographic -smp 2 \ diff -Naur dracut-037/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-037-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh --- dracut-037/test/TEST-13-ENC-RAID-LVM/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2014-03-28 12:30:55.504000000 +0000 @@ -31,7 +31,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-037/test/TEST-14-IMSM/create-root.sh dracut-037-busybox/test/TEST-14-IMSM/create-root.sh --- dracut-037/test/TEST-14-IMSM/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-14-IMSM/create-root.sh 2014-03-28 12:31:22.473000000 +0000 @@ -59,7 +59,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-037/test/TEST-15-BTRFSRAID/create-root.sh dracut-037-busybox/test/TEST-15-BTRFSRAID/create-root.sh --- dracut-037/test/TEST-15-BTRFSRAID/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2014-03-28 12:31:42.601000000 +0000 @@ -22,7 +22,7 @@ set -e mkdir -p /sysroot mount -t btrfs /dev/sda8 /sysroot -cp -a -t /sysroot /source/* +cp -a /source/* /sysroot umount /sysroot echo "dracut-root-block-created" >/dev/sda1 poweroff -f diff -Naur dracut-037/test/TEST-17-LVM-THIN/create-root.sh dracut-037-busybox/test/TEST-17-LVM-THIN/create-root.sh --- dracut-037/test/TEST-17-LVM-THIN/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-17-LVM-THIN/create-root.sh 2014-03-28 12:33:26.762000000 +0000 @@ -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-037/test/TEST-30-ISCSI/create-root.sh dracut-037-busybox/test/TEST-30-ISCSI/create-root.sh --- dracut-037/test/TEST-30-ISCSI/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-30-ISCSI/create-root.sh 2014-03-28 12:32:16.809000000 +0000 @@ -8,7 +8,7 @@ mkfs.ext3 -j -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-037/test/TEST-40-NBD/create-root.sh dracut-037-busybox/test/TEST-40-NBD/create-root.sh --- dracut-037/test/TEST-40-NBD/create-root.sh 2014-03-19 16:16:08.000000000 +0000 +++ dracut-037-busybox/test/TEST-40-NBD/create-root.sh 2014-03-28 12:32:41.169000000 +0000 @@ -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