diff -Naur dracut-031/51-dracut-rescue.install dracut-031-busybox/51-dracut-rescue.install --- dracut-031/51-dracut-rescue.install 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/51-dracut-rescue.install 2013-08-09 13:20:53.541000000 +0000 @@ -17,7 +17,7 @@ [[ -f $i ]] && echo ${i##*/} done shift - done | sort -Vu + done | sort -u ) for f in $files; do diff -Naur dracut-031/51-dracut-rescue-postinst.sh dracut-031-busybox/51-dracut-rescue-postinst.sh --- dracut-031/51-dracut-rescue-postinst.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/51-dracut-rescue-postinst.sh 2013-08-09 13:21:04.310000000 +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-031/dracut-functions.sh dracut-031-busybox/dracut-functions.sh --- dracut-031/dracut-functions.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/dracut-functions.sh 2013-08-09 13:14:51.703000000 +0000 @@ -236,7 +236,7 @@ echo "$__newpath" } -if [[ "$(ln --help)" == *--relative* ]]; then +if [[ "$(ln --help &>/dev/null)" == *--relative* ]]; then ln_r() { ln -sfnr "${initdir}/$1" "${initdir}/$2" } @@ -664,7 +664,7 @@ else # create directory mkdir -m 0755 -p "${initdir}/$_file" || return 1 - [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file" + [[ -e "$_file" ]] && chmod $(stat -c %a "$_file") "${initdir}/$_file" chmod u+w "${initdir}/$_file" fi done @@ -699,7 +699,7 @@ fi fi ddebug "Installing $_src" - cp --reflink=auto --sparse=auto -pfL "$_src" "${initdir}/$_target" + cp -pfL "$_src" "${initdir}/$_target" } # same as above, but specialized for symlinks diff -Naur dracut-031/dracut.sh dracut-031-busybox/dracut.sh --- dracut-031/dracut.sh 2013-08-09 13:12:14.717000000 +0000 +++ dracut-031-busybox/dracut.sh 2013-08-09 13:26:46.131000000 +0000 @@ -252,7 +252,7 @@ printf "%s\n" "${i##*/}" fi done - done | sort -Vu | { + done | sort -u | { readarray -t files for f in "${files[@]}"; do @@ -1153,11 +1153,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-031/install/dracut-install.c dracut-031-busybox/install/dracut-install.c --- dracut-031/install/dracut-install.c 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/install/dracut-install.c 2013-08-09 13:19:45.964000000 +0000 @@ -239,14 +239,14 @@ normal_copy: pid = fork(); if (pid == 0) { - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, NULL); + execlp("cp", "cp", "-pfL", src, dst, NULL); _exit(EXIT_FAILURE); } 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, dst); + log_error("Failed: cp -pfL %s %s", src, dst); break; } } diff -Naur dracut-031/modules.d/10i18n/module-setup.sh dracut-031-busybox/modules.d/10i18n/module-setup.sh --- dracut-031/modules.d/10i18n/module-setup.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/modules.d/10i18n/module-setup.sh 2013-08-09 13:22:36.177000000 +0000 @@ -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-031/modules.d/95terminfo/module-setup.sh dracut-031-busybox/modules.d/95terminfo/module-setup.sh --- dracut-031/modules.d/95terminfo/module-setup.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/modules.d/95terminfo/module-setup.sh 2013-08-09 13:27:47.421000000 +0000 @@ -12,7 +12,7 @@ if [ -d ${_terminfodir} ]; then for i in "l/linux" "v/vt100" "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-031/modules.d/99base/dracut-lib.sh dracut-031-busybox/modules.d/99base/dracut-lib.sh --- dracut-031/modules.d/99base/dracut-lib.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/modules.d/99base/dracut-lib.sh 2013-08-09 13:28:43.527000000 +0000 @@ -641,7 +641,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-031/test/old.TEST-14-IMSM/create-root.sh dracut-031-busybox/test/old.TEST-14-IMSM/create-root.sh --- dracut-031/test/old.TEST-14-IMSM/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/old.TEST-14-IMSM/create-root.sh 2013-08-09 13:35:29.591000000 +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 && \ echo "dracut-root-block-created" >/dev/sda diff -Naur dracut-031/test/TEST-01-BASIC/create-root.sh dracut-031-busybox/test/TEST-01-BASIC/create-root.sh --- dracut-031/test/TEST-01-BASIC/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-01-BASIC/create-root.sh 2013-08-09 13:30:11.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-031/test/TEST-02-SYSTEMD/create-root.sh dracut-031-busybox/test/TEST-02-SYSTEMD/create-root.sh --- dracut-031/test/TEST-02-SYSTEMD/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-02-SYSTEMD/create-root.sh 2013-08-09 13:37:11.489000000 +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-031/test/TEST-03-USR-MOUNT/create-root.sh dracut-031-busybox/test/TEST-03-USR-MOUNT/create-root.sh --- dracut-031/test/TEST-03-USR-MOUNT/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2013-08-09 13:34:19.270000000 +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-031/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-031-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh --- dracut-031/test/TEST-04-FULL-SYSTEMD/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2013-08-09 13:34:41.910000000 +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-031/test/TEST-10-RAID/create-root.sh dracut-031-busybox/test/TEST-10-RAID/create-root.sh --- dracut-031/test/TEST-10-RAID/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-10-RAID/create-root.sh 2013-08-09 13:36:23.847000000 +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-031/test/TEST-11-LVM/create-root.sh dracut-031-busybox/test/TEST-11-LVM/create-root.sh --- dracut-031/test/TEST-11-LVM/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-11-LVM/create-root.sh 2013-08-09 13:36:49.073000000 +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-031/test/TEST-12-RAID-DEG/create-root.sh dracut-031-busybox/test/TEST-12-RAID-DEG/create-root.sh --- dracut-031/test/TEST-12-RAID-DEG/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-12-RAID-DEG/create-root.sh 2013-08-09 13:35:05.421000000 +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-031/test/TEST-12-RAID-DEG/test.sh dracut-031-busybox/test/TEST-12-RAID-DEG/test.sh --- dracut-031/test/TEST-12-RAID-DEG/test.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-12-RAID-DEG/test.sh 2013-08-09 13:19:12.699000000 +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-031/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-031-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh --- dracut-031/test/TEST-13-ENC-RAID-LVM/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2013-08-09 13:36:00.607000000 +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-031/test/TEST-15-BTRFSRAID/create-root.sh dracut-031-busybox/test/TEST-15-BTRFSRAID/create-root.sh --- dracut-031/test/TEST-15-BTRFSRAID/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2013-08-09 13:29:42.176000000 +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-031/test/TEST-30-ISCSI/create-root.sh dracut-031-busybox/test/TEST-30-ISCSI/create-root.sh --- dracut-031/test/TEST-30-ISCSI/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-30-ISCSI/create-root.sh 2013-08-09 13:33:06.619000000 +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-031/test/TEST-40-NBD/create-root.sh dracut-031-busybox/test/TEST-40-NBD/create-root.sh --- dracut-031/test/TEST-40-NBD/create-root.sh 2013-07-31 12:24:25.000000000 +0000 +++ dracut-031-busybox/test/TEST-40-NBD/create-root.sh 2013-08-09 13:29:16.535000000 +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