Contents of /trunk/dracut/patches/dracut-045-busybox.patch
Parent Directory | Revision Log
Revision 2903 -
(show annotations)
(download)
Tue Apr 4 15:29:14 2017 UTC (7 years, 5 months ago) by niro
File size: 19468 byte(s)
Tue Apr 4 15:29:14 2017 UTC (7 years, 5 months ago) by niro
File size: 19468 byte(s)
-re-diffed busybox patch for 045
1 | diff -Naur dracut-045/50-dracut.install dracut-045-busybox/50-dracut.install |
2 | --- dracut-045/50-dracut.install 2017-04-03 10:26:25.000000000 +0200 |
3 | +++ dracut-045-busybox/50-dracut.install 2017-04-04 14:42:58.434257706 +0200 |
4 | @@ -12,7 +12,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-045/51-dracut-rescue.install dracut-045-busybox/51-dracut-rescue.install |
14 | --- dracut-045/51-dracut-rescue.install 2017-04-03 10:26:25.000000000 +0200 |
15 | +++ dracut-045-busybox/51-dracut-rescue.install 2017-04-04 14:45:14.468616117 +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 | @@ -78,7 +78,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-045/51-dracut-rescue-postinst.sh dracut-045-busybox/51-dracut-rescue-postinst.sh |
35 | --- dracut-045/51-dracut-rescue-postinst.sh 2017-04-03 10:26:25.000000000 +0200 |
36 | +++ dracut-045-busybox/51-dracut-rescue-postinst.sh 2017-04-04 14:46:00.620061393 +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-045/dracut-init.sh dracut-045-busybox/dracut-init.sh |
56 | --- dracut-045/dracut-init.sh 2017-04-03 10:26:25.000000000 +0200 |
57 | +++ dracut-045-busybox/dracut-init.sh 2017-04-04 14:53:07.840962042 +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 | @@ -1006,7 +1006,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-045/dracut.sh dracut-045-busybox/dracut.sh |
80 | --- dracut-045/dracut.sh 2017-04-03 10:26:25.000000000 +0200 |
81 | +++ dracut-045-busybox/dracut.sh 2017-04-04 16:57:56.773680048 +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 | @@ -1557,11 +1557,11 @@ |
92 | object_destdir=${destdir}/${objectname#$src/} |
93 | if ! [[ -e "$object_destdir" ]]; then |
94 | mkdir -m 0755 -p "$object_destdir" |
95 | - chmod --reference="$objectname" "$object_destdir" |
96 | + chmod $(stat -c %a "$objectname") "$object_destdir" |
97 | fi |
98 | - $DRACUT_CP -t "$object_destdir" "$objectname"/* |
99 | + $DRACUT_CP "$objectname"/* "$object_destdir" |
100 | else |
101 | - $DRACUT_CP -t "$destdir" "$objectname" |
102 | + $DRACUT_CP "$objectname" "$destdir" |
103 | fi |
104 | done |
105 | fi |
106 | @@ -1783,7 +1783,7 @@ |
107 | --add-section .linux="$kernel_image" --change-section-vma .linux=0x40000 \ |
108 | --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd=0x3000000 \ |
109 | "$uefi_stub" "${uefi_outdir}/linux.efi" \ |
110 | - && cp --reflink=auto "${uefi_outdir}/linux.efi" "$outfile"; then |
111 | + && cp "${uefi_outdir}/linux.efi" "$outfile"; then |
112 | dinfo "*** Creating UEFI image file '$outfile' done ***" |
113 | else |
114 | rm -f -- "$outfile" |
115 | @@ -1791,7 +1791,7 @@ |
116 | exit 1 |
117 | fi |
118 | else |
119 | - if cp --reflink=auto "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then |
120 | + if cp "${DRACUT_TMPDIR}/initramfs.img" "$outfile"; then |
121 | dinfo "*** Creating initramfs image file '$outfile' done ***" |
122 | else |
123 | rm -f -- "$outfile" |
124 | diff -Naur dracut-045/install/dracut-install.c dracut-045-busybox/install/dracut-install.c |
125 | --- dracut-045/install/dracut-install.c 2017-04-03 10:26:25.000000000 +0200 |
126 | +++ dracut-045-busybox/install/dracut-install.c 2017-04-04 14:56:27.200596937 +0200 |
127 | @@ -301,10 +301,10 @@ |
128 | pid = fork(); |
129 | if (pid == 0) { |
130 | if (geteuid() == 0) |
131 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,xattr,timestamps", "-fL", src, dst, |
132 | + execlp("cp", "cp", "-pfL", src, dst, |
133 | NULL); |
134 | else |
135 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, |
136 | + execlp("cp", "cp", "-pfL", src, dst, |
137 | NULL); |
138 | _exit(EXIT_FAILURE); |
139 | } |
140 | @@ -313,10 +313,10 @@ |
141 | if (errno != EINTR) { |
142 | ret = -1; |
143 | if (geteuid() == 0) |
144 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,xattr,timestamps -fL %s %s", src, |
145 | + log_error("Failed: cp -pfL %s %s", src, |
146 | dst); |
147 | else |
148 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, |
149 | + log_error("Failed: cp -pfL %s %s", src, |
150 | dst); |
151 | break; |
152 | } |
153 | diff -Naur dracut-045/modules.d/10i18n/module-setup.sh dracut-045-busybox/modules.d/10i18n/module-setup.sh |
154 | --- dracut-045/modules.d/10i18n/module-setup.sh 2017-04-03 10:26:25.000000000 +0200 |
155 | +++ dracut-045-busybox/modules.d/10i18n/module-setup.sh 2017-04-04 17:04:08.430627818 +0200 |
156 | @@ -115,7 +115,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-045/modules.d/45url-lib/module-setup.sh dracut-045-busybox/modules.d/45url-lib/module-setup.sh |
166 | --- dracut-045/modules.d/45url-lib/module-setup.sh 2017-04-03 10:26:25.000000000 +0200 |
167 | +++ dracut-045-busybox/modules.d/45url-lib/module-setup.sh 2017-04-04 16:54:36.633879291 +0200 |
168 | @@ -29,7 +29,7 @@ |
169 | [[ -d $_dir ]] || continue |
170 | for _lib in $_dir/libcurl.so.*; do |
171 | [[ -e $_lib ]] || continue |
172 | - _crt=$(grep -F --binary-files=text -z .crt $_lib) |
173 | + _crt=$(grep -F .crt $_lib) |
174 | [[ $_crt ]] || continue |
175 | [[ $_crt == /*/* ]] || continue |
176 | if ! inst "$_crt"; then |
177 | diff -Naur dracut-045/modules.d/95terminfo/module-setup.sh dracut-045-busybox/modules.d/95terminfo/module-setup.sh |
178 | --- dracut-045/modules.d/95terminfo/module-setup.sh 2017-04-03 10:26:25.000000000 +0200 |
179 | +++ dracut-045-busybox/modules.d/95terminfo/module-setup.sh 2017-04-04 17:03:40.130935364 +0200 |
180 | @@ -11,7 +11,7 @@ |
181 | if [ -d ${_terminfodir} ]; then |
182 | for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do |
183 | inst_dir "$_terminfodir/${i%/*}" |
184 | - $DRACUT_CP -L -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" |
185 | + $DRACUT_CP -L "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" |
186 | done |
187 | fi |
188 | } |
189 | diff -Naur dracut-045/modules.d/99base/dracut-lib.sh dracut-045-busybox/modules.d/99base/dracut-lib.sh |
190 | --- dracut-045/modules.d/99base/dracut-lib.sh 2017-04-03 10:26:25.000000000 +0200 |
191 | +++ dracut-045-busybox/modules.d/99base/dracut-lib.sh 2017-04-04 17:07:29.208442424 +0200 |
192 | @@ -685,7 +685,7 @@ |
193 | copytree() { |
194 | local src="$1" dest="$2" |
195 | mkdir -p "$dest"; dest=$(readlink -e -q "$dest") |
196 | - ( cd "$src"; cp -af . -t "$dest" ) |
197 | + ( cd "$src"; cp -af . "$dest" ) |
198 | } |
199 | |
200 | # Evaluates command for UUIDs either given as arguments for this function or all |
201 | diff -Naur dracut-045/test/TEST-01-BASIC/create-root.sh dracut-045-busybox/test/TEST-01-BASIC/create-root.sh |
202 | --- dracut-045/test/TEST-01-BASIC/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
203 | +++ dracut-045-busybox/test/TEST-01-BASIC/create-root.sh 2017-04-04 17:03:13.312226939 +0200 |
204 | @@ -16,7 +16,7 @@ |
205 | mkfs.ext3 -L dracut /dev/sda2 |
206 | mkdir -p /root |
207 | mount /dev/sda2 /root |
208 | -cp -a -t /root /source/* |
209 | +cp -a /source/* /root |
210 | mkdir -p /root/run |
211 | umount /root |
212 | echo "dracut-root-block-created" >/dev/sda1 |
213 | diff -Naur dracut-045/test/TEST-02-SYSTEMD/create-root.sh dracut-045-busybox/test/TEST-02-SYSTEMD/create-root.sh |
214 | --- dracut-045/test/TEST-02-SYSTEMD/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
215 | +++ dracut-045-busybox/test/TEST-02-SYSTEMD/create-root.sh 2017-04-04 17:01:25.550399891 +0200 |
216 | @@ -16,7 +16,7 @@ |
217 | mkfs.ext3 -L dracut /dev/sda2 |
218 | mkdir -p /root |
219 | mount /dev/sda2 /root |
220 | -cp -a -t /root /source/* |
221 | +cp -a /source/* /root |
222 | mkdir -p /root/run |
223 | umount /root |
224 | echo "dracut-root-block-created" >/dev/sda1 |
225 | diff -Naur dracut-045/test/TEST-03-USR-MOUNT/create-root.sh dracut-045-busybox/test/TEST-03-USR-MOUNT/create-root.sh |
226 | --- dracut-045/test/TEST-03-USR-MOUNT/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
227 | +++ dracut-045-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2017-04-04 17:01:08.946580828 +0200 |
228 | @@ -30,7 +30,7 @@ |
229 | btrfs subvolume create /root/usr/usr |
230 | umount /root/usr |
231 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr |
232 | -cp -a -t /root /source/* |
233 | +cp -a /source/* /root |
234 | mkdir -p /root/run |
235 | umount /root/usr |
236 | umount /root |
237 | diff -Naur dracut-045/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-045-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh |
238 | --- dracut-045/test/TEST-04-FULL-SYSTEMD/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
239 | +++ dracut-045-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2017-04-04 17:02:15.538855502 +0200 |
240 | @@ -31,7 +31,7 @@ |
241 | btrfs subvolume create /root/usr/usr |
242 | umount /root/usr |
243 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr |
244 | -cp -a -t /root /source/* |
245 | +cp -a /source/* /root |
246 | mkdir -p /root/run |
247 | umount /root/usr |
248 | umount /root |
249 | diff -Naur dracut-045/test/TEST-10-RAID/create-root.sh dracut-045-busybox/test/TEST-10-RAID/create-root.sh |
250 | --- dracut-045/test/TEST-10-RAID/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
251 | +++ dracut-045-busybox/test/TEST-10-RAID/create-root.sh 2017-04-04 17:00:31.721986705 +0200 |
252 | @@ -29,7 +29,7 @@ |
253 | mke2fs /dev/dracut/root |
254 | mkdir -p /sysroot |
255 | mount /dev/dracut/root /sysroot |
256 | -cp -a -t /sysroot /source/* |
257 | +cp -a /source/* /sysroot |
258 | umount /sysroot |
259 | lvm lvchange -a n /dev/dracut/root |
260 | udevadm settle |
261 | diff -Naur dracut-045/test/TEST-11-LVM/create-root.sh dracut-045-busybox/test/TEST-11-LVM/create-root.sh |
262 | --- dracut-045/test/TEST-11-LVM/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
263 | +++ dracut-045-busybox/test/TEST-11-LVM/create-root.sh 2017-04-04 17:02:36.184630814 +0200 |
264 | @@ -22,7 +22,7 @@ |
265 | mke2fs /dev/dracut/root && \ |
266 | mkdir -p /sysroot && \ |
267 | mount /dev/dracut/root /sysroot && \ |
268 | -cp -a -t /sysroot /source/* && \ |
269 | +cp -a /source/* /sysroot && \ |
270 | umount /sysroot && \ |
271 | sleep 1 && \ |
272 | lvm lvchange -a n /dev/dracut/root && \ |
273 | diff -Naur dracut-045/test/TEST-12-RAID-DEG/create-root.sh dracut-045-busybox/test/TEST-12-RAID-DEG/create-root.sh |
274 | --- dracut-045/test/TEST-12-RAID-DEG/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
275 | +++ dracut-045-busybox/test/TEST-12-RAID-DEG/create-root.sh 2017-04-04 17:01:59.911025636 +0200 |
276 | @@ -32,7 +32,7 @@ |
277 | mke2fs -L root /dev/dracut/root |
278 | mkdir -p /sysroot |
279 | mount /dev/dracut/root /sysroot |
280 | -cp -a -t /sysroot /source/* |
281 | +cp -a /source/* /sysroot |
282 | mkdir /sysroot/run |
283 | umount /sysroot |
284 | lvm lvchange -a n /dev/dracut/root |
285 | diff -Naur dracut-045/test/TEST-12-RAID-DEG/test.sh dracut-045-busybox/test/TEST-12-RAID-DEG/test.sh |
286 | --- dracut-045/test/TEST-12-RAID-DEG/test.sh 2017-04-03 10:26:25.000000000 +0200 |
287 | +++ dracut-045-busybox/test/TEST-12-RAID-DEG/test.sh 2017-04-04 17:05:36.604670340 +0200 |
288 | @@ -11,8 +11,8 @@ |
289 | |
290 | client_run() { |
291 | echo "CLIENT TEST START: $@" |
292 | - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new |
293 | - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new |
294 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new |
295 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new |
296 | |
297 | $testdir/run-qemu \ |
298 | -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 256M -nographic -smp 2 \ |
299 | @@ -33,7 +33,7 @@ |
300 | } |
301 | |
302 | test_run() { |
303 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) |
304 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) |
305 | echo "MD_UUID=$MD_UUID" |
306 | read LUKS_UUID < $TESTDIR/luksuuid |
307 | |
308 | @@ -122,7 +122,7 @@ |
309 | -initrd $TESTDIR/initramfs.makeroot || return 1 |
310 | |
311 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 |
312 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) |
313 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) |
314 | eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) |
315 | echo $ID_FS_UUID > $TESTDIR/luksuuid |
316 | |
317 | diff -Naur dracut-045/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh |
318 | --- dracut-045/test/TEST-13-ENC-RAID-LVM/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
319 | +++ dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2017-04-04 16:59:13.278843128 +0200 |
320 | @@ -32,7 +32,7 @@ |
321 | mke2fs /dev/dracut/root && \ |
322 | mkdir -p /sysroot && \ |
323 | mount /dev/dracut/root /sysroot && \ |
324 | -cp -a -t /sysroot /source/* && \ |
325 | +cp -a /source/* /sysroot && \ |
326 | umount /sysroot && \ |
327 | sleep 2 && \ |
328 | lvm lvchange -a n /dev/dracut/root && \ |
329 | diff -Naur dracut-045/test/TEST-13-ENC-RAID-LVM/test.sh dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/test.sh |
330 | --- dracut-045/test/TEST-13-ENC-RAID-LVM/test.sh 2017-04-03 10:26:25.000000000 +0200 |
331 | +++ dracut-045-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2017-04-04 16:53:55.650331792 +0200 |
332 | @@ -115,7 +115,7 @@ |
333 | -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ |
334 | -initrd $TESTDIR/initramfs.makeroot || return 1 |
335 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 |
336 | - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) |
337 | + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) |
338 | for uuid in $cryptoUUIDS; do |
339 | eval $uuid |
340 | printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID |
341 | diff -Naur dracut-045/test/TEST-14-IMSM/create-root.sh dracut-045-busybox/test/TEST-14-IMSM/create-root.sh |
342 | --- dracut-045/test/TEST-14-IMSM/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
343 | +++ dracut-045-busybox/test/TEST-14-IMSM/create-root.sh 2017-04-04 17:00:51.407772021 +0200 |
344 | @@ -62,7 +62,7 @@ |
345 | mke2fs -L root /dev/dracut/root && \ |
346 | mkdir -p /sysroot && \ |
347 | mount /dev/dracut/root /sysroot && \ |
348 | -cp -a -t /sysroot /source/* && \ |
349 | +cp -a /source/* /sysroot && \ |
350 | umount /sysroot && \ |
351 | lvm lvchange -a n /dev/dracut/root && \ |
352 | udevadm settle |
353 | diff -Naur dracut-045/test/TEST-14-IMSM/test.sh dracut-045-busybox/test/TEST-14-IMSM/test.sh |
354 | --- dracut-045/test/TEST-14-IMSM/test.sh 2017-04-03 10:26:25.000000000 +0200 |
355 | +++ dracut-045-busybox/test/TEST-14-IMSM/test.sh 2017-04-04 16:53:44.293457336 +0200 |
356 | @@ -108,7 +108,7 @@ |
357 | -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ |
358 | -initrd $TESTDIR/initramfs.makeroot || return 1 |
359 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 |
360 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) |
361 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) |
362 | echo $MD_UUID > $TESTDIR/mduuid |
363 | ( |
364 | export initdir=$TESTDIR/overlay |
365 | diff -Naur dracut-045/test/TEST-15-BTRFSRAID/create-root.sh dracut-045-busybox/test/TEST-15-BTRFSRAID/create-root.sh |
366 | --- dracut-045/test/TEST-15-BTRFSRAID/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
367 | +++ dracut-045-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2017-04-04 16:59:33.229625156 +0200 |
368 | @@ -21,7 +21,7 @@ |
369 | set -e |
370 | mkdir -p /sysroot |
371 | mount -t btrfs /dev/sda5 /sysroot |
372 | -cp -a -t /sysroot /source/* |
373 | +cp -a /source/* /sysroot |
374 | umount /sysroot |
375 | echo "dracut-root-block-created" >/dev/sda1 |
376 | poweroff -f |
377 | diff -Naur dracut-045/test/TEST-17-LVM-THIN/create-root.sh dracut-045-busybox/test/TEST-17-LVM-THIN/create-root.sh |
378 | --- dracut-045/test/TEST-17-LVM-THIN/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
379 | +++ dracut-045-busybox/test/TEST-17-LVM-THIN/create-root.sh 2017-04-04 17:02:54.403432599 +0200 |
380 | @@ -23,7 +23,7 @@ |
381 | mke2fs /dev/dracut/root && \ |
382 | mkdir -p /sysroot && \ |
383 | mount /dev/dracut/root /sysroot && \ |
384 | -cp -a -t /sysroot /source/* && \ |
385 | +cp -a /source/* /sysroot && \ |
386 | umount /sysroot && \ |
387 | sleep 1 && \ |
388 | lvm lvchange -a n /dev/dracut/root && \ |
389 | diff -Naur dracut-045/test/TEST-30-ISCSI/create-root.sh dracut-045-busybox/test/TEST-30-ISCSI/create-root.sh |
390 | --- dracut-045/test/TEST-30-ISCSI/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
391 | +++ dracut-045-busybox/test/TEST-30-ISCSI/create-root.sh 2017-04-04 17:00:11.684205317 +0200 |
392 | @@ -8,7 +8,7 @@ |
393 | mkfs.ext3 -j -L singleroot -F /dev/sda && \ |
394 | mkdir -p /sysroot && \ |
395 | mount /dev/sda /sysroot && \ |
396 | -cp -a -t /sysroot /source/* && \ |
397 | +cp -a /source/* /sysroot && \ |
398 | umount /sysroot && \ |
399 | mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ |
400 | mdadm -W /dev/md0 || : && \ |
401 | @@ -18,7 +18,7 @@ |
402 | lvm vgchange -ay && \ |
403 | mkfs.ext3 -j -L sysroot /dev/dracut/root && \ |
404 | mount /dev/dracut/root /sysroot && \ |
405 | -cp -a -t /sysroot /source/* && \ |
406 | +cp -a /source/* /sysroot && \ |
407 | umount /sysroot && \ |
408 | lvm lvchange -a n /dev/dracut/root && \ |
409 | echo "dracut-root-block-created" >/dev/sdb |
410 | diff -Naur dracut-045/test/TEST-40-NBD/create-root.sh dracut-045-busybox/test/TEST-40-NBD/create-root.sh |
411 | --- dracut-045/test/TEST-40-NBD/create-root.sh 2017-04-03 10:26:25.000000000 +0200 |
412 | +++ dracut-045-busybox/test/TEST-40-NBD/create-root.sh 2017-04-04 17:01:43.066209080 +0200 |
413 | @@ -17,7 +17,7 @@ |
414 | /sbin/tune2fs -e continue /dev/dracut/root && \ |
415 | mkdir -p /sysroot && \ |
416 | mount /dev/dracut/root /sysroot && \ |
417 | -cp -a -t /sysroot /source/* && \ |
418 | +cp -a /source/* /sysroot && \ |
419 | umount /sysroot |
420 | sleep 1 |
421 | lvm lvchange -a n /dev/dracut/root |
422 | diff -Naur dracut-045/test/TEST-99-RPM/test.sh dracut-045-busybox/test/TEST-99-RPM/test.sh |
423 | --- dracut-045/test/TEST-99-RPM/test.sh 2017-04-03 10:26:25.000000000 +0200 |
424 | +++ dracut-045-busybox/test/TEST-99-RPM/test.sh 2017-04-04 16:51:45.611773715 +0200 |
425 | @@ -26,7 +26,7 @@ |
426 | mount -t devtmpfs devtmpfs "$rootdir/dev" |
427 | |
428 | mkdir -p "$rootdir/$TESTDIR" |
429 | - cp --reflink=auto -a \ |
430 | + cp -a \ |
431 | "$TESTDIR"/dracut-[0-9]*.$(arch).rpm \ |
432 | "$TESTDIR"/dracut-network-[0-9]*.$(arch).rpm \ |
433 | "$rootdir/$TESTDIR/" |