Annotation of /trunk/dracut/patches/dracut-043-busybox.patch
Parent Directory | Revision Log
Revision 2620 -
(hide annotations)
(download)
Wed Jul 15 12:56:25 2015 UTC (9 years, 2 months ago) by niro
File size: 17265 byte(s)
Wed Jul 15 12:56:25 2015 UTC (9 years, 2 months ago) by niro
File size: 17265 byte(s)
-rediffed for 043 and merged all patches to a single one
1 | niro | 2620 | diff -Naur dracut-043/50-dracut.install dracut-043-busybox/50-dracut.install |
2 | --- dracut-043/50-dracut.install 2015-06-15 12:27:21.000000000 +0200 | ||
3 | +++ dracut-043-busybox/50-dracut.install 2015-07-15 14:54:22.463440923 +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-043/51-dracut-rescue.install dracut-043-busybox/51-dracut-rescue.install | ||
14 | --- dracut-043/51-dracut-rescue.install 2015-06-15 12:27:21.000000000 +0200 | ||
15 | +++ dracut-043-busybox/51-dracut-rescue.install 2015-07-15 14:54:36.631285073 +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 | @@ -79,7 +79,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-043/51-dracut-rescue-postinst.sh dracut-043-busybox/51-dracut-rescue-postinst.sh | ||
35 | --- dracut-043/51-dracut-rescue-postinst.sh 2015-06-15 12:27:21.000000000 +0200 | ||
36 | +++ dracut-043-busybox/51-dracut-rescue-postinst.sh 2015-07-15 14:54:47.304167563 +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-043/dracut-functions.sh dracut-043-busybox/dracut-functions.sh | ||
56 | --- dracut-043/dracut-functions.sh 2015-06-15 12:27:21.000000000 +0200 | ||
57 | +++ dracut-043-busybox/dracut-functions.sh 2015-07-15 14:38:05.595359723 +0200 | ||
58 | @@ -284,7 +284,7 @@ | ||
59 | printf "%s\n" "$__newpath" | ||
60 | } | ||
61 | |||
62 | -if [[ "$(ln --help)" == *--relative* ]]; then | ||
63 | +if [[ "$(ln --help &> /dev/null)" == *--relative* ]]; then | ||
64 | ln_r() { | ||
65 | ln -sfnr "${initdir}/$1" "${initdir}/$2" | ||
66 | } | ||
67 | diff -Naur dracut-043/dracut.sh dracut-043-busybox/dracut.sh | ||
68 | --- dracut-043/dracut.sh 2015-06-15 12:27:21.000000000 +0200 | ||
69 | +++ dracut-043-busybox/dracut.sh 2015-07-15 14:40:57.626369645 +0200 | ||
70 | @@ -290,7 +290,7 @@ | ||
71 | printf "%s\n" "${i##*/}" | ||
72 | fi | ||
73 | done | ||
74 | - done | sort -Vu | { | ||
75 | + done | sort -u | { | ||
76 | readarray -t files | ||
77 | |||
78 | for f in "${files[@]}"; do | ||
79 | @@ -1573,11 +1573,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 | - cp --reflink=auto --sparse=auto -fa -t "$object_destdir" "$objectname"/* | ||
87 | + cp -fa "$objectname"/* "$object_destdir" | ||
88 | else | ||
89 | - cp --reflink=auto --sparse=auto -fa -t "$destdir" "$objectname" | ||
90 | + cp -fa "$objectname" "$destdir" | ||
91 | fi | ||
92 | done | ||
93 | fi | ||
94 | diff -Naur dracut-043/install/dracut-install.c dracut-043-busybox/install/dracut-install.c | ||
95 | --- dracut-043/install/dracut-install.c 2015-06-15 12:27:21.000000000 +0200 | ||
96 | +++ dracut-043-busybox/install/dracut-install.c 2015-07-15 14:42:13.778488714 +0200 | ||
97 | @@ -242,7 +242,7 @@ | ||
98 | normal_copy: | ||
99 | pid = fork(); | ||
100 | if (pid == 0) { | ||
101 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, | ||
102 | + execlp("cp", "cp", "-pfL", src, dst, | ||
103 | NULL); | ||
104 | _exit(EXIT_FAILURE); | ||
105 | } | ||
106 | @@ -250,7 +250,7 @@ | ||
107 | while (waitpid(pid, &ret, 0) < 0) { | ||
108 | if (errno != EINTR) { | ||
109 | ret = -1; | ||
110 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, | ||
111 | + log_error("Failed: cp -pfL %s %s", src, | ||
112 | dst); | ||
113 | break; | ||
114 | } | ||
115 | diff -Naur dracut-043/modules.d/10i18n/module-setup.sh dracut-043-busybox/modules.d/10i18n/module-setup.sh | ||
116 | --- dracut-043/modules.d/10i18n/module-setup.sh 2015-06-15 12:27:21.000000000 +0200 | ||
117 | +++ dracut-043-busybox/modules.d/10i18n/module-setup.sh 2015-07-15 14:42:55.139010252 +0200 | ||
118 | @@ -107,7 +107,7 @@ | ||
119 | |||
120 | for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do | ||
121 | inst_dir "$_src" | ||
122 | - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/* | ||
123 | + cp -prfL "$_src"/* "${initdir}/${_src}" | ||
124 | done | ||
125 | |||
126 | # remove unnecessary files | ||
127 | diff -Naur dracut-043/modules.d/45url-lib/module-setup.sh dracut-043-busybox/modules.d/45url-lib/module-setup.sh | ||
128 | --- dracut-043/modules.d/45url-lib/module-setup.sh 2015-06-15 12:27:21.000000000 +0200 | ||
129 | +++ dracut-043-busybox/modules.d/45url-lib/module-setup.sh 2015-07-15 14:56:00.111363696 +0200 | ||
130 | @@ -29,7 +29,7 @@ | ||
131 | [[ -d $_dir ]] || continue | ||
132 | for _lib in $_dir/libcurl.so.*; do | ||
133 | [[ -e $_lib ]] || continue | ||
134 | - _crt=$(grep -F --binary-files=text -z .crt $_lib) | ||
135 | + _crt=$(grep -F .crt $_lib) | ||
136 | [[ $_crt ]] || continue | ||
137 | [[ $_crt == /*/* ]] || continue | ||
138 | if ! inst_simple "$_crt"; then | ||
139 | diff -Naur dracut-043/modules.d/95terminfo/module-setup.sh dracut-043-busybox/modules.d/95terminfo/module-setup.sh | ||
140 | --- dracut-043/modules.d/95terminfo/module-setup.sh 2015-06-15 12:27:21.000000000 +0200 | ||
141 | +++ dracut-043-busybox/modules.d/95terminfo/module-setup.sh 2015-07-15 14:43:27.874631566 +0200 | ||
142 | @@ -11,7 +11,7 @@ | ||
143 | if [ -d ${_terminfodir} ]; then | ||
144 | for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do | ||
145 | inst_dir "$_terminfodir/${i%/*}" | ||
146 | - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" | ||
147 | + cp -prfL "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" | ||
148 | done | ||
149 | fi | ||
150 | } | ||
151 | diff -Naur dracut-043/modules.d/99base/dracut-lib.sh dracut-043-busybox/modules.d/99base/dracut-lib.sh | ||
152 | --- dracut-043/modules.d/99base/dracut-lib.sh 2015-06-15 12:27:21.000000000 +0200 | ||
153 | +++ dracut-043-busybox/modules.d/99base/dracut-lib.sh 2015-07-15 14:44:11.068131902 +0200 | ||
154 | @@ -676,7 +676,7 @@ | ||
155 | copytree() { | ||
156 | local src="$1" dest="$2" | ||
157 | mkdir -p "$dest"; dest=$(readlink -e -q "$dest") | ||
158 | - ( cd "$src"; cp -af . -t "$dest" ) | ||
159 | + ( cd "$src"; cp -af . "$dest" ) | ||
160 | } | ||
161 | |||
162 | # Evaluates command for UUIDs either given as arguments for this function or all | ||
163 | diff -Naur dracut-043/test/TEST-01-BASIC/create-root.sh dracut-043-busybox/test/TEST-01-BASIC/create-root.sh | ||
164 | --- dracut-043/test/TEST-01-BASIC/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
165 | +++ dracut-043-busybox/test/TEST-01-BASIC/create-root.sh 2015-07-15 14:45:07.665477184 +0200 | ||
166 | @@ -16,7 +16,7 @@ | ||
167 | mkfs.ext3 -L dracut /dev/sda2 | ||
168 | mkdir -p /root | ||
169 | mount /dev/sda2 /root | ||
170 | -cp -a -t /root /source/* | ||
171 | +cp -a /source/* /root | ||
172 | mkdir -p /root/run | ||
173 | umount /root | ||
174 | echo "dracut-root-block-created" >/dev/sda1 | ||
175 | diff -Naur dracut-043/test/TEST-02-SYSTEMD/create-root.sh dracut-043-busybox/test/TEST-02-SYSTEMD/create-root.sh | ||
176 | --- dracut-043/test/TEST-02-SYSTEMD/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
177 | +++ dracut-043-busybox/test/TEST-02-SYSTEMD/create-root.sh 2015-07-15 14:45:39.371110413 +0200 | ||
178 | @@ -16,7 +16,7 @@ | ||
179 | mkfs.ext3 -L dracut /dev/sda2 | ||
180 | mkdir -p /root | ||
181 | mount /dev/sda2 /root | ||
182 | -cp -a -t /root /source/* | ||
183 | +cp -a /source/* /root | ||
184 | mkdir -p /root/run | ||
185 | umount /root | ||
186 | echo "dracut-root-block-created" >/dev/sda1 | ||
187 | diff -Naur dracut-043/test/TEST-03-USR-MOUNT/create-root.sh dracut-043-busybox/test/TEST-03-USR-MOUNT/create-root.sh | ||
188 | --- dracut-043/test/TEST-03-USR-MOUNT/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
189 | +++ dracut-043-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2015-07-15 14:46:09.793758485 +0200 | ||
190 | @@ -30,7 +30,7 @@ | ||
191 | btrfs subvolume create /root/usr/usr | ||
192 | umount /root/usr | ||
193 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
194 | -cp -a -t /root /source/* | ||
195 | +cp -a /source/* /root | ||
196 | mkdir -p /root/run | ||
197 | umount /root/usr | ||
198 | umount /root | ||
199 | diff -Naur dracut-043/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-043-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh | ||
200 | --- dracut-043/test/TEST-04-FULL-SYSTEMD/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
201 | +++ dracut-043-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2015-07-15 14:46:33.209487613 +0200 | ||
202 | @@ -30,7 +30,7 @@ | ||
203 | btrfs subvolume create /root/usr/usr | ||
204 | umount /root/usr | ||
205 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
206 | -cp -a -t /root /source/* | ||
207 | +cp -a /source/* /root | ||
208 | mkdir -p /root/run | ||
209 | umount /root/usr | ||
210 | umount /root | ||
211 | diff -Naur dracut-043/test/TEST-10-RAID/create-root.sh dracut-043-busybox/test/TEST-10-RAID/create-root.sh | ||
212 | --- dracut-043/test/TEST-10-RAID/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
213 | +++ dracut-043-busybox/test/TEST-10-RAID/create-root.sh 2015-07-15 14:47:01.041186650 +0200 | ||
214 | @@ -29,7 +29,7 @@ | ||
215 | mke2fs /dev/dracut/root | ||
216 | mkdir -p /sysroot | ||
217 | mount /dev/dracut/root /sysroot | ||
218 | -cp -a -t /sysroot /source/* | ||
219 | +cp -a /source/* /sysroot | ||
220 | umount /sysroot | ||
221 | lvm lvchange -a n /dev/dracut/root | ||
222 | udevadm settle | ||
223 | diff -Naur dracut-043/test/TEST-11-LVM/create-root.sh dracut-043-busybox/test/TEST-11-LVM/create-root.sh | ||
224 | --- dracut-043/test/TEST-11-LVM/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
225 | +++ dracut-043-busybox/test/TEST-11-LVM/create-root.sh 2015-07-15 14:47:30.600877617 +0200 | ||
226 | @@ -22,7 +22,7 @@ | ||
227 | mke2fs /dev/dracut/root && \ | ||
228 | mkdir -p /sysroot && \ | ||
229 | mount /dev/dracut/root /sysroot && \ | ||
230 | -cp -a -t /sysroot /source/* && \ | ||
231 | +cp -a /source/* /sysroot && \ | ||
232 | umount /sysroot && \ | ||
233 | sleep 1 && \ | ||
234 | lvm lvchange -a n /dev/dracut/root && \ | ||
235 | diff -Naur dracut-043/test/TEST-12-RAID-DEG/create-root.sh dracut-043-busybox/test/TEST-12-RAID-DEG/create-root.sh | ||
236 | --- dracut-043/test/TEST-12-RAID-DEG/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
237 | +++ dracut-043-busybox/test/TEST-12-RAID-DEG/create-root.sh 2015-07-15 14:47:56.425606331 +0200 | ||
238 | @@ -32,7 +32,7 @@ | ||
239 | mke2fs -L root /dev/dracut/root | ||
240 | mkdir -p /sysroot | ||
241 | mount /dev/dracut/root /sysroot | ||
242 | -cp -a -t /sysroot /source/* | ||
243 | +cp -a /source/* /sysroot | ||
244 | mkdir /sysroot/run | ||
245 | umount /sysroot | ||
246 | lvm lvchange -a n /dev/dracut/root | ||
247 | diff -Naur dracut-043/test/TEST-12-RAID-DEG/test.sh dracut-043-busybox/test/TEST-12-RAID-DEG/test.sh | ||
248 | --- dracut-043/test/TEST-12-RAID-DEG/test.sh 2015-06-15 12:27:21.000000000 +0200 | ||
249 | +++ dracut-043-busybox/test/TEST-12-RAID-DEG/test.sh 2015-07-15 14:56:43.662881111 +0200 | ||
250 | @@ -11,8 +11,8 @@ | ||
251 | |||
252 | client_run() { | ||
253 | echo "CLIENT TEST START: $@" | ||
254 | - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
255 | - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
256 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
257 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
258 | |||
259 | $testdir/run-qemu \ | ||
260 | -drive format=raw,index=0,media=disk,file=$TESTDIR/root.ext2 -m 256M -nographic -smp 2 \ | ||
261 | @@ -32,7 +32,7 @@ | ||
262 | } | ||
263 | |||
264 | test_run() { | ||
265 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
266 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
267 | echo "MD_UUID=$MD_UUID" | ||
268 | read LUKS_UUID < $TESTDIR/luksuuid | ||
269 | |||
270 | @@ -121,7 +121,7 @@ | ||
271 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
272 | |||
273 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
274 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
275 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
276 | eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) | ||
277 | echo $ID_FS_UUID > $TESTDIR/luksuuid | ||
278 | |||
279 | diff -Naur dracut-043/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh | ||
280 | --- dracut-043/test/TEST-13-ENC-RAID-LVM/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
281 | +++ dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2015-07-15 14:48:55.408982495 +0200 | ||
282 | @@ -32,7 +32,7 @@ | ||
283 | mke2fs /dev/dracut/root && \ | ||
284 | mkdir -p /sysroot && \ | ||
285 | mount /dev/dracut/root /sysroot && \ | ||
286 | -cp -a -t /sysroot /source/* && \ | ||
287 | +cp -a /source/* /sysroot && \ | ||
288 | umount /sysroot && \ | ||
289 | sleep 2 && \ | ||
290 | lvm lvchange -a n /dev/dracut/root && \ | ||
291 | diff -Naur dracut-043/test/TEST-13-ENC-RAID-LVM/test.sh dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/test.sh | ||
292 | --- dracut-043/test/TEST-13-ENC-RAID-LVM/test.sh 2015-06-15 12:27:21.000000000 +0200 | ||
293 | +++ dracut-043-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2015-07-15 14:57:05.606637509 +0200 | ||
294 | @@ -112,7 +112,7 @@ | ||
295 | -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
296 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
297 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
298 | - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
299 | + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
300 | for uuid in $cryptoUUIDS; do | ||
301 | eval $uuid | ||
302 | printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID | ||
303 | diff -Naur dracut-043/test/TEST-14-IMSM/create-root.sh dracut-043-busybox/test/TEST-14-IMSM/create-root.sh | ||
304 | --- dracut-043/test/TEST-14-IMSM/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
305 | +++ dracut-043-busybox/test/TEST-14-IMSM/create-root.sh 2015-07-15 14:49:19.552725564 +0200 | ||
306 | @@ -62,7 +62,7 @@ | ||
307 | mke2fs -L root /dev/dracut/root && \ | ||
308 | mkdir -p /sysroot && \ | ||
309 | mount /dev/dracut/root /sysroot && \ | ||
310 | -cp -a -t /sysroot /source/* && \ | ||
311 | +cp -a /source/* /sysroot && \ | ||
312 | umount /sysroot && \ | ||
313 | lvm lvchange -a n /dev/dracut/root && \ | ||
314 | udevadm settle | ||
315 | diff -Naur dracut-043/test/TEST-14-IMSM/test.sh dracut-043-busybox/test/TEST-14-IMSM/test.sh | ||
316 | --- dracut-043/test/TEST-14-IMSM/test.sh 2015-06-15 12:27:21.000000000 +0200 | ||
317 | +++ dracut-043-busybox/test/TEST-14-IMSM/test.sh 2015-07-15 14:57:25.166420133 +0200 | ||
318 | @@ -107,7 +107,7 @@ | ||
319 | -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
320 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
321 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
322 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
323 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
324 | echo $MD_UUID > $TESTDIR/mduuid | ||
325 | ( | ||
326 | export initdir=$TESTDIR/overlay | ||
327 | diff -Naur dracut-043/test/TEST-15-BTRFSRAID/create-root.sh dracut-043-busybox/test/TEST-15-BTRFSRAID/create-root.sh | ||
328 | --- dracut-043/test/TEST-15-BTRFSRAID/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
329 | +++ dracut-043-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2015-07-15 14:49:47.889422924 +0200 | ||
330 | @@ -20,7 +20,7 @@ | ||
331 | set -e | ||
332 | mkdir -p /sysroot | ||
333 | mount -t btrfs /dev/sda5 /sysroot | ||
334 | -cp -a -t /sysroot /source/* | ||
335 | +cp -a /source/* /sysroot | ||
336 | umount /sysroot | ||
337 | echo "dracut-root-block-created" >/dev/sda1 | ||
338 | poweroff -f | ||
339 | diff -Naur dracut-043/test/TEST-17-LVM-THIN/create-root.sh dracut-043-busybox/test/TEST-17-LVM-THIN/create-root.sh | ||
340 | --- dracut-043/test/TEST-17-LVM-THIN/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
341 | +++ dracut-043-busybox/test/TEST-17-LVM-THIN/create-root.sh 2015-07-15 14:50:15.073131552 +0200 | ||
342 | @@ -23,7 +23,7 @@ | ||
343 | mke2fs /dev/dracut/root && \ | ||
344 | mkdir -p /sysroot && \ | ||
345 | mount /dev/dracut/root /sysroot && \ | ||
346 | -cp -a -t /sysroot /source/* && \ | ||
347 | +cp -a /source/* /sysroot && \ | ||
348 | umount /sysroot && \ | ||
349 | sleep 1 && \ | ||
350 | lvm lvchange -a n /dev/dracut/root && \ | ||
351 | diff -Naur dracut-043/test/TEST-30-ISCSI/create-root.sh dracut-043-busybox/test/TEST-30-ISCSI/create-root.sh | ||
352 | --- dracut-043/test/TEST-30-ISCSI/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
353 | +++ dracut-043-busybox/test/TEST-30-ISCSI/create-root.sh 2015-07-15 14:50:58.608662908 +0200 | ||
354 | @@ -8,7 +8,7 @@ | ||
355 | mkfs.ext3 -j -L singleroot -F /dev/sda && \ | ||
356 | mkdir -p /sysroot && \ | ||
357 | mount /dev/sda /sysroot && \ | ||
358 | -cp -a -t /sysroot /source/* && \ | ||
359 | +cp -a /source/* /sysroot && \ | ||
360 | umount /sysroot && \ | ||
361 | mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ | ||
362 | mdadm -W /dev/md0 || : && \ | ||
363 | @@ -18,7 +18,7 @@ | ||
364 | lvm vgchange -ay && \ | ||
365 | mkfs.ext3 -j -L sysroot /dev/dracut/root && \ | ||
366 | mount /dev/dracut/root /sysroot && \ | ||
367 | -cp -a -t /sysroot /source/* && \ | ||
368 | +cp -a /source/* /sysroot && \ | ||
369 | umount /sysroot && \ | ||
370 | lvm lvchange -a n /dev/dracut/root && \ | ||
371 | echo "dracut-root-block-created" >/dev/sdb | ||
372 | diff -Naur dracut-043/test/TEST-40-NBD/create-root.sh dracut-043-busybox/test/TEST-40-NBD/create-root.sh | ||
373 | --- dracut-043/test/TEST-40-NBD/create-root.sh 2015-06-15 12:27:21.000000000 +0200 | ||
374 | +++ dracut-043-busybox/test/TEST-40-NBD/create-root.sh 2015-07-15 14:51:27.816347202 +0200 | ||
375 | @@ -17,7 +17,7 @@ | ||
376 | /sbin/tune2fs -e continue /dev/dracut/root && \ | ||
377 | mkdir -p /sysroot && \ | ||
378 | mount /dev/dracut/root /sysroot && \ | ||
379 | -cp -a -t /sysroot /source/* && \ | ||
380 | +cp -a /source/* /sysroot && \ | ||
381 | umount /sysroot | ||
382 | sleep 1 | ||
383 | lvm lvchange -a n /dev/dracut/root |