Annotation of /trunk/dracut/patches/dracut-040-busybox.patch
Parent Directory | Revision Log
Revision 2554 -
(hide annotations)
(download)
Thu Mar 26 10:24:55 2015 UTC (9 years, 6 months ago) by niro
File size: 13109 byte(s)
Thu Mar 26 10:24:55 2015 UTC (9 years, 6 months ago) by niro
File size: 13109 byte(s)
-re-diffed busybox patches for dracut-040
1 | niro | 2554 | diff -Naur dracut-040/51-dracut-rescue.install dracut-040-busybox/51-dracut-rescue.install |
2 | --- dracut-040/51-dracut-rescue.install 2014-10-24 13:19:58.000000000 +0200 | ||
3 | +++ dracut-040-busybox/51-dracut-rescue.install 2015-03-26 11:08:58.316975200 +0100 | ||
4 | @@ -18,7 +18,7 @@ | ||
5 | [[ -f $i ]] && echo ${i##*/} | ||
6 | done | ||
7 | shift | ||
8 | - done | sort -Vu | ||
9 | + done | sort -u | ||
10 | ) | ||
11 | |||
12 | for f in $files; do | ||
13 | diff -Naur dracut-040/51-dracut-rescue-postinst.sh dracut-040-busybox/51-dracut-rescue-postinst.sh | ||
14 | --- dracut-040/51-dracut-rescue-postinst.sh 2014-10-24 13:19:58.000000000 +0200 | ||
15 | +++ dracut-040-busybox/51-dracut-rescue-postinst.sh 2015-03-26 11:09:15.844776816 +0100 | ||
16 | @@ -31,7 +31,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 | diff -Naur dracut-040/dracut-functions.sh dracut-040-busybox/dracut-functions.sh | ||
26 | --- dracut-040/dracut-functions.sh 2014-10-24 13:19:58.000000000 +0200 | ||
27 | +++ dracut-040-busybox/dracut-functions.sh 2015-03-26 11:10:39.828826702 +0100 | ||
28 | @@ -294,7 +294,7 @@ | ||
29 | printf "%s\n" "$__newpath" | ||
30 | } | ||
31 | |||
32 | -if [[ "$(ln --help)" == *--relative* ]]; then | ||
33 | +if [[ "$(ln --help &> /dev/null)" == *--relative* ]]; then | ||
34 | ln_r() { | ||
35 | ln -sfnr "${initdir}/$1" "${initdir}/$2" | ||
36 | } | ||
37 | diff -Naur dracut-040/dracut.sh dracut-040-busybox/dracut.sh | ||
38 | --- dracut-040/dracut.sh 2014-10-24 13:19:58.000000000 +0200 | ||
39 | +++ dracut-040-busybox/dracut.sh 2015-03-26 11:24:52.272157121 +0100 | ||
40 | @@ -276,7 +276,7 @@ | ||
41 | printf "%s\n" "${i##*/}" | ||
42 | fi | ||
43 | done | ||
44 | - done | sort -Vu | { | ||
45 | + done | sort -u | { | ||
46 | readarray -t files | ||
47 | |||
48 | for f in "${files[@]}"; do | ||
49 | @@ -1452,11 +1452,11 @@ | ||
50 | if [[ -d "$i" ]]; then | ||
51 | if ! [[ -e "$s" ]]; then | ||
52 | mkdir -m 0755 -p "$s" | ||
53 | - chmod --reference="$i" "$s" | ||
54 | + chmod $(stat -c %a "$i") "$s" | ||
55 | fi | ||
56 | - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/* | ||
57 | + cp -fa "$i"/* "$s" | ||
58 | else | ||
59 | - cp --reflink=auto --sparse=auto -fa -t "$s" "$i" | ||
60 | + cp -fa "$i" "$s" | ||
61 | fi | ||
62 | done | ||
63 | fi | ||
64 | diff -Naur dracut-040/install/dracut-install.c dracut-040-busybox/install/dracut-install.c | ||
65 | --- dracut-040/install/dracut-install.c 2014-10-24 13:19:58.000000000 +0200 | ||
66 | +++ dracut-040-busybox/install/dracut-install.c 2015-03-26 11:13:54.572625853 +0100 | ||
67 | @@ -242,7 +242,7 @@ | ||
68 | normal_copy: | ||
69 | pid = fork(); | ||
70 | if (pid == 0) { | ||
71 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst, | ||
72 | + execlp("cp", "cp", "-pfL", src, dst, | ||
73 | NULL); | ||
74 | _exit(EXIT_FAILURE); | ||
75 | } | ||
76 | @@ -250,7 +250,7 @@ | ||
77 | while (waitpid(pid, &ret, 0) < 0) { | ||
78 | if (errno != EINTR) { | ||
79 | ret = -1; | ||
80 | - log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src, | ||
81 | + log_error("Failed: cp -pfL %s %s", src, | ||
82 | dst); | ||
83 | break; | ||
84 | } | ||
85 | diff -Naur dracut-040/modules.d/10i18n/module-setup.sh dracut-040-busybox/modules.d/10i18n/module-setup.sh | ||
86 | --- dracut-040/modules.d/10i18n/module-setup.sh 2014-10-24 13:19:58.000000000 +0200 | ||
87 | +++ dracut-040-busybox/modules.d/10i18n/module-setup.sh 2015-03-26 11:14:41.140096774 +0100 | ||
88 | @@ -107,7 +107,7 @@ | ||
89 | |||
90 | for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do | ||
91 | inst_dir "$_src" | ||
92 | - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/* | ||
93 | + cp -prfL "$_src"/* "${initdir}/${_src}" | ||
94 | done | ||
95 | |||
96 | # remove unnecessary files | ||
97 | diff -Naur dracut-040/modules.d/95terminfo/module-setup.sh dracut-040-busybox/modules.d/95terminfo/module-setup.sh | ||
98 | --- dracut-040/modules.d/95terminfo/module-setup.sh 2014-10-24 13:19:58.000000000 +0200 | ||
99 | +++ dracut-040-busybox/modules.d/95terminfo/module-setup.sh 2015-03-26 11:15:18.283579699 +0100 | ||
100 | @@ -11,7 +11,7 @@ | ||
101 | if [ -d ${_terminfodir} ]; then | ||
102 | for i in "l/linux" "v/vt100" "v/vt102" "v/vt220"; do | ||
103 | inst_dir "$_terminfodir/${i%/*}" | ||
104 | - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}/${i%/*}" "$_terminfodir/$i" | ||
105 | + cp -prfL "$_terminfodir/$i" "${initdir}/${_terminfodir}/${i%/*}" | ||
106 | done | ||
107 | fi | ||
108 | } | ||
109 | diff -Naur dracut-040/modules.d/99base/dracut-lib.sh dracut-040-busybox/modules.d/99base/dracut-lib.sh | ||
110 | --- dracut-040/modules.d/99base/dracut-lib.sh 2014-10-24 13:19:58.000000000 +0200 | ||
111 | +++ dracut-040-busybox/modules.d/99base/dracut-lib.sh 2015-03-26 11:16:00.514999199 +0100 | ||
112 | @@ -669,7 +669,7 @@ | ||
113 | copytree() { | ||
114 | local src="$1" dest="$2" | ||
115 | mkdir -p "$dest"; dest=$(readlink -e -q "$dest") | ||
116 | - ( cd "$src"; cp -af . -t "$dest" ) | ||
117 | + ( cd "$src"; cp -af . "$dest" ) | ||
118 | } | ||
119 | |||
120 | # Evaluates command for UUIDs either given as arguments for this function or all | ||
121 | diff -Naur dracut-040/test/TEST-01-BASIC/create-root.sh dracut-040-busybox/test/TEST-01-BASIC/create-root.sh | ||
122 | --- dracut-040/test/TEST-01-BASIC/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
123 | +++ dracut-040-busybox/test/TEST-01-BASIC/create-root.sh 2015-03-26 11:16:35.194527982 +0100 | ||
124 | @@ -16,7 +16,7 @@ | ||
125 | mkfs.ext3 -L dracut /dev/sda2 | ||
126 | mkdir -p /root | ||
127 | mount /dev/sda2 /root | ||
128 | -cp -a -t /root /source/* | ||
129 | +cp -a /source/* /root | ||
130 | mkdir -p /root/run | ||
131 | umount /root | ||
132 | echo "dracut-root-block-created" >/dev/sda1 | ||
133 | diff -Naur dracut-040/test/TEST-02-SYSTEMD/create-root.sh dracut-040-busybox/test/TEST-02-SYSTEMD/create-root.sh | ||
134 | --- dracut-040/test/TEST-02-SYSTEMD/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
135 | +++ dracut-040-busybox/test/TEST-02-SYSTEMD/create-root.sh 2015-03-26 11:16:57.034233607 +0100 | ||
136 | @@ -16,7 +16,7 @@ | ||
137 | mkfs.ext3 -L dracut /dev/sda2 | ||
138 | mkdir -p /root | ||
139 | mount /dev/sda2 /root | ||
140 | -cp -a -t /root /source/* | ||
141 | +cp -a /source/* /root | ||
142 | mkdir -p /root/run | ||
143 | umount /root | ||
144 | echo "dracut-root-block-created" >/dev/sda1 | ||
145 | diff -Naur dracut-040/test/TEST-03-USR-MOUNT/create-root.sh dracut-040-busybox/test/TEST-03-USR-MOUNT/create-root.sh | ||
146 | --- dracut-040/test/TEST-03-USR-MOUNT/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
147 | +++ dracut-040-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2015-03-26 11:17:23.922873565 +0100 | ||
148 | @@ -30,7 +30,7 @@ | ||
149 | btrfs subvolume create /root/usr/usr | ||
150 | umount /root/usr | ||
151 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
152 | -cp -a -t /root /source/* | ||
153 | +cp -a /source/* /root | ||
154 | mkdir -p /root/run | ||
155 | umount /root/usr | ||
156 | umount /root | ||
157 | diff -Naur dracut-040/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-040-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh | ||
158 | --- dracut-040/test/TEST-04-FULL-SYSTEMD/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
159 | +++ dracut-040-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2015-03-26 11:17:47.338562074 +0100 | ||
160 | @@ -30,7 +30,7 @@ | ||
161 | btrfs subvolume create /root/usr/usr | ||
162 | umount /root/usr | ||
163 | mount -t btrfs -o subvol=usr /dev/sdb2 /root/usr | ||
164 | -cp -a -t /root /source/* | ||
165 | +cp -a /source/* /root | ||
166 | mkdir -p /root/run | ||
167 | umount /root/usr | ||
168 | umount /root | ||
169 | diff -Naur dracut-040/test/TEST-10-RAID/create-root.sh dracut-040-busybox/test/TEST-10-RAID/create-root.sh | ||
170 | --- dracut-040/test/TEST-10-RAID/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
171 | +++ dracut-040-busybox/test/TEST-10-RAID/create-root.sh 2015-03-26 11:18:10.217259483 +0100 | ||
172 | @@ -29,7 +29,7 @@ | ||
173 | mke2fs /dev/dracut/root | ||
174 | mkdir -p /sysroot | ||
175 | mount /dev/dracut/root /sysroot | ||
176 | -cp -a -t /sysroot /source/* | ||
177 | +cp -a /source/* /sysroot | ||
178 | umount /sysroot | ||
179 | lvm lvchange -a n /dev/dracut/root | ||
180 | udevadm settle | ||
181 | diff -Naur dracut-040/test/TEST-11-LVM/create-root.sh dracut-040-busybox/test/TEST-11-LVM/create-root.sh | ||
182 | --- dracut-040/test/TEST-11-LVM/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
183 | +++ dracut-040-busybox/test/TEST-11-LVM/create-root.sh 2015-03-26 11:18:38.041893704 +0100 | ||
184 | @@ -22,7 +22,7 @@ | ||
185 | mke2fs /dev/dracut/root && \ | ||
186 | mkdir -p /sysroot && \ | ||
187 | mount /dev/dracut/root /sysroot && \ | ||
188 | -cp -a -t /sysroot /source/* && \ | ||
189 | +cp -a /source/* /sysroot && \ | ||
190 | umount /sysroot && \ | ||
191 | sleep 1 && \ | ||
192 | lvm lvchange -a n /dev/dracut/root && \ | ||
193 | diff -Naur dracut-040/test/TEST-12-RAID-DEG/create-root.sh dracut-040-busybox/test/TEST-12-RAID-DEG/create-root.sh | ||
194 | --- dracut-040/test/TEST-12-RAID-DEG/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
195 | +++ dracut-040-busybox/test/TEST-12-RAID-DEG/create-root.sh 2015-03-26 11:19:02.178578297 +0100 | ||
196 | @@ -32,7 +32,7 @@ | ||
197 | mke2fs -L root /dev/dracut/root | ||
198 | mkdir -p /sysroot | ||
199 | mount /dev/dracut/root /sysroot | ||
200 | -cp -a -t /sysroot /source/* | ||
201 | +cp -a /source/* /sysroot | ||
202 | mkdir /sysroot/run | ||
203 | umount /sysroot | ||
204 | lvm lvchange -a n /dev/dracut/root | ||
205 | diff -Naur dracut-040/test/TEST-12-RAID-DEG/test.sh dracut-040-busybox/test/TEST-12-RAID-DEG/test.sh | ||
206 | --- dracut-040/test/TEST-12-RAID-DEG/test.sh 2014-10-24 13:19:58.000000000 +0200 | ||
207 | +++ dracut-040-busybox/test/TEST-12-RAID-DEG/test.sh 2015-03-26 11:19:32.785180730 +0100 | ||
208 | @@ -11,8 +11,8 @@ | ||
209 | |||
210 | client_run() { | ||
211 | echo "CLIENT TEST START: $@" | ||
212 | - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
213 | - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
214 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
215 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
216 | |||
217 | $testdir/run-qemu \ | ||
218 | -hda $TESTDIR/root.ext2 -m 256M -nographic -smp 2 \ | ||
219 | diff -Naur dracut-040/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-040-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh | ||
220 | --- dracut-040/test/TEST-13-ENC-RAID-LVM/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
221 | +++ dracut-040-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2015-03-26 11:19:57.840857154 +0100 | ||
222 | @@ -32,7 +32,7 @@ | ||
223 | mke2fs /dev/dracut/root && \ | ||
224 | mkdir -p /sysroot && \ | ||
225 | mount /dev/dracut/root /sysroot && \ | ||
226 | -cp -a -t /sysroot /source/* && \ | ||
227 | +cp -a /source/* /sysroot && \ | ||
228 | umount /sysroot && \ | ||
229 | sleep 2 && \ | ||
230 | lvm lvchange -a n /dev/dracut/root && \ | ||
231 | diff -Naur dracut-040/test/TEST-14-IMSM/create-root.sh dracut-040-busybox/test/TEST-14-IMSM/create-root.sh | ||
232 | --- dracut-040/test/TEST-14-IMSM/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
233 | +++ dracut-040-busybox/test/TEST-14-IMSM/create-root.sh 2015-03-26 11:20:27.057481875 +0100 | ||
234 | @@ -59,7 +59,7 @@ | ||
235 | mke2fs -L root /dev/dracut/root && \ | ||
236 | mkdir -p /sysroot && \ | ||
237 | mount /dev/dracut/root /sysroot && \ | ||
238 | -cp -a -t /sysroot /source/* && \ | ||
239 | +cp -a /source/* /sysroot && \ | ||
240 | umount /sysroot && \ | ||
241 | lvm lvchange -a n /dev/dracut/root && \ | ||
242 | udevadm settle | ||
243 | diff -Naur dracut-040/test/TEST-15-BTRFSRAID/create-root.sh dracut-040-busybox/test/TEST-15-BTRFSRAID/create-root.sh | ||
244 | --- dracut-040/test/TEST-15-BTRFSRAID/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
245 | +++ dracut-040-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2015-03-26 11:20:48.337209853 +0100 | ||
246 | @@ -23,7 +23,7 @@ | ||
247 | set -e | ||
248 | mkdir -p /sysroot | ||
249 | mount -t btrfs /dev/sda8 /sysroot | ||
250 | -cp -a -t /sysroot /source/* | ||
251 | +cp -a /source/* /sysroot | ||
252 | umount /sysroot | ||
253 | echo "dracut-root-block-created" >/dev/sda1 | ||
254 | poweroff -f | ||
255 | diff -Naur dracut-040/test/TEST-17-LVM-THIN/create-root.sh dracut-040-busybox/test/TEST-17-LVM-THIN/create-root.sh | ||
256 | --- dracut-040/test/TEST-17-LVM-THIN/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
257 | +++ dracut-040-busybox/test/TEST-17-LVM-THIN/create-root.sh 2015-03-26 11:21:15.120868965 +0100 | ||
258 | @@ -23,7 +23,7 @@ | ||
259 | mke2fs /dev/dracut/root && \ | ||
260 | mkdir -p /sysroot && \ | ||
261 | mount /dev/dracut/root /sysroot && \ | ||
262 | -cp -a -t /sysroot /source/* && \ | ||
263 | +cp -a /source/* /sysroot && \ | ||
264 | umount /sysroot && \ | ||
265 | sleep 1 && \ | ||
266 | lvm lvchange -a n /dev/dracut/root && \ | ||
267 | diff -Naur dracut-040/test/TEST-30-ISCSI/create-root.sh dracut-040-busybox/test/TEST-30-ISCSI/create-root.sh | ||
268 | --- dracut-040/test/TEST-30-ISCSI/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
269 | +++ dracut-040-busybox/test/TEST-30-ISCSI/create-root.sh 2015-03-26 11:21:53.361384986 +0100 | ||
270 | @@ -8,7 +8,7 @@ | ||
271 | mkfs.ext3 -j -L singleroot -F /dev/sda && \ | ||
272 | mkdir -p /sysroot && \ | ||
273 | mount /dev/sda /sysroot && \ | ||
274 | -cp -a -t /sysroot /source/* && \ | ||
275 | +cp -a /source/* /sysroot && \ | ||
276 | umount /sysroot && \ | ||
277 | mdadm --create /dev/md0 --run --auto=yes --level=stripe --raid-devices=2 /dev/sdc /dev/sdd && \ | ||
278 | mdadm -W /dev/md0 || : && \ | ||
279 | @@ -18,7 +18,7 @@ | ||
280 | lvm vgchange -ay && \ | ||
281 | mkfs.ext3 -j -L sysroot /dev/dracut/root && \ | ||
282 | mount /dev/dracut/root /sysroot && \ | ||
283 | -cp -a -t /sysroot /source/* && \ | ||
284 | +cp -a /source/* /sysroot && \ | ||
285 | umount /sysroot && \ | ||
286 | lvm lvchange -a n /dev/dracut/root && \ | ||
287 | echo "dracut-root-block-created" >/dev/sdb | ||
288 | diff -Naur dracut-040/test/TEST-40-NBD/create-root.sh dracut-040-busybox/test/TEST-40-NBD/create-root.sh | ||
289 | --- dracut-040/test/TEST-40-NBD/create-root.sh 2014-10-24 13:19:58.000000000 +0200 | ||
290 | +++ dracut-040-busybox/test/TEST-40-NBD/create-root.sh 2015-03-26 11:22:20.688040984 +0100 | ||
291 | @@ -17,7 +17,7 @@ | ||
292 | /sbin/tune2fs -e continue /dev/dracut/root && \ | ||
293 | mkdir -p /sysroot && \ | ||
294 | mount /dev/dracut/root /sysroot && \ | ||
295 | -cp -a -t /sysroot /source/* && \ | ||
296 | +cp -a /source/* /sysroot && \ | ||
297 | umount /sysroot | ||
298 | sleep 1 | ||
299 | lvm lvchange -a n /dev/dracut/root |