Annotation of /trunk/dracut/patches/dracut-046-busybox.patch
Parent Directory | Revision Log
Revision 2985 -
(hide annotations)
(download)
Thu Aug 31 09:58:10 2017 UTC (7 years ago) by niro
File size: 23261 byte(s)
Thu Aug 31 09:58:10 2017 UTC (7 years ago) by niro
File size: 23261 byte(s)
-rediffed for 046, merged with -realpath and -makefile patch
1 | niro | 2985 | diff -Naur dracut-046/50-dracut.install dracut-046-busybox/50-dracut.install |
2 | --- dracut-046/50-dracut.install 2017-08-11 13:44:06.000000000 +0200 | ||
3 | +++ dracut-046-busybox/50-dracut.install 2017-08-31 11:25:02.392554395 +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-046/51-dracut-rescue.install dracut-046-busybox/51-dracut-rescue.install | ||
14 | --- dracut-046/51-dracut-rescue.install 2017-08-11 13:44:06.000000000 +0200 | ||
15 | +++ dracut-046-busybox/51-dracut-rescue.install 2017-08-31 11:26:28.821497918 +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-046/51-dracut-rescue-postinst.sh dracut-046-busybox/51-dracut-rescue-postinst.sh | ||
35 | --- dracut-046/51-dracut-rescue-postinst.sh 2017-08-11 13:44:06.000000000 +0200 | ||
36 | +++ dracut-046-busybox/51-dracut-rescue-postinst.sh 2017-08-31 11:27:16.610914876 +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-046/dracut-init.sh dracut-046-busybox/dracut-init.sh | ||
56 | --- dracut-046/dracut-init.sh 2017-08-11 13:44:06.000000000 +0200 | ||
57 | +++ dracut-046-busybox/dracut-init.sh 2017-08-31 11:28:50.485771578 +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 | @@ -1003,7 +1003,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-046/dracut.sh dracut-046-busybox/dracut.sh | ||
80 | --- dracut-046/dracut.sh 2017-08-11 13:44:06.000000000 +0200 | ||
81 | +++ dracut-046-busybox/dracut.sh 2017-08-31 11:56:37.538126897 +0200 | ||
82 | @@ -262,7 +262,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 | @@ -837,7 +837,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 | @@ -1557,11 +1557,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 | @@ -1787,7 +1787,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 | @@ -1795,7 +1795,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-046/install/dracut-install.c dracut-046-busybox/install/dracut-install.c | ||
134 | --- dracut-046/install/dracut-install.c 2017-08-11 13:44:06.000000000 +0200 | ||
135 | +++ dracut-046-busybox/install/dracut-install.c 2017-08-31 11:32:16.512269836 +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,11 @@ | ||
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 | + | ||
156 | dst); | ||
157 | else | ||
158 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, | ||
159 | + log_error("Failed: cp -pfL %s %s", src, | ||
160 | dst); | ||
161 | break; | ||
162 | } | ||
163 | diff -Naur dracut-046/Makefile dracut-046-busybox/Makefile | ||
164 | --- dracut-046/Makefile 2017-08-11 13:44:06.000000000 +0200 | ||
165 | +++ dracut-046-busybox/Makefile 2017-08-31 11:54:14.783913941 +0200 | ||
166 | @@ -129,7 +129,7 @@ | ||
167 | ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions | ||
168 | install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh | ||
169 | install -m 0755 dracut-initramfs-restore.sh $(DESTDIR)$(pkglibdir)/dracut-initramfs-restore | ||
170 | - cp -arx modules.d $(DESTDIR)$(pkglibdir) | ||
171 | + cp -ar modules.d $(DESTDIR)$(pkglibdir) | ||
172 | ifneq ($(enable_documentation),no) | ||
173 | for i in $(man1pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man1/$${i##*/}; done | ||
174 | for i in $(man5pages); do install -m 0644 $$i $(DESTDIR)$(mandir)/man5/$${i##*/}; done | ||
175 | diff -Naur dracut-046/modules.d/10i18n/module-setup.sh dracut-046-busybox/modules.d/10i18n/module-setup.sh | ||
176 | --- dracut-046/modules.d/10i18n/module-setup.sh 2017-08-11 13:44:06.000000000 +0200 | ||
177 | +++ dracut-046-busybox/modules.d/10i18n/module-setup.sh 2017-08-31 11:32:53.605820287 +0200 | ||
178 | @@ -115,7 +115,7 @@ | ||
179 | |||
180 | for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do | ||
181 | inst_dir "$_src" | ||
182 | - $DRACUT_CP -L -t "${initdir}/${_src}" "$_src"/* | ||
183 | + $DRACUT_CP -L "$_src"/* "${initdir}/${_src}" | ||
184 | done | ||
185 | |||
186 | # remove unnecessary files | ||
187 | diff -Naur dracut-046/modules.d/30convertfs/convertfs.sh dracut-046-busybox/modules.d/30convertfs/convertfs.sh | ||
188 | --- dracut-046/modules.d/30convertfs/convertfs.sh 2017-08-11 13:44:06.000000000 +0200 | ||
189 | +++ dracut-046-busybox/modules.d/30convertfs/convertfs.sh 2017-08-31 11:54:50.324467729 +0200 | ||
190 | @@ -129,11 +129,11 @@ | ||
191 | [[ -d "$ROOT/$dir" ]] || continue | ||
192 | echo "Make a copy of \`$ROOT/usr/$dir'." | ||
193 | [[ -d "$ROOT/usr/$dir" ]] \ | ||
194 | - && cp -ax -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
195 | + && cp -a -l "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
196 | echo "Merge the copy with \`$ROOT/$dir'." | ||
197 | [[ -d "$ROOT/usr/${dir}.usrmove-new" ]] \ | ||
198 | || mkdir -p "$ROOT/usr/${dir}.usrmove-new" | ||
199 | - cp -axT $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
200 | + cp -a $CP_HARDLINK --backup --suffix=.usrmove~ "$ROOT/$dir" "$ROOT/usr/${dir}.usrmove-new" | ||
201 | echo "Clean up duplicates in \`$ROOT/usr/$dir'." | ||
202 | # delete all symlinks that have been backed up | ||
203 | find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || : | ||
204 | diff -Naur dracut-046/modules.d/45url-lib/module-setup.sh dracut-046-busybox/modules.d/45url-lib/module-setup.sh | ||
205 | --- dracut-046/modules.d/45url-lib/module-setup.sh 2017-08-11 13:44:06.000000000 +0200 | ||
206 | +++ dracut-046-busybox/modules.d/45url-lib/module-setup.sh 2017-08-31 11:50:56.704420658 +0200 | ||
207 | @@ -29,8 +29,8 @@ | ||
208 | [[ -d $_dir ]] || continue | ||
209 | for _lib in $_dir/libcurl.so.*; do | ||
210 | [[ -e $_lib ]] || continue | ||
211 | - [[ $_nssckbi ]] || _nssckbi=$(grep -F --binary-files=text -z libnssckbi $_lib) | ||
212 | - _crt=$(grep -F --binary-files=text -z .crt $_lib) | ||
213 | + [[ $_nssckbi ]] || _nssckbi=$(grep -F libnssckbi $_lib) | ||
214 | + _crt=$(grep -F .crt $_lib) | ||
215 | [[ $_crt ]] || continue | ||
216 | [[ $_crt == /*/* ]] || continue | ||
217 | if ! inst "$_crt"; then | ||
218 | @@ -51,7 +51,7 @@ | ||
219 | for _dir in $libdirs; do | ||
220 | [[ -e $_dir/libnssckbi.so ]] || continue | ||
221 | # this looks for directory-ish strings in the file | ||
222 | - for _p11roots in $(grep -o --binary-files=text "/[[:alpha:]][[:print:]]*" $_dir/libnssckbi.so) ; do | ||
223 | + for _p11roots in $(grep -o "/[[:alpha:]][[:print:]]*" $_dir/libnssckbi.so) ; do | ||
224 | # the string can be a :-separated list of dirs | ||
225 | for _p11root in $(echo "$_p11roots" | tr ':' '\n') ; do | ||
226 | # check if it's actually a directory (there are | ||
227 | diff -Naur dracut-046/modules.d/95terminfo/module-setup.sh dracut-046-busybox/modules.d/95terminfo/module-setup.sh | ||
228 | --- dracut-046/modules.d/95terminfo/module-setup.sh 2017-08-11 13:44:06.000000000 +0200 | ||
229 | +++ dracut-046-busybox/modules.d/95terminfo/module-setup.sh 2017-08-31 11:34:17.835800269 +0200 | ||
230 | @@ -11,7 +11,7 @@ | ||
231 | if [ -d ${_terminfodir} ]; then | ||
232 | for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do | ||
233 | inst_dir "$_terminfodir/${i%/*}" | ||
234 | - $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" | ||
235 | + $DRACUT_CP -L "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" | ||
236 | done | ||
237 | fi | ||
238 | } | ||
239 | diff -Naur dracut-046/modules.d/99base/dracut-lib.sh dracut-046-busybox/modules.d/99base/dracut-lib.sh | ||
240 | --- dracut-046/modules.d/99base/dracut-lib.sh 2017-08-11 13:44:06.000000000 +0200 | ||
241 | +++ dracut-046-busybox/modules.d/99base/dracut-lib.sh 2017-08-31 11:34:56.526332063 +0200 | ||
242 | @@ -685,7 +685,7 @@ | ||
243 | copytree() { | ||
244 | local src="$1" dest="$2" | ||
245 | mkdir -p "$dest"; dest=$(readlink -e -q "$dest") | ||
246 | - ( cd "$src"; cp -af . -t "$dest" ) | ||
247 | + ( cd "$src"; cp -af . "$dest" ) | ||
248 | } | ||
249 | |||
250 | # Evaluates command for UUIDs either given as arguments for this function or all | ||
251 | diff -Naur dracut-046/test/TEST-01-BASIC/create-root.sh dracut-046-busybox/test/TEST-01-BASIC/create-root.sh | ||
252 | --- dracut-046/test/TEST-01-BASIC/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
253 | +++ dracut-046-busybox/test/TEST-01-BASIC/create-root.sh 2017-08-31 11:35:36.679846352 +0200 | ||
254 | @@ -16,7 +16,7 @@ | ||
255 | mkfs.ext3 -L dracut /dev/sda2 | ||
256 | mkdir -p /root | ||
257 | mount /dev/sda2 /root | ||
258 | -cp -a -t /root /source/* | ||
259 | +cp -a /source/* /root | ||
260 | mkdir -p /root/run | ||
261 | umount /root | ||
262 | echo "dracut-root-block-created" >/dev/sda1 | ||
263 | diff -Naur dracut-046/test/TEST-02-SYSTEMD/create-root.sh dracut-046-busybox/test/TEST-02-SYSTEMD/create-root.sh | ||
264 | --- dracut-046/test/TEST-02-SYSTEMD/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
265 | +++ dracut-046-busybox/test/TEST-02-SYSTEMD/create-root.sh 2017-08-31 11:36:04.601508714 +0200 | ||
266 | @@ -16,7 +16,7 @@ | ||
267 | mkfs.ext3 -L dracut /dev/sda2 | ||
268 | mkdir -p /root | ||
269 | mount /dev/sda2 /root | ||
270 | -cp -a -t /root /source/* | ||
271 | +cp -a /source/* /root | ||
272 | mkdir -p /root/run | ||
273 | umount /root | ||
274 | echo "dracut-root-block-created" >/dev/sda1 | ||
275 | diff -Naur dracut-046/test/TEST-03-USR-MOUNT/create-root.sh dracut-046-busybox/test/TEST-03-USR-MOUNT/create-root.sh | ||
276 | --- dracut-046/test/TEST-03-USR-MOUNT/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
277 | +++ dracut-046-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2017-08-31 11:36:31.246186597 +0200 | ||
278 | @@ -30,7 +30,7 @@ | ||
279 | btrfs subvolume create /root/usr/usr | ||
280 | umount /root/usr | ||
281 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
282 | -cp -a -t /root /source/* | ||
283 | +cp -a /source/* /root | ||
284 | mkdir -p /root/run | ||
285 | umount /root/usr | ||
286 | umount /root | ||
287 | diff -Naur dracut-046/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-046-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh | ||
288 | --- dracut-046/test/TEST-04-FULL-SYSTEMD/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
289 | +++ dracut-046-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2017-08-31 11:37:00.172836976 +0200 | ||
290 | @@ -31,7 +31,7 @@ | ||
291 | btrfs subvolume create /root/usr/usr | ||
292 | umount /root/usr | ||
293 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
294 | -cp -a -t /root /source/* | ||
295 | +cp -a /source/* /root | ||
296 | mkdir -p /root/run | ||
297 | umount /root/usr | ||
298 | umount /root | ||
299 | diff -Naur dracut-046/test/TEST-10-RAID/create-root.sh dracut-046-busybox/test/TEST-10-RAID/create-root.sh | ||
300 | --- dracut-046/test/TEST-10-RAID/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
301 | +++ dracut-046-busybox/test/TEST-10-RAID/create-root.sh 2017-08-31 11:37:25.582529931 +0200 | ||
302 | @@ -29,7 +29,7 @@ | ||
303 | mke2fs /dev/dracut/root | ||
304 | mkdir -p /sysroot | ||
305 | mount /dev/dracut/root /sysroot | ||
306 | -cp -a -t /sysroot /source/* | ||
307 | +cp -a /source/* /sysroot | ||
308 | umount /sysroot | ||
309 | lvm lvchange -a n /dev/dracut/root | ||
310 | udevadm settle | ||
311 | diff -Naur dracut-046/test/TEST-11-LVM/create-root.sh dracut-046-busybox/test/TEST-11-LVM/create-root.sh | ||
312 | --- dracut-046/test/TEST-11-LVM/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
313 | +++ dracut-046-busybox/test/TEST-11-LVM/create-root.sh 2017-08-31 11:37:51.238219976 +0200 | ||
314 | @@ -22,7 +22,7 @@ | ||
315 | mke2fs /dev/dracut/root && \ | ||
316 | mkdir -p /sysroot && \ | ||
317 | mount /dev/dracut/root /sysroot && \ | ||
318 | -cp -a -t /sysroot /source/* && \ | ||
319 | +cp -a /source/* /sysroot && \ | ||
320 | umount /sysroot && \ | ||
321 | sleep 1 && \ | ||
322 | lvm lvchange -a n /dev/dracut/root && \ | ||
323 | diff -Naur dracut-046/test/TEST-12-RAID-DEG/create-root.sh dracut-046-busybox/test/TEST-12-RAID-DEG/create-root.sh | ||
324 | --- dracut-046/test/TEST-12-RAID-DEG/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
325 | +++ dracut-046-busybox/test/TEST-12-RAID-DEG/create-root.sh 2017-08-31 11:38:35.335687354 +0200 | ||
326 | @@ -34,7 +34,7 @@ | ||
327 | mke2fs -L root /dev/dracut/root | ||
328 | mkdir -p /sysroot | ||
329 | mount /dev/dracut/root /sysroot | ||
330 | -cp -a -t /sysroot /source/* | ||
331 | +cp -a /source/* /sysroot | ||
332 | mkdir /sysroot/run | ||
333 | umount /sysroot | ||
334 | lvm lvchange -a n /dev/dracut/root | ||
335 | diff -Naur dracut-046/test/TEST-12-RAID-DEG/test.sh dracut-046-busybox/test/TEST-12-RAID-DEG/test.sh | ||
336 | --- dracut-046/test/TEST-12-RAID-DEG/test.sh 2017-08-11 13:44:06.000000000 +0200 | ||
337 | +++ dracut-046-busybox/test/TEST-12-RAID-DEG/test.sh 2017-08-31 11:39:44.060857586 +0200 | ||
338 | @@ -11,8 +11,8 @@ | ||
339 | |||
340 | client_run() { | ||
341 | echo "CLIENT TEST START: $@" | ||
342 | - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
343 | - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
344 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
345 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
346 | |||
347 | $testdir/run-qemu \ | ||
348 | -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 512M -nographic -smp 2 \ | ||
349 | @@ -33,7 +33,7 @@ | ||
350 | } | ||
351 | |||
352 | test_run() { | ||
353 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
354 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
355 | echo "MD_UUID=$MD_UUID" | ||
356 | read LUKS_UUID < $TESTDIR/luksuuid | ||
357 | |||
358 | @@ -122,7 +122,7 @@ | ||
359 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
360 | |||
361 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
362 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
363 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
364 | eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) | ||
365 | echo $ID_FS_UUID > $TESTDIR/luksuuid | ||
366 | |||
367 | diff -Naur dracut-046/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-046-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh | ||
368 | --- dracut-046/test/TEST-13-ENC-RAID-LVM/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
369 | +++ dracut-046-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2017-08-31 11:40:10.677536318 +0200 | ||
370 | @@ -32,7 +32,7 @@ | ||
371 | mke2fs /dev/dracut/root && \ | ||
372 | mkdir -p /sysroot && \ | ||
373 | mount /dev/dracut/root /sysroot && \ | ||
374 | -cp -a -t /sysroot /source/* && \ | ||
375 | +cp -a /source/* /sysroot && \ | ||
376 | umount /sysroot && \ | ||
377 | sleep 2 && \ | ||
378 | lvm lvchange -a n /dev/dracut/root && \ | ||
379 | diff -Naur dracut-046/test/TEST-13-ENC-RAID-LVM/test.sh dracut-046-busybox/test/TEST-13-ENC-RAID-LVM/test.sh | ||
380 | --- dracut-046/test/TEST-13-ENC-RAID-LVM/test.sh 2017-08-11 13:44:06.000000000 +0200 | ||
381 | +++ dracut-046-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2017-08-31 11:40:40.393177701 +0200 | ||
382 | @@ -115,7 +115,7 @@ | ||
383 | -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
384 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
385 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
386 | - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
387 | + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
388 | for uuid in $cryptoUUIDS; do | ||
389 | eval $uuid | ||
390 | printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID | ||
391 | diff -Naur dracut-046/test/TEST-14-IMSM/create-root.sh dracut-046-busybox/test/TEST-14-IMSM/create-root.sh | ||
392 | --- dracut-046/test/TEST-14-IMSM/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
393 | +++ dracut-046-busybox/test/TEST-14-IMSM/create-root.sh 2017-08-31 11:41:11.673800259 +0200 | ||
394 | @@ -62,7 +62,7 @@ | ||
395 | mke2fs -L root /dev/dracut/root && \ | ||
396 | mkdir -p /sysroot && \ | ||
397 | mount /dev/dracut/root /sysroot && \ | ||
398 | -cp -a -t /sysroot /source/* && \ | ||
399 | +cp -a /source/* /sysroot && \ | ||
400 | umount /sysroot && \ | ||
401 | lvm lvchange -a n /dev/dracut/root && \ | ||
402 | udevadm settle | ||
403 | diff -Naur dracut-046/test/TEST-14-IMSM/test.sh dracut-046-busybox/test/TEST-14-IMSM/test.sh | ||
404 | --- dracut-046/test/TEST-14-IMSM/test.sh 2017-08-11 13:44:06.000000000 +0200 | ||
405 | +++ dracut-046-busybox/test/TEST-14-IMSM/test.sh 2017-08-31 11:41:36.445501397 +0200 | ||
406 | @@ -108,7 +108,7 @@ | ||
407 | -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
408 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
409 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
410 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
411 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
412 | echo $MD_UUID > $TESTDIR/mduuid | ||
413 | ( | ||
414 | export initdir=$TESTDIR/overlay | ||
415 | diff -Naur dracut-046/test/TEST-15-BTRFSRAID/create-root.sh dracut-046-busybox/test/TEST-15-BTRFSRAID/create-root.sh | ||
416 | --- dracut-046/test/TEST-15-BTRFSRAID/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
417 | +++ dracut-046-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2017-08-31 11:42:00.475211521 +0200 | ||
418 | @@ -21,7 +21,7 @@ | ||
419 | set -e | ||
420 | mkdir -p /sysroot | ||
421 | mount -t btrfs /dev/sda5 /sysroot | ||
422 | -cp -a -t /sysroot /source/* | ||
423 | +cp -a /source/* /sysroot | ||
424 | umount /sysroot | ||
425 | echo "dracut-root-block-created" >/dev/sda1 | ||
426 | poweroff -f | ||
427 | diff -Naur dracut-046/test/TEST-17-LVM-THIN/create-root.sh dracut-046-busybox/test/TEST-17-LVM-THIN/create-root.sh | ||
428 | --- dracut-046/test/TEST-17-LVM-THIN/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
429 | +++ dracut-046-busybox/test/TEST-17-LVM-THIN/create-root.sh 2017-08-31 11:43:11.484355102 +0200 | ||
430 | @@ -23,7 +23,7 @@ | ||
431 | mke2fs /dev/dracut/root && \ | ||
432 | mkdir -p /sysroot && \ | ||
433 | mount /dev/dracut/root /sysroot && \ | ||
434 | -cp -a -t /sysroot /source/* && \ | ||
435 | +cp -a /source/* /sysroot && \ | ||
436 | umount /sysroot && \ | ||
437 | sleep 1 && \ | ||
438 | lvm lvchange -a n /dev/dracut/root && \ | ||
439 | diff -Naur dracut-046/test/TEST-30-ISCSI/create-root.sh dracut-046-busybox/test/TEST-30-ISCSI/create-root.sh | ||
440 | --- dracut-046/test/TEST-30-ISCSI/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
441 | +++ dracut-046-busybox/test/TEST-30-ISCSI/create-root.sh 2017-08-31 11:43:53.659846553 +0200 | ||
442 | @@ -8,7 +8,7 @@ | ||
443 | mkfs.ext3 -j -L singleroot -F /dev/sda && \ | ||
444 | mkdir -p /sysroot && \ | ||
445 | mount /dev/sda /sysroot && \ | ||
446 | -cp -a -t /sysroot /source/* && \ | ||
447 | +cp -a /source/* /sysroot && \ | ||
448 | umount /sysroot && \ | ||
449 | mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ | ||
450 | mdadm -W /dev/md0 || : && \ | ||
451 | @@ -18,7 +18,7 @@ | ||
452 | lvm vgchange -ay && \ | ||
453 | mkfs.ext3 -j -L sysroot /dev/dracut/root && \ | ||
454 | mount /dev/dracut/root /sysroot && \ | ||
455 | -cp -a -t /sysroot /source/* && \ | ||
456 | +cp -a /source/* /sysroot && \ | ||
457 | umount /sysroot && \ | ||
458 | lvm lvchange -a n /dev/dracut/root && \ | ||
459 | echo "dracut-root-block-created" >/dev/sdb | ||
460 | diff -Naur dracut-046/test/TEST-31-ISCSI-MULTI/create-root.sh dracut-046-busybox/test/TEST-31-ISCSI-MULTI/create-root.sh | ||
461 | --- dracut-046/test/TEST-31-ISCSI-MULTI/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
462 | +++ dracut-046-busybox/test/TEST-31-ISCSI-MULTI/create-root.sh 2017-08-31 11:48:06.943603999 +0200 | ||
463 | @@ -8,7 +8,7 @@ | ||
464 | mkfs.ext3 -j -L singleroot -F /dev/sda && \ | ||
465 | mkdir -p /sysroot && \ | ||
466 | mount /dev/sda /sysroot && \ | ||
467 | -cp -a -t /sysroot /source/* && \ | ||
468 | +cp -a /source/* /sysroot && \ | ||
469 | umount /sysroot && \ | ||
470 | mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ | ||
471 | mdadm -W /dev/md0 || : && \ | ||
472 | @@ -18,7 +18,7 @@ | ||
473 | lvm vgchange -ay && \ | ||
474 | mkfs.ext3 -j -L sysroot /dev/dracut/root && \ | ||
475 | mount /dev/dracut/root /sysroot && \ | ||
476 | -cp -a -t /sysroot /source/* && \ | ||
477 | +cp -a /source/* /sysroot && \ | ||
478 | umount /sysroot && \ | ||
479 | lvm lvchange -a n /dev/dracut/root && \ | ||
480 | echo "dracut-root-block-created" >/dev/sdb | ||
481 | diff -Naur dracut-046/test/TEST-40-NBD/create-root.sh dracut-046-busybox/test/TEST-40-NBD/create-root.sh | ||
482 | --- dracut-046/test/TEST-40-NBD/create-root.sh 2017-08-11 13:44:06.000000000 +0200 | ||
483 | +++ dracut-046-busybox/test/TEST-40-NBD/create-root.sh 2017-08-31 11:44:18.964541469 +0200 | ||
484 | @@ -17,7 +17,7 @@ | ||
485 | /sbin/tune2fs -e continue /dev/dracut/root && \ | ||
486 | mkdir -p /sysroot && \ | ||
487 | mount /dev/dracut/root /sysroot && \ | ||
488 | -cp -a -t /sysroot /source/* && \ | ||
489 | +cp -a /source/* /sysroot && \ | ||
490 | umount /sysroot | ||
491 | sleep 1 | ||
492 | lvm lvchange -a n /dev/dracut/root | ||
493 | diff -Naur dracut-046/test/TEST-99-RPM/test.sh dracut-046-busybox/test/TEST-99-RPM/test.sh | ||
494 | --- dracut-046/test/TEST-99-RPM/test.sh 2017-08-11 13:44:06.000000000 +0200 | ||
495 | +++ dracut-046-busybox/test/TEST-99-RPM/test.sh 2017-08-31 11:44:44.598232446 +0200 | ||
496 | @@ -26,7 +26,7 @@ | ||
497 | mount -t devtmpfs devtmpfs "$rootdir/dev" | ||
498 | |||
499 | mkdir -p "$rootdir/$TESTDIR" | ||
500 | - cp --reflink=auto -a \ | ||
501 | + cp -a \ | ||
502 | "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \ | ||
503 | "$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \ | ||
504 | "$rootdir/$TESTDIR/" |