Magellan Linux

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

    Annotation of /trunk/dracut/patches/dracut-048-busybox.patch

    Parent Directory Parent Directory | Revision Log Revision Log

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