Annotation of /trunk/dracut/patches/dracut-047-busybox.patch
Parent Directory | Revision Log
Revision 3131 -
(hide annotations)
(download)
Fri Jun 15 13:34:36 2018 UTC (6 years, 3 months ago) by niro
File size: 23243 byte(s)
Fri Jun 15 13:34:36 2018 UTC (6 years, 3 months ago) by niro
File size: 23243 byte(s)
-re-diffed busybox patch
1 | niro | 3131 | diff -Naur dracut-047/50-dracut.install dracut-047-busybox/50-dracut.install |
2 | --- dracut-047/50-dracut.install 2018-02-19 10:00:33.000000000 +0100 | ||
3 | +++ dracut-047-busybox/50-dracut.install 2018-06-15 15:06:52.727068252 +0200 | ||
4 | @@ -18,7 +18,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-047/51-dracut-rescue.install dracut-047-busybox/51-dracut-rescue.install | ||
14 | --- dracut-047/51-dracut-rescue.install 2018-02-19 10:00:33.000000000 +0100 | ||
15 | +++ dracut-047-busybox/51-dracut-rescue.install 2018-06-15 15:07:47.043389716 +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 | @@ -82,7 +82,7 @@ | ||
26 | |||
27 | [[ -d "$BOOT_DIR_ABS" ]] || mkdir -p "$BOOT_DIR_ABS" | ||
28 | |||
29 | - if ! cp --reflink=auto "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then | ||
30 | + if ! cp "$KERNEL_IMAGE" "$BOOT_DIR_ABS"/linux; then | ||
31 | echo "Can't copy '$KERNEL_IMAGE to '$BOOT_DIR_ABS/linux'!" >&2 | ||
32 | fi | ||
33 | |||
34 | diff -Naur dracut-047/51-dracut-rescue-postinst.sh dracut-047-busybox/51-dracut-rescue-postinst.sh | ||
35 | --- dracut-047/51-dracut-rescue-postinst.sh 2018-02-19 10:00:33.000000000 +0100 | ||
36 | +++ dracut-047-busybox/51-dracut-rescue-postinst.sh 2018-06-15 15:08:18.854990591 +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-047/dracut-init.sh dracut-047-busybox/dracut-init.sh | ||
56 | --- dracut-047/dracut-init.sh 2018-02-19 10:00:33.000000000 +0100 | ||
57 | +++ dracut-047-busybox/dracut-init.sh 2018-06-15 15:11:07.597855271 +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 | @@ -1009,7 +1009,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-047/dracut.sh dracut-047-busybox/dracut.sh | ||
80 | --- dracut-047/dracut.sh 2018-02-19 10:00:33.000000000 +0100 | ||
81 | +++ dracut-047-busybox/dracut.sh 2018-06-15 15:14:32.901225452 +0200 | ||
82 | @@ -269,7 +269,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 | @@ -858,7 +858,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 | @@ -1583,11 +1583,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 | @@ -1813,7 +1813,7 @@ | ||
116 | --add-section .linux="$kernel_image" --change-section-vma .linux=0x40000 \ | ||
117 | --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd=0x3000000 \ | ||
118 | "$uefi_stub" "${uefi_outdir}/linux.efi" \ | ||
119 | - && cp --reflink=auto "${uefi_outdir}/linux.efi" "$outfile"; then | ||
120 | + && cp "${uefi_outdir}/linux.efi" "$outfile"; then | ||
121 | dinfo "*** Creating UEFI image file '$outfile' done ***" | ||
122 | else | ||
123 | rm -f -- "$outfile" | ||
124 | @@ -1821,7 +1821,7 @@ | ||
125 | exit 1 | ||
126 | fi | ||
127 | else | ||
128 | - if cp --reflink=auto "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then | ||
129 | + if cp "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then | ||
130 | dinfo "*** Creating initramfs image file '$outfile' done ***" | ||
131 | else | ||
132 | rm -f -- "$outfile" | ||
133 | diff -Naur dracut-047/install/dracut-install.c dracut-047-busybox/install/dracut-install.c | ||
134 | --- dracut-047/install/dracut-install.c 2018-02-19 10:00:33.000000000 +0100 | ||
135 | +++ dracut-047-busybox/install/dracut-install.c 2018-06-15 15:15:53.727183038 +0200 | ||
136 | @@ -303,10 +303,10 @@ | ||
137 | pid = fork(); | ||
138 | if (pid == 0) { | ||
139 | if (geteuid() == 0) | ||
140 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,xattr,timestamps", "-fL", src, dst, | ||
141 | + execlp("cp", "cp", "-pfL", src, dst, | ||
142 | NULL); | ||
143 | else | ||
144 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, | ||
145 | + execlp("cp", "cp", "-pfL", src, dst, | ||
146 | NULL); | ||
147 | _exit(EXIT_FAILURE); | ||
148 | } | ||
149 | @@ -315,10 +315,10 @@ | ||
150 | if (errno != EINTR) { | ||
151 | ret = -1; | ||
152 | if (geteuid() == 0) | ||
153 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,xattr,timestamps -fL %s %s", src, | ||
154 | + log_error("Failed: cp -pfL %s %s", src, | ||
155 | dst); | ||
156 | else | ||
157 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, | ||
158 | + log_error("Failed: cp -pfL %s %s", src, | ||
159 | dst); | ||
160 | break; | ||
161 | } | ||
162 | diff -Naur dracut-047/Makefile dracut-047-busybox/Makefile | ||
163 | --- dracut-047/Makefile 2018-02-19 10:00:33.000000000 +0100 | ||
164 | +++ dracut-047-busybox/Makefile 2018-06-15 15:16:55.088389533 +0200 | ||
165 | @@ -129,7 +129,7 @@ | ||
166 | ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions | ||
167 | install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh | ||
168 | install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore | ||
169 | - cp -arx modules.d $(DESTDIR)$(pkglibdir) | ||
170 | + cp -ar modules.d $(DESTDIR)$(pkglibdir) | ||
171 | ifneq ($(enable_documentation),no) | ||
172 | for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done | ||
173 | for i in $(man5pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man5/$${i##*/}; done | ||
174 | diff -Naur dracut-047/modules.d/10i18n/module-setup.sh dracut-047-busybox/modules.d/10i18n/module-setup.sh | ||
175 | --- dracut-047/modules.d/10i18n/module-setup.sh 2018-02-19 10:00:33.000000000 +0100 | ||
176 | +++ dracut-047-busybox/modules.d/10i18n/module-setup.sh 2018-06-15 15:17:55.551606054 +0200 | ||
177 | @@ -118,7 +118,7 @@ | ||
178 | |||
179 | for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do | ||
180 | inst_dir "$_src" | ||
181 | - $DRACUT_CP -L -t "${initdir}/${_src}" "$_src"/* | ||
182 | + $DRACUT_CP -L "$_src"/* "${initdir}/${_src}" | ||
183 | done | ||
184 | |||
185 | # remove unnecessary files | ||
186 | diff -Naur dracut-047/modules.d/30convertfs/convertfs.sh dracut-047-busybox/modules.d/30convertfs/convertfs.sh | ||
187 | --- dracut-047/modules.d/30convertfs/convertfs.sh 2018-02-19 10:00:33.000000000 +0100 | ||
188 | +++ dracut-047-busybox/modules.d/30convertfs/convertfs.sh 2018-06-15 15:18:59.399777227 +0200 | ||
189 | @@ -129,11 +129,11 @@ | ||
190 | [[ -d "$ROOT/$dir" ]] || continue | ||
191 | echo "Make a copy of \`$ROOT/usr/$dir'." | ||
192 | [[ -d "$ROOT/usr/$dir" ]] \ | ||
193 | - && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
194 | + && cp -a -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
195 | echo "Merge the copy with \`$ROOT/$dir'." | ||
196 | [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \ | ||
197 | || mkdir -p "$ROOT/usr/${dir}.usrmove-new" | ||
198 | - cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
199 | + cp -a $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
200 | echo "Clean up duplicates in \`$ROOT/usr/$dir'." | ||
201 | # delete all symlinks that have been backed up | ||
202 | find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || : | ||
203 | diff -Naur dracut-047/modules.d/45url-lib/module-setup.sh dracut-047-busybox/modules.d/45url-lib/module-setup.sh | ||
204 | --- dracut-047/modules.d/45url-lib/module-setup.sh 2018-02-19 10:00:33.000000000 +0100 | ||
205 | +++ dracut-047-busybox/modules.d/45url-lib/module-setup.sh 2018-06-15 15:20:51.030324936 +0200 | ||
206 | @@ -29,8 +29,8 @@ | ||
207 | [[ -d $_dir ]] || continue | ||
208 | for _lib in $_dir/libcurl.so.*; do | ||
209 | [[ -e $_lib ]] || continue | ||
210 | - [[ $_nssckbi ]] || _nssckbi=$(grep -F --binary-files=text -z libnssckbi $_lib) | ||
211 | - _crt=$(grep -F --binary-files=text -z .crt $_lib) | ||
212 | + [[ $_nssckbi ]] || _nssckbi=$(grep -F libnssckbi $_lib) | ||
213 | + _crt=$(grep -F .crt $_lib) | ||
214 | [[ $_crt ]] || continue | ||
215 | [[ $_crt == /*/* ]] || continue | ||
216 | if ! inst "$_crt"; then | ||
217 | @@ -51,7 +51,7 @@ | ||
218 | for _dir in $libdirs; do | ||
219 | [[ -e $_dir/libnssckbi.so ]] || continue | ||
220 | # this looks for directory-ish strings in the file | ||
221 | - for _p11roots in $(grep -o --binary-files=text "/[[:alpha:]][[:print:]]*" $_dir/libnssckbi.so) ; do | ||
222 | + for _p11roots in $(grep -o "/[[:alpha:]][[:print:]]*" $_dir/libnssckbi.so) ; do | ||
223 | # the string can be a :-separated list of dirs | ||
224 | for _p11root in $(echo "$_p11roots" | tr ':' '\n') ; do | ||
225 | # check if it's actually a directory (there are | ||
226 | diff -Naur dracut-047/modules.d/95terminfo/module-setup.sh dracut-047-busybox/modules.d/95terminfo/module-setup.sh | ||
227 | --- dracut-047/modules.d/95terminfo/module-setup.sh 2018-02-19 10:00:33.000000000 +0100 | ||
228 | +++ dracut-047-busybox/modules.d/95terminfo/module-setup.sh 2018-06-15 15:21:38.156710782 +0200 | ||
229 | @@ -11,7 +11,7 @@ | ||
230 | if [ -d ${_terminfodir} ]; then | ||
231 | for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do | ||
232 | inst_dir "$_terminfodir/${i%/*}" | ||
233 | - $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" | ||
234 | + $DRACUT_CP -L "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" | ||
235 | done | ||
236 | fi | ||
237 | } | ||
238 | diff -Naur dracut-047/modules.d/99base/dracut-lib.sh dracut-047-busybox/modules.d/99base/dracut-lib.sh | ||
239 | --- dracut-047/modules.d/99base/dracut-lib.sh 2018-02-19 10:00:33.000000000 +0100 | ||
240 | +++ dracut-047-busybox/modules.d/99base/dracut-lib.sh 2018-06-15 15:22:06.307343655 +0200 | ||
241 | @@ -685,7 +685,7 @@ | ||
242 | copytree() { | ||
243 | local src="$1" dest="$2" | ||
244 | mkdir -p "$dest"; dest=$(readlink -e -q "$dest") | ||
245 | - ( cd "$src"; cp -af . -t "$dest" ) | ||
246 | + ( cd "$src"; cp -af . "$dest" ) | ||
247 | } | ||
248 | |||
249 | # Evaluates command for UUIDs either given as arguments for this function or all | ||
250 | diff -Naur dracut-047/test/TEST-01-BASIC/create-root.sh dracut-047-busybox/test/TEST-01-BASIC/create-root.sh | ||
251 | --- dracut-047/test/TEST-01-BASIC/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
252 | +++ dracut-047-busybox/test/TEST-01-BASIC/create-root.sh 2018-06-15 15:22:42.980865112 +0200 | ||
253 | @@ -16,7 +16,7 @@ | ||
254 | mkfs.ext3 -L dracut /dev/sda2 | ||
255 | mkdir -p /root | ||
256 | mount /dev/sda2 /root | ||
257 | -cp -a -t /root /source/* | ||
258 | +cp -a /source/* /root | ||
259 | mkdir -p /root/run | ||
260 | umount /root | ||
261 | echo "dracut-root-block-created" >/dev/sda1 | ||
262 | diff -Naur dracut-047/test/TEST-02-SYSTEMD/create-root.sh dracut-047-busybox/test/TEST-02-SYSTEMD/create-root.sh | ||
263 | --- dracut-047/test/TEST-02-SYSTEMD/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
264 | +++ dracut-047-busybox/test/TEST-02-SYSTEMD/create-root.sh 2018-06-15 15:23:07.575544017 +0200 | ||
265 | @@ -16,7 +16,7 @@ | ||
266 | mkfs.ext3 -L dracut /dev/sda2 | ||
267 | mkdir -p /root | ||
268 | mount /dev/sda2 /root | ||
269 | -cp -a -t /root /source/* | ||
270 | +cp -a /source/* /root | ||
271 | mkdir -p /root/run | ||
272 | umount /root | ||
273 | echo "dracut-root-block-created" >/dev/sda1 | ||
274 | diff -Naur dracut-047/test/TEST-03-USR-MOUNT/create-root.sh dracut-047-busybox/test/TEST-03-USR-MOUNT/create-root.sh | ||
275 | --- dracut-047/test/TEST-03-USR-MOUNT/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
276 | +++ dracut-047-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2018-06-15 15:23:29.689255204 +0200 | ||
277 | @@ -30,7 +30,7 @@ | ||
278 | btrfs subvolume create /root/usr/usr | ||
279 | umount /root/usr | ||
280 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
281 | -cp -a -t /root /source/* | ||
282 | +cp -a /source/* /root | ||
283 | mkdir -p /root/run | ||
284 | umount /root/usr | ||
285 | umount /root | ||
286 | diff -Naur dracut-047/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-047-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh | ||
287 | --- dracut-047/test/TEST-04-FULL-SYSTEMD/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
288 | +++ dracut-047-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2018-06-15 15:23:53.996937627 +0200 | ||
289 | @@ -31,7 +31,7 @@ | ||
290 | btrfs subvolume create /root/usr/usr | ||
291 | umount /root/usr | ||
292 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
293 | -cp -a -t /root /source/* | ||
294 | +cp -a /source/* /root | ||
295 | mkdir -p /root/run | ||
296 | umount /root/usr | ||
297 | umount /root | ||
298 | diff -Naur dracut-047/test/TEST-10-RAID/create-root.sh dracut-047-busybox/test/TEST-10-RAID/create-root.sh | ||
299 | --- dracut-047/test/TEST-10-RAID/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
300 | +++ dracut-047-busybox/test/TEST-10-RAID/create-root.sh 2018-06-15 15:24:17.698627861 +0200 | ||
301 | @@ -29,7 +29,7 @@ | ||
302 | mke2fs /dev/dracut/root | ||
303 | mkdir -p /sysroot | ||
304 | mount /dev/dracut/root /sysroot | ||
305 | -cp -a -t /sysroot /source/* | ||
306 | +cp -a /source/* /sysroot | ||
307 | umount /sysroot | ||
308 | lvm lvchange -a n /dev/dracut/root | ||
309 | udevadm settle | ||
310 | diff -Naur dracut-047/test/TEST-11-LVM/create-root.sh dracut-047-busybox/test/TEST-11-LVM/create-root.sh | ||
311 | --- dracut-047/test/TEST-11-LVM/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
312 | +++ dracut-047-busybox/test/TEST-11-LVM/create-root.sh 2018-06-15 15:24:45.854259745 +0200 | ||
313 | @@ -22,7 +22,7 @@ | ||
314 | mke2fs /dev/dracut/root && \ | ||
315 | mkdir -p /sysroot && \ | ||
316 | mount /dev/dracut/root /sysroot && \ | ||
317 | -cp -a -t /sysroot /source/* && \ | ||
318 | +cp -a /source/* /sysroot && \ | ||
319 | umount /sysroot && \ | ||
320 | sleep 1 && \ | ||
321 | lvm lvchange -a n /dev/dracut/root && \ | ||
322 | diff -Naur dracut-047/test/TEST-12-RAID-DEG/create-root.sh dracut-047-busybox/test/TEST-12-RAID-DEG/create-root.sh | ||
323 | --- dracut-047/test/TEST-12-RAID-DEG/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
324 | +++ dracut-047-busybox/test/TEST-12-RAID-DEG/create-root.sh 2018-06-15 15:25:11.193928348 +0200 | ||
325 | @@ -34,7 +34,7 @@ | ||
326 | mke2fs -L root /dev/dracut/root | ||
327 | mkdir -p /sysroot | ||
328 | mount /dev/dracut/root /sysroot | ||
329 | -cp -a -t /sysroot /source/* | ||
330 | +cp -a /source/* /sysroot | ||
331 | mkdir /sysroot/run | ||
332 | umount /sysroot | ||
333 | lvm lvchange -a n /dev/dracut/root | ||
334 | diff -Naur dracut-047/test/TEST-12-RAID-DEG/test.sh dracut-047-busybox/test/TEST-12-RAID-DEG/test.sh | ||
335 | --- dracut-047/test/TEST-12-RAID-DEG/test.sh 2018-02-19 10:00:33.000000000 +0100 | ||
336 | +++ dracut-047-busybox/test/TEST-12-RAID-DEG/test.sh 2018-06-15 15:26:03.143248592 +0200 | ||
337 | @@ -11,8 +11,8 @@ | ||
338 | |||
339 | client_run() { | ||
340 | echo "CLIENT TEST START: $@" | ||
341 | - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
342 | - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
343 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
344 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
345 | |||
346 | $testdir/run-qemu \ | ||
347 | -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 512M -nographic -smp 2 \ | ||
348 | @@ -33,7 +33,7 @@ | ||
349 | } | ||
350 | |||
351 | test_run() { | ||
352 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
353 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
354 | echo "MD_UUID=$MD_UUID" | ||
355 | read LUKS_UUID < $TESTDIR/luksuuid | ||
356 | |||
357 | @@ -122,7 +122,7 @@ | ||
358 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
359 | |||
360 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
361 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
362 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
363 | eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) | ||
364 | echo $ID_FS_UUID > $TESTDIR/luksuuid | ||
365 | |||
366 | diff -Naur dracut-047/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-047-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh | ||
367 | --- dracut-047/test/TEST-13-ENC-RAID-LVM/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
368 | +++ dracut-047-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2018-06-15 15:26:33.259854358 +0200 | ||
369 | @@ -32,7 +32,7 @@ | ||
370 | mke2fs /dev/dracut/root && \ | ||
371 | mkdir -p /sysroot && \ | ||
372 | mount /dev/dracut/root /sysroot && \ | ||
373 | -cp -a -t /sysroot /source/* && \ | ||
374 | +cp -a /source/* /sysroot && \ | ||
375 | umount /sysroot && \ | ||
376 | sleep 2 && \ | ||
377 | lvm lvchange -a n /dev/dracut/root && \ | ||
378 | diff -Naur dracut-047/test/TEST-13-ENC-RAID-LVM/test.sh dracut-047-busybox/test/TEST-13-ENC-RAID-LVM/test.sh | ||
379 | --- dracut-047/test/TEST-13-ENC-RAID-LVM/test.sh 2018-02-19 10:00:33.000000000 +0100 | ||
380 | +++ dracut-047-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2018-06-15 15:26:53.491589437 +0200 | ||
381 | @@ -115,7 +115,7 @@ | ||
382 | -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
383 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
384 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
385 | - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
386 | + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
387 | for uuid in $cryptoUUIDS; do | ||
388 | eval $uuid | ||
389 | printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID | ||
390 | diff -Naur dracut-047/test/TEST-14-IMSM/create-root.sh dracut-047-busybox/test/TEST-14-IMSM/create-root.sh | ||
391 | --- dracut-047/test/TEST-14-IMSM/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
392 | +++ dracut-047-busybox/test/TEST-14-IMSM/create-root.sh 2018-06-15 15:27:20.432236583 +0200 | ||
393 | @@ -62,7 +62,7 @@ | ||
394 | mke2fs -L root /dev/dracut/root && \ | ||
395 | mkdir -p /sysroot && \ | ||
396 | mount /dev/dracut/root /sysroot && \ | ||
397 | -cp -a -t /sysroot /source/* && \ | ||
398 | +cp -a /source/* /sysroot && \ | ||
399 | umount /sysroot && \ | ||
400 | lvm lvchange -a n /dev/dracut/root && \ | ||
401 | udevadm settle | ||
402 | diff -Naur dracut-047/test/TEST-14-IMSM/test.sh dracut-047-busybox/test/TEST-14-IMSM/test.sh | ||
403 | --- dracut-047/test/TEST-14-IMSM/test.sh 2018-02-19 10:00:33.000000000 +0100 | ||
404 | +++ dracut-047-busybox/test/TEST-14-IMSM/test.sh 2018-06-15 15:27:37.362014812 +0200 | ||
405 | @@ -113,7 +113,7 @@ | ||
406 | -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
407 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
408 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
409 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
410 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
411 | |||
412 | if [[ -z $MD_UUID ]]; then | ||
413 | echo "Setup failed" | ||
414 | diff -Naur dracut-047/test/TEST-15-BTRFSRAID/create-root.sh dracut-047-busybox/test/TEST-15-BTRFSRAID/create-root.sh | ||
415 | --- dracut-047/test/TEST-15-BTRFSRAID/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
416 | +++ dracut-047-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2018-06-15 15:28:00.559710850 +0200 | ||
417 | @@ -21,7 +21,7 @@ | ||
418 | set -e | ||
419 | mkdir -p /sysroot | ||
420 | mount -t btrfs /dev/sda5 /sysroot | ||
421 | -cp -a -t /sysroot /source/* | ||
422 | +cp -a /source/* /sysroot | ||
423 | umount /sysroot | ||
424 | echo "dracut-root-block-created" >/dev/sda1 | ||
425 | poweroff -f | ||
426 | diff -Naur dracut-047/test/TEST-17-LVM-THIN/create-root.sh dracut-047-busybox/test/TEST-17-LVM-THIN/create-root.sh | ||
427 | --- dracut-047/test/TEST-17-LVM-THIN/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
428 | +++ dracut-047-busybox/test/TEST-17-LVM-THIN/create-root.sh 2018-06-15 15:28:25.146388638 +0200 | ||
429 | @@ -23,7 +23,7 @@ | ||
430 | mke2fs /dev/dracut/root && \ | ||
431 | mkdir -p /sysroot && \ | ||
432 | mount /dev/dracut/root /sysroot && \ | ||
433 | -cp -a -t /sysroot /source/* && \ | ||
434 | +cp -a /source/* /sysroot && \ | ||
435 | umount /sysroot && \ | ||
436 | sleep 1 && \ | ||
437 | lvm lvchange -a n /dev/dracut/root && \ | ||
438 | diff -Naur dracut-047/test/TEST-30-ISCSI/create-root.sh dracut-047-busybox/test/TEST-30-ISCSI/create-root.sh | ||
439 | --- dracut-047/test/TEST-30-ISCSI/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
440 | +++ dracut-047-busybox/test/TEST-30-ISCSI/create-root.sh 2018-06-15 15:29:06.681844148 +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-047/test/TEST-31-ISCSI-MULTI/create-root.sh dracut-047-busybox/test/TEST-31-ISCSI-MULTI/create-root.sh | ||
460 | --- dracut-047/test/TEST-31-ISCSI-MULTI/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
461 | +++ dracut-047-busybox/test/TEST-31-ISCSI-MULTI/create-root.sh 2018-06-15 15:29:50.977263293 +0200 | ||
462 | @@ -8,7 +8,7 @@ | ||
463 | mkfs.ext3 -j -L singleroot -F /dev/sda && \ | ||
464 | mkdir -p /sysroot && \ | ||
465 | mount /dev/sda /sysroot && \ | ||
466 | -cp -a -t /sysroot /source/* && \ | ||
467 | +cp -a /source/* /sysroot && \ | ||
468 | umount /sysroot && \ | ||
469 | mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ | ||
470 | mdadm -W /dev/md0 || : && \ | ||
471 | @@ -18,7 +18,7 @@ | ||
472 | lvm vgchange -ay && \ | ||
473 | mkfs.ext3 -j -L sysroot /dev/dracut/root && \ | ||
474 | mount /dev/dracut/root /sysroot && \ | ||
475 | -cp -a -t /sysroot /source/* && \ | ||
476 | +cp -a /source/* /sysroot && \ | ||
477 | umount /sysroot && \ | ||
478 | lvm lvchange -a n /dev/dracut/root && \ | ||
479 | echo "dracut-root-block-created" >/dev/sdb | ||
480 | diff -Naur dracut-047/test/TEST-40-NBD/create-root.sh dracut-047-busybox/test/TEST-40-NBD/create-root.sh | ||
481 | --- dracut-047/test/TEST-40-NBD/create-root.sh 2018-02-19 10:00:33.000000000 +0100 | ||
482 | +++ dracut-047-busybox/test/TEST-40-NBD/create-root.sh 2018-06-15 15:30:17.571914465 +0200 | ||
483 | @@ -17,7 +17,7 @@ | ||
484 | /sbin/tune2fs -e continue /dev/dracut/root && \ | ||
485 | mkdir -p /sysroot && \ | ||
486 | mount /dev/dracut/root /sysroot && \ | ||
487 | -cp -a -t /sysroot /source/* && \ | ||
488 | +cp -a /source/* /sysroot && \ | ||
489 | umount /sysroot | ||
490 | sleep 1 | ||
491 | lvm lvchange -a n /dev/dracut/root | ||
492 | diff -Naur dracut-047/test/TEST-99-RPM/test.sh dracut-047-busybox/test/TEST-99-RPM/test.sh | ||
493 | --- dracut-047/test/TEST-99-RPM/test.sh 2018-02-19 10:00:33.000000000 +0100 | ||
494 | +++ dracut-047-busybox/test/TEST-99-RPM/test.sh 2018-06-15 15:30:33.328707751 +0200 | ||
495 | @@ -26,7 +26,7 @@ | ||
496 | mount -t devtmpfs devtmpfs "$rootdir/dev" | ||
497 | |||
498 | mkdir -p "$rootdir/$TESTDIR" | ||
499 | - cp --reflink=auto -a \ | ||
500 | + cp -a \ | ||
501 | "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \ | ||
502 | "$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \ | ||
503 | "$rootdir/$TESTDIR/" |