Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/dracut/patches/dracut-049-busybox.patch

    Contents of /trunk/dracut/patches/dracut-049-busybox.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3367 - (show annotations) (download)
    Mon Jul 8 14:01:12 2019 UTC (4 years, 9 months ago) by niro
    File size: 23963 byte(s) 
    -reworked patches for dracut-049
    1 diff -Naur dracut-049/50-dracut.install dracut-049-magellan/50-dracut.install
    2 --- dracut-049/50-dracut.install 2018-10-08 15:38:33.000000000 +0200
    3 +++ dracut-049-magellan/50-dracut.install 2019-07-08 15:32:49.522331049 +0200
    4 @@ -25,7 +25,7 @@
    5 if [[ -f ${INITRD_IMAGE_PREGENERATED} ]]; then
    6 # we found an initrd at the same place as the kernel
    7 # use this and don't generate a new one
    8 - cp --reflink=auto "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$INITRD" \
    9 + cp "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$INITRD" \
    10 && chown root:root "$BOOT_DIR_ABS/$INITRD" \
    11 && chmod 0600 "$BOOT_DIR_ABS/$INITRD" \
    12 && exit 0
    13 diff -Naur dracut-049/51-dracut-rescue.install dracut-049-magellan/51-dracut-rescue.install
    14 --- dracut-049/51-dracut-rescue.install 2018-10-08 15:38:33.000000000 +0200
    15 +++ dracut-049-magellan/51-dracut-rescue.install 2019-07-08 15:32:49.522331049 +0200
    16 @@ -18,7 +18,7 @@
    17 [[ -f $i ]] && echo ${i##*/}
    18 done
    19 shift
    20 - done | sort -Vu
    21 + done | sort -u
    22 )
    23
    24 for f in $files; do
    25 @@ -93,7 +93,7 @@
    26
    27 [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS"
    28
    29 - if ! cp --reflink=auto "$KERNEL_IMAGE" "$BOOT_DIR_ABS/$KERNEL"; then
    30 + if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS/$KERNEL"; then
    31 echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/$KERNEL'!" >&2
    32 fi
    33
    34 diff -Naur dracut-049/51-dracut-rescue-postinst.sh dracut-049-magellan/51-dracut-rescue-postinst.sh
    35 --- dracut-049/51-dracut-rescue-postinst.sh 2018-10-08 15:38:33.000000000 +0200
    36 +++ dracut-049-magellan/51-dracut-rescue-postinst.sh 2019-07-08 15:42:40.945897877 +0200
    37 @@ -31,7 +31,7 @@
    38 [[ -f $i ]] && echo ${i##*/}
    39 done
    40 shift
    41 - done | sort -Vu
    42 + done | sort -u
    43 )
    44
    45 for f in $files; do
    46 @@ -57,7 +57,7 @@
    47 fi
    48
    49 if [[ ! -f $NEW_KERNEL_IMAGE ]]; then
    50 - cp --reflink=auto "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
    51 + cp "$KERNEL_IMAGE" "$NEW_KERNEL_IMAGE"
    52 ((ret+=$?))
    53 fi
    54
    55 diff -Naur dracut-049/dracut-init.sh dracut-049-magellan/dracut-init.sh
    56 --- dracut-049/dracut-init.sh 2018-10-08 15:38:33.000000000 +0200
    57 +++ dracut-049-magellan/dracut-init.sh 2019-07-08 15:32:49.523331035 +0200
    58 @@ -20,9 +20,9 @@
    59 export LC_MESSAGES=C
    60
    61 if [[ "$EUID" = "0" ]]; then
    62 - export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr,links -dfr"
    63 + export DRACUT_CP="cp -dfrp"
    64 else
    65 - export DRACUT_CP="cp --reflink=auto --sparse=auto --preserve=mode,timestamps,links -dfr"
    66 + export DRACUT_CP="cp -dfrp"
    67 fi
    68
    69 # is_func <command>
    70 @@ -1025,7 +1025,7 @@
    71 return $_ret
    72 }
    73
    74 -if [[ "$(ln --help)" == *--relative* ]]; then
    75 +if [[ "$(ln --help &> /dev/null)" == *--relative* ]]; then
    76 ln_r() {
    77 ln -sfnr "${initdir}/$1" "${initdir}/$2"
    78 }
    79 diff -Naur dracut-049/dracut.sh dracut-049-magellan/dracut.sh
    80 --- dracut-049/dracut.sh 2018-10-08 15:38:33.000000000 +0200
    81 +++ dracut-049-magellan/dracut.sh 2019-07-08 15:46:22.429510532 +0200
    82 @@ -284,7 +284,7 @@
    83 printf "%s\n" "${i##*/}"
    84 fi
    85 done
    86 - done | sort -Vu | {
    87 + done | sort -u | {
    88 readarray -t files
    89
    90 for f in "${files[@]}"; do
    91 @@ -881,7 +881,7 @@
    92
    93 [[ $reproducible == yes ]] && DRACUT_REPRODUCIBLE=1
    94
    95 -readonly TMPDIR="$(realpath -e "$tmpdir")"
    96 +readonly TMPDIR="$(realpath "$tmpdir")"
    97 [ -d "$TMPDIR" ] || {
    98 printf "%s\n" "dracut: Invalid tmpdir '$tmpdir'." >&2
    99 exit 1
    100 @@ -1609,11 +1609,11 @@
    101 object_destdir=${destdir}/${objectname#$src/}
    102 if ! [[ -e "$object_destdir" ]]; then
    103 mkdir -m 0755 -p "$object_destdir"
    104 - chmod --reference="$objectname" "$object_destdir"
    105 + chmod $(stat -c %a "$objectname") "$object_destdir"
    106 fi
    107 - $DRACUT_CP -t "$object_destdir" "$objectname"/*
    108 + $DRACUT_CP "$objectname"/* "$object_destdir"
    109 else
    110 - $DRACUT_CP -t "$destdir" "$objectname"
    111 + $DRACUT_CP "$objectname" "$destdir"
    112 fi
    113 done
    114 fi
    115 @@ -1811,13 +1811,13 @@
    116
    117 if [[ -d $_sqsh_file ]]; then
    118 if [[ -L $_sqsh_file ]]; then
    119 - cp --preserve=all -P $_sqsh_file $_init_file
    120 + cp -a -P $_sqsh_file $_init_file
    121 else
    122 mkdir $_init_file
    123 fi
    124 else
    125 if [[ -L $_sqsh_file ]]; then
    126 - cp --preserve=all -P $_sqsh_file $_init_file
    127 + cp -a -P $_sqsh_file $_init_file
    128 _sqsh_file=$(realpath $_sqsh_file 2>/dev/null)
    129 if [[ -e $_sqsh_file ]] && [[ "$_sqsh_file" == "$squash_dir"* ]]; then
    130 # Relative symlink
    131 @@ -1943,7 +1943,7 @@
    132 --add-section .linux="$kernel_image" --change-section-vma .linux=0x40000 \
    133 --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd=0x3000000 \
    134 "$uefi_stub" "${uefi_outdir}/linux.efi" \
    135 - && cp --reflink=auto "${uefi_outdir}/linux.efi" "$outfile"; then
    136 + && cp "${uefi_outdir}/linux.efi" "$outfile"; then
    137 dinfo "*** Creating UEFI image file '$outfile' done ***"
    138 else
    139 rm -f -- "$outfile"
    140 @@ -1951,7 +1951,7 @@
    141 exit 1
    142 fi
    143 else
    144 - if cp --reflink=auto "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then
    145 + if cp "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then
    146 dinfo "*** Creating initramfs image file '$outfile' done ***"
    147 else
    148 rm -f -- "$outfile"
    149 diff -Naur dracut-049/install/dracut-install.c dracut-049-magellan/install/dracut-install.c
    150 --- dracut-049/install/dracut-install.c 2018-10-08 15:38:33.000000000 +0200
    151 +++ dracut-049-magellan/install/dracut-install.c 2019-07-08 15:32:49.524331021 +0200
    152 @@ -303,10 +303,10 @@
    153 pid = fork();
    154 if (pid == 0) {
    155 if (geteuid() == 0)
    156 - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,xattr,timestamps", "-fL", src, dst,
    157 + execlp("cp", "cp", "-pfL", src, dst,
    158 NULL);
    159 else
    160 - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst,
    161 + execlp("cp", "cp", "-pfL", src, dst,
    162 NULL);
    163 _exit(EXIT_FAILURE);
    164 }
    165 @@ -315,10 +315,10 @@
    166 if (errno != EINTR) {
    167 ret = -1;
    168 if (geteuid() == 0)
    169 - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,xattr,timestamps -fL %s %s", src,
    170 + log_error("Failed: cp -pfL %s %s", src,
    171 dst);
    172 else
    173 - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src,
    174 + log_error("Failed: cp -pfL %s %s", src,
    175 dst);
    176 break;
    177 }
    178 diff -Naur dracut-049/Makefile dracut-049-magellan/Makefile
    179 --- dracut-049/Makefile 2019-07-08 15:16:35.042442901 +0200
    180 +++ dracut-049-magellan/Makefile 2019-07-08 15:32:49.524331021 +0200
    181 @@ -135,7 +135,7 @@
    182 ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
    183 install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh
    184 install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore
    185 - cp -arx modules.d $(DESTDIR)$(pkglibdir)
    186 + cp -ar modules.d $(DESTDIR)$(pkglibdir)
    187 ifneq ($(enable_documentation),no)
    188 for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done
    189 for i in $(man5pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man5/$${i##*/}; done
    190 diff -Naur dracut-049/modules.d/10i18n/module-setup.sh dracut-049-magellan/modules.d/10i18n/module-setup.sh
    191 --- dracut-049/modules.d/10i18n/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    192 +++ dracut-049-magellan/modules.d/10i18n/module-setup.sh 2019-07-08 15:32:49.524331021 +0200
    193 @@ -118,7 +118,7 @@
    194
    195 for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do
    196 inst_dir "$_src"
    197 - $DRACUT_CP -L -t "${initdir}/${_src}" "$_src"/*
    198 + $DRACUT_CP -L "$_src"/* "${initdir}/${_src}"
    199 done
    200
    201 # remove unnecessary files
    202 diff -Naur dracut-049/modules.d/30convertfs/convertfs.sh dracut-049-magellan/modules.d/30convertfs/convertfs.sh
    203 --- dracut-049/modules.d/30convertfs/convertfs.sh 2018-10-08 15:38:33.000000000 +0200
    204 +++ dracut-049-magellan/modules.d/30convertfs/convertfs.sh 2019-07-08 15:32:49.525331006 +0200
    205 @@ -129,11 +129,11 @@
    206 [[ -d "$ROOT/$dir" ]] || continue
    207 echo "Make a copy of \`$ROOT/usr/$dir'."
    208 [[ -d "$ROOT/usr/$dir" ]] \
    209 - && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
    210 + && cp -a -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new"
    211 echo "Merge the copy with \`$ROOT/$dir'."
    212 [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \
    213 || mkdir -p "$ROOT/usr/${dir}.usrmove-new"
    214 - cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
    215 + cp -a $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new"
    216 echo "Clean up duplicates in \`$ROOT/usr/$dir'."
    217 # delete all symlinks that have been backed up
    218 find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
    219 diff -Naur dracut-049/modules.d/45url-lib/module-setup.sh dracut-049-magellan/modules.d/45url-lib/module-setup.sh
    220 --- dracut-049/modules.d/45url-lib/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    221 +++ dracut-049-magellan/modules.d/45url-lib/module-setup.sh 2019-07-08 15:32:49.525331006 +0200
    222 @@ -29,8 +29,8 @@
    223 [[ -d $_dir ]] || continue
    224 for _lib in $_dir/libcurl.so.*; do
    225 [[ -e $_lib ]] || continue
    226 - [[ $_nssckbi ]] || _nssckbi=$(grep -F --binary-files=text -z libnssckbi $_lib)
    227 - _crt=$(grep -F --binary-files=text -z .crt $_lib)
    228 + [[ $_nssckbi ]] || _nssckbi=$(grep -F libnssckbi $_lib)
    229 + _crt=$(grep -F .crt $_lib)
    230 [[ $_crt ]] || continue
    231 [[ $_crt == /*/* ]] || continue
    232 if ! inst "$_crt"; then
    233 @@ -51,7 +51,7 @@
    234 for _dir in $libdirs; do
    235 [[ -e $_dir/libnssckbi.so ]] || continue
    236 # this looks for directory-ish strings in the file
    237 - for _p11roots in $(grep -o --binary-files=text "/[[:alpha:]][[:print:]]*" $_dir/libnssckbi.so) ; do
    238 + for _p11roots in $(grep -o "/[[:alpha:]][[:print:]]*" $_dir/libnssckbi.so) ; do
    239 # the string can be a :-separated list of dirs
    240 for _p11root in $(echo "$_p11roots" | tr ':' '\n') ; do
    241 # check if it's actually a directory (there are
    242 diff -Naur dracut-049/modules.d/95terminfo/module-setup.sh dracut-049-magellan/modules.d/95terminfo/module-setup.sh
    243 --- dracut-049/modules.d/95terminfo/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    244 +++ dracut-049-magellan/modules.d/95terminfo/module-setup.sh 2019-07-08 15:32:49.525331006 +0200
    245 @@ -11,7 +11,7 @@
    246 if [ -d ${_terminfodir} ]; then
    247 for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do
    248 inst_dir "$_terminfodir/${i%/*}"
    249 - $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i"
    250 + $DRACUT_CP -L "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}"
    251 done
    252 fi
    253 }
    254 diff -Naur dracut-049/modules.d/99base/dracut-lib.sh dracut-049-magellan/modules.d/99base/dracut-lib.sh
    255 --- dracut-049/modules.d/99base/dracut-lib.sh 2018-10-08 15:38:33.000000000 +0200
    256 +++ dracut-049-magellan/modules.d/99base/dracut-lib.sh 2019-07-08 15:32:49.525331006 +0200
    257 @@ -690,7 +690,7 @@
    258 copytree() {
    259 local src="$1" dest="$2"
    260 mkdir -p "$dest"; dest=$(readlink -e -q "$dest")
    261 - ( cd "$src"; cp -af . -t "$dest" )
    262 + ( cd "$src"; cp -af . "$dest" )
    263 }
    264
    265 # Evaluates command for UUIDs either given as arguments for this function or all
    266 diff -Naur dracut-049/test/TEST-01-BASIC/create-root.sh dracut-049-magellan/test/TEST-01-BASIC/create-root.sh
    267 --- dracut-049/test/TEST-01-BASIC/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    268 +++ dracut-049-magellan/test/TEST-01-BASIC/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    269 @@ -16,7 +16,7 @@
    270 mkfs.ext3 -L dracut /dev/sda2
    271 mkdir -p /root
    272 mount /dev/sda2 /root
    273 -cp -a -t /root /source/*
    274 +cp -a /source/* /root
    275 mkdir -p /root/run
    276 umount /root
    277 echo "dracut-root-block-created" >/dev/sda1
    278 diff -Naur dracut-049/test/TEST-02-SYSTEMD/create-root.sh dracut-049-magellan/test/TEST-02-SYSTEMD/create-root.sh
    279 --- dracut-049/test/TEST-02-SYSTEMD/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    280 +++ dracut-049-magellan/test/TEST-02-SYSTEMD/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    281 @@ -16,7 +16,7 @@
    282 mkfs.ext3 -L dracut /dev/sda2
    283 mkdir -p /root
    284 mount /dev/sda2 /root
    285 -cp -a -t /root /source/*
    286 +cp -a /source/* /root
    287 mkdir -p /root/run
    288 umount /root
    289 echo "dracut-root-block-created" >/dev/sda1
    290 diff -Naur dracut-049/test/TEST-03-USR-MOUNT/create-root.sh dracut-049-magellan/test/TEST-03-USR-MOUNT/create-root.sh
    291 --- dracut-049/test/TEST-03-USR-MOUNT/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    292 +++ dracut-049-magellan/test/TEST-03-USR-MOUNT/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    293 @@ -30,7 +30,7 @@
    294 btrfs subvolume create /root/usr/usr
    295 umount /root/usr
    296 mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr
    297 -cp -a -t /root /source/*
    298 +cp -a /source/* /root
    299 mkdir -p /root/run
    300 umount /root/usr
    301 umount /root
    302 diff -Naur dracut-049/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-049-magellan/test/TEST-04-FULL-SYSTEMD/create-root.sh
    303 --- dracut-049/test/TEST-04-FULL-SYSTEMD/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    304 +++ dracut-049-magellan/test/TEST-04-FULL-SYSTEMD/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    305 @@ -31,7 +31,7 @@
    306 btrfs subvolume create /root/usr/usr
    307 umount /root/usr
    308 mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr
    309 -cp -a -t /root /source/*
    310 +cp -a /source/* /root
    311 mkdir -p /root/run
    312 umount /root/usr
    313 umount /root
    314 diff -Naur dracut-049/test/TEST-10-RAID/create-root.sh dracut-049-magellan/test/TEST-10-RAID/create-root.sh
    315 --- dracut-049/test/TEST-10-RAID/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    316 +++ dracut-049-magellan/test/TEST-10-RAID/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    317 @@ -29,7 +29,7 @@
    318 mke2fs /dev/dracut/root
    319 mkdir -p /sysroot
    320 mount /dev/dracut/root /sysroot
    321 -cp -a -t /sysroot /source/*
    322 +cp -a /source/* /sysroot
    323 umount /sysroot
    324 lvm lvchange -a n /dev/dracut/root
    325 udevadm settle
    326 diff -Naur dracut-049/test/TEST-11-LVM/create-root.sh dracut-049-magellan/test/TEST-11-LVM/create-root.sh
    327 --- dracut-049/test/TEST-11-LVM/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    328 +++ dracut-049-magellan/test/TEST-11-LVM/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    329 @@ -22,7 +22,7 @@
    330 mke2fs /dev/dracut/root && \
    331 mkdir -p /sysroot && \
    332 mount /dev/dracut/root /sysroot && \
    333 -cp -a -t /sysroot /source/* && \
    334 +cp -a /source/* /sysroot && \
    335 umount /sysroot && \
    336 sleep 1 && \
    337 lvm lvchange -a n /dev/dracut/root && \
    338 diff -Naur dracut-049/test/TEST-12-RAID-DEG/create-root.sh dracut-049-magellan/test/TEST-12-RAID-DEG/create-root.sh
    339 --- dracut-049/test/TEST-12-RAID-DEG/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    340 +++ dracut-049-magellan/test/TEST-12-RAID-DEG/create-root.sh 2019-07-08 15:32:49.526330992 +0200
    341 @@ -34,7 +34,7 @@
    342 mke2fs -L root /dev/dracut/root
    343 mkdir -p /sysroot
    344 mount /dev/dracut/root /sysroot
    345 -cp -a -t /sysroot /source/*
    346 +cp -a /source/* /sysroot
    347 mkdir /sysroot/run
    348 umount /sysroot
    349 lvm lvchange -a n /dev/dracut/root
    350 diff -Naur dracut-049/test/TEST-12-RAID-DEG/test.sh dracut-049-magellan/test/TEST-12-RAID-DEG/test.sh
    351 --- dracut-049/test/TEST-12-RAID-DEG/test.sh 2018-10-08 15:38:33.000000000 +0200
    352 +++ dracut-049-magellan/test/TEST-12-RAID-DEG/test.sh 2019-07-08 15:32:49.527330978 +0200
    353 @@ -11,8 +11,8 @@
    354
    355 client_run() {
    356 echo "CLIENT TEST START: $@"
    357 - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new
    358 - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new
    359 + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new
    360 + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new
    361
    362 $testdir/run-qemu \
    363 -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 512M -nographic -smp 2 \
    364 @@ -33,7 +33,7 @@
    365 }
    366
    367 test_run() {
    368 - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
    369 + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2)
    370 echo "MD_UUID=$MD_UUID"
    371 read LUKS_UUID < $TESTDIR/luksuuid
    372
    373 @@ -122,7 +122,7 @@
    374 -initrd $TESTDIR/initramfs.makeroot || return 1
    375
    376 grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
    377 - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
    378 + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2)
    379 eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2)
    380 echo $ID_FS_UUID > $TESTDIR/luksuuid
    381
    382 diff -Naur dracut-049/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-049-magellan/test/TEST-13-ENC-RAID-LVM/create-root.sh
    383 --- dracut-049/test/TEST-13-ENC-RAID-LVM/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    384 +++ dracut-049-magellan/test/TEST-13-ENC-RAID-LVM/create-root.sh 2019-07-08 15:32:49.527330978 +0200
    385 @@ -32,7 +32,7 @@
    386 mke2fs /dev/dracut/root && \
    387 mkdir -p /sysroot && \
    388 mount /dev/dracut/root /sysroot && \
    389 -cp -a -t /sysroot /source/* && \
    390 +cp -a /source/* /sysroot && \
    391 umount /sysroot && \
    392 sleep 2 && \
    393 lvm lvchange -a n /dev/dracut/root && \
    394 diff -Naur dracut-049/test/TEST-13-ENC-RAID-LVM/test.sh dracut-049-magellan/test/TEST-13-ENC-RAID-LVM/test.sh
    395 --- dracut-049/test/TEST-13-ENC-RAID-LVM/test.sh 2018-10-08 15:38:33.000000000 +0200
    396 +++ dracut-049-magellan/test/TEST-13-ENC-RAID-LVM/test.sh 2019-07-08 15:32:49.527330978 +0200
    397 @@ -115,7 +115,7 @@
    398 -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
    399 -initrd $TESTDIR/initramfs.makeroot || return 1
    400 grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
    401 - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2)
    402 + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2)
    403 for uuid in $cryptoUUIDS; do
    404 eval $uuid
    405 printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID
    406 diff -Naur dracut-049/test/TEST-14-IMSM/create-root.sh dracut-049-magellan/test/TEST-14-IMSM/create-root.sh
    407 --- dracut-049/test/TEST-14-IMSM/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    408 +++ dracut-049-magellan/test/TEST-14-IMSM/create-root.sh 2019-07-08 15:32:49.527330978 +0200
    409 @@ -62,7 +62,7 @@
    410 mke2fs -L root /dev/dracut/root && \
    411 mkdir -p /sysroot && \
    412 mount /dev/dracut/root /sysroot && \
    413 -cp -a -t /sysroot /source/* && \
    414 +cp -a /source/* /sysroot && \
    415 umount /sysroot && \
    416 lvm lvchange -a n /dev/dracut/root && \
    417 udevadm settle
    418 diff -Naur dracut-049/test/TEST-14-IMSM/test.sh dracut-049-magellan/test/TEST-14-IMSM/test.sh
    419 --- dracut-049/test/TEST-14-IMSM/test.sh 2018-10-08 15:38:33.000000000 +0200
    420 +++ dracut-049-magellan/test/TEST-14-IMSM/test.sh 2019-07-08 15:32:49.527330978 +0200
    421 @@ -113,7 +113,7 @@
    422 -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \
    423 -initrd $TESTDIR/initramfs.makeroot || return 1
    424 grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1
    425 - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2)
    426 + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2)
    427
    428 if [[ -z $MD_UUID ]]; then
    429 echo "Setup failed"
    430 diff -Naur dracut-049/test/TEST-15-BTRFSRAID/create-root.sh dracut-049-magellan/test/TEST-15-BTRFSRAID/create-root.sh
    431 --- dracut-049/test/TEST-15-BTRFSRAID/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    432 +++ dracut-049-magellan/test/TEST-15-BTRFSRAID/create-root.sh 2019-07-08 15:32:49.527330978 +0200
    433 @@ -21,7 +21,7 @@
    434 set -e
    435 mkdir -p /sysroot
    436 mount -t btrfs /dev/sda5 /sysroot
    437 -cp -a -t /sysroot /source/*
    438 +cp -a /source/* /sysroot
    439 umount /sysroot
    440 echo "dracut-root-block-created" >/dev/sda1
    441 poweroff -f
    442 diff -Naur dracut-049/test/TEST-17-LVM-THIN/create-root.sh dracut-049-magellan/test/TEST-17-LVM-THIN/create-root.sh
    443 --- dracut-049/test/TEST-17-LVM-THIN/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    444 +++ dracut-049-magellan/test/TEST-17-LVM-THIN/create-root.sh 2019-07-08 15:32:49.527330978 +0200
    445 @@ -23,7 +23,7 @@
    446 mke2fs /dev/dracut/root && \
    447 mkdir -p /sysroot && \
    448 mount /dev/dracut/root /sysroot && \
    449 -cp -a -t /sysroot /source/* && \
    450 +cp -a /source/* /sysroot && \
    451 umount /sysroot && \
    452 sleep 1 && \
    453 lvm lvchange -a n /dev/dracut/root && \
    454 diff -Naur dracut-049/test/TEST-30-ISCSI/create-root.sh dracut-049-magellan/test/TEST-30-ISCSI/create-root.sh
    455 --- dracut-049/test/TEST-30-ISCSI/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    456 +++ dracut-049-magellan/test/TEST-30-ISCSI/create-root.sh 2019-07-08 15:32:49.527330978 +0200
    457 @@ -8,7 +8,7 @@
    458 mkfs.ext3 -j -L singleroot -F /dev/sda && \
    459 mkdir -p /sysroot && \
    460 mount /dev/sda /sysroot && \
    461 -cp -a -t /sysroot /source/* && \
    462 +cp -a /source/* /sysroot && \
    463 umount /sysroot && \
    464 mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \
    465 mdadm -W /dev/md0 || : && \
    466 @@ -18,7 +18,7 @@
    467 lvm vgchange -ay && \
    468 mkfs.ext3 -j -L sysroot /dev/dracut/root && \
    469 mount /dev/dracut/root /sysroot && \
    470 -cp -a -t /sysroot /source/* && \
    471 +cp -a /source/* /sysroot && \
    472 umount /sysroot && \
    473 lvm lvchange -a n /dev/dracut/root && \
    474 echo "dracut-root-block-created" >/dev/sdb
    475 diff -Naur dracut-049/test/TEST-31-ISCSI-MULTI/create-root.sh dracut-049-magellan/test/TEST-31-ISCSI-MULTI/create-root.sh
    476 --- dracut-049/test/TEST-31-ISCSI-MULTI/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    477 +++ dracut-049-magellan/test/TEST-31-ISCSI-MULTI/create-root.sh 2019-07-08 15:32:49.528330963 +0200
    478 @@ -8,7 +8,7 @@
    479 mkfs.ext3 -j -L singleroot -F /dev/sda && \
    480 mkdir -p /sysroot && \
    481 mount /dev/sda /sysroot && \
    482 -cp -a -t /sysroot /source/* && \
    483 +cp -a /source/* /sysroot && \
    484 umount /sysroot && \
    485 mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \
    486 mdadm -W /dev/md0 || : && \
    487 @@ -18,7 +18,7 @@
    488 lvm vgchange -ay && \
    489 mkfs.ext3 -j -L sysroot /dev/dracut/root && \
    490 mount /dev/dracut/root /sysroot && \
    491 -cp -a -t /sysroot /source/* && \
    492 +cp -a /source/* /sysroot && \
    493 umount /sysroot && \
    494 lvm lvchange -a n /dev/dracut/root && \
    495 echo "dracut-root-block-created" >/dev/sdb
    496 diff -Naur dracut-049/test/TEST-40-NBD/create-root.sh dracut-049-magellan/test/TEST-40-NBD/create-root.sh
    497 --- dracut-049/test/TEST-40-NBD/create-root.sh 2018-10-08 15:38:33.000000000 +0200
    498 +++ dracut-049-magellan/test/TEST-40-NBD/create-root.sh 2019-07-08 15:32:49.528330963 +0200
    499 @@ -17,7 +17,7 @@
    500 /sbin/tune2fs -e continue /dev/dracut/root && \
    501 mkdir -p /sysroot && \
    502 mount /dev/dracut/root /sysroot && \
    503 -cp -a -t /sysroot /source/* && \
    504 +cp -a /source/* /sysroot && \
    505 umount /sysroot
    506 sleep 1
    507 lvm lvchange -a n /dev/dracut/root
    508 diff -Naur dracut-049/test/TEST-99-RPM/test.sh dracut-049-magellan/test/TEST-99-RPM/test.sh
    509 --- dracut-049/test/TEST-99-RPM/test.sh 2018-10-08 15:38:33.000000000 +0200
    510 +++ dracut-049-magellan/test/TEST-99-RPM/test.sh 2019-07-08 15:32:49.528330963 +0200
    511 @@ -26,7 +26,7 @@
    512 mount -t devtmpfs devtmpfs "$rootdir/dev"
    513
    514 mkdir -p "$rootdir/$TESTDIR"
    515 - cp --reflink=auto -a \
    516 + cp -a \
    517 "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \
    518 "$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \
    519 "$rootdir/$TESTDIR/"