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