Contents of /trunk/dracut/patches/dracut-037-busybox.patch
Parent Directory | Revision Log
Revision 2425 -
(show annotations)
(download)
Fri Mar 28 10:31:31 2014 UTC (10 years, 6 months ago) by niro
File size: 13099 byte(s)
Fri Mar 28 10:31:31 2014 UTC (10 years, 6 months ago) by niro
File size: 13099 byte(s)
-re-worked for dracut-037
1 | diff -Naur dracut-037/51-dracut-rescue.install dracut-037-busybox/51-dracut-rescue.install |
2 | --- dracut-037/51-dracut-rescue.install 2014-03-19 16:16:08.000000000 +0000 |
3 | +++ dracut-037-busybox/51-dracut-rescue.install 2014-03-28 12:20:56.438000000 +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-037/51-dracut-rescue-postinst.sh dracut-037-busybox/51-dracut-rescue-postinst.sh |
14 | --- dracut-037/51-dracut-rescue-postinst.sh 2014-03-19 16:16:08.000000000 +0000 |
15 | +++ dracut-037-busybox/51-dracut-rescue-postinst.sh 2014-03-28 12:21:09.974000000 +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-037/dracut-functions.sh dracut-037-busybox/dracut-functions.sh |
26 | --- dracut-037/dracut-functions.sh 2014-03-19 16:16:08.000000000 +0000 |
27 | +++ dracut-037-busybox/dracut-functions.sh 2014-03-28 12:22:24.716000000 +0000 |
28 | @@ -293,7 +293,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-037/dracut.sh dracut-037-busybox/dracut.sh |
38 | --- dracut-037/dracut.sh 2014-03-19 16:16:08.000000000 +0000 |
39 | +++ dracut-037-busybox/dracut.sh 2014-03-28 12:23:17.832000000 +0000 |
40 | @@ -270,7 +270,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 | @@ -1357,11 +1357,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-037/install/dracut-install.c dracut-037-busybox/install/dracut-install.c |
65 | --- dracut-037/install/dracut-install.c 2014-03-19 16:16:08.000000000 +0000 |
66 | +++ dracut-037-busybox/install/dracut-install.c 2014-03-28 12:24:44.263000000 +0000 |
67 | @@ -240,7 +240,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 | @@ -248,7 +248,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-037/modules.d/10i18n/module-setup.sh dracut-037-busybox/modules.d/10i18n/module-setup.sh |
86 | --- dracut-037/modules.d/10i18n/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 |
87 | +++ dracut-037-busybox/modules.d/10i18n/module-setup.sh 2014-03-28 12:25:27.271000000 +0000 |
88 | @@ -109,7 +109,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-037/modules.d/95terminfo/module-setup.sh dracut-037-busybox/modules.d/95terminfo/module-setup.sh |
98 | --- dracut-037/modules.d/95terminfo/module-setup.sh 2014-03-19 16:16:08.000000000 +0000 |
99 | +++ dracut-037-busybox/modules.d/95terminfo/module-setup.sh 2014-03-28 12:26:20.994000000 +0000 |
100 | @@ -13,7 +13,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-037/modules.d/99base/dracut-lib.sh dracut-037-busybox/modules.d/99base/dracut-lib.sh |
110 | --- dracut-037/modules.d/99base/dracut-lib.sh 2014-03-19 16:16:08.000000000 +0000 |
111 | +++ dracut-037-busybox/modules.d/99base/dracut-lib.sh 2014-03-28 12:26:47.568000000 +0000 |
112 | @@ -657,7 +657,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-037/test/TEST-01-BASIC/create-root.sh dracut-037-busybox/test/TEST-01-BASIC/create-root.sh |
122 | --- dracut-037/test/TEST-01-BASIC/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
123 | +++ dracut-037-busybox/test/TEST-01-BASIC/create-root.sh 2014-03-28 12:27:25.384000000 +0000 |
124 | @@ -15,7 +15,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-037/test/TEST-02-SYSTEMD/create-root.sh dracut-037-busybox/test/TEST-02-SYSTEMD/create-root.sh |
134 | --- dracut-037/test/TEST-02-SYSTEMD/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
135 | +++ dracut-037-busybox/test/TEST-02-SYSTEMD/create-root.sh 2014-03-28 12:27:47.096000000 +0000 |
136 | @@ -15,7 +15,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-037/test/TEST-03-USR-MOUNT/create-root.sh dracut-037-busybox/test/TEST-03-USR-MOUNT/create-root.sh |
146 | --- dracut-037/test/TEST-03-USR-MOUNT/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
147 | +++ dracut-037-busybox/test/TEST-03-USR-MOUNT/create-root.sh 2014-03-28 12:28:12.072000000 +0000 |
148 | @@ -29,7 +29,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-037/test/TEST-04-FULL-SYSTEMD/create-root.sh dracut-037-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh |
158 | --- dracut-037/test/TEST-04-FULL-SYSTEMD/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
159 | +++ dracut-037-busybox/test/TEST-04-FULL-SYSTEMD/create-root.sh 2014-03-28 12:28:38.472000000 +0000 |
160 | @@ -29,7 +29,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-037/test/TEST-10-RAID/create-root.sh dracut-037-busybox/test/TEST-10-RAID/create-root.sh |
170 | --- dracut-037/test/TEST-10-RAID/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
171 | +++ dracut-037-busybox/test/TEST-10-RAID/create-root.sh 2014-03-28 12:29:01.445000000 +0000 |
172 | @@ -28,7 +28,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-037/test/TEST-11-LVM/create-root.sh dracut-037-busybox/test/TEST-11-LVM/create-root.sh |
182 | --- dracut-037/test/TEST-11-LVM/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
183 | +++ dracut-037-busybox/test/TEST-11-LVM/create-root.sh 2014-03-28 12:29:22.448000000 +0000 |
184 | @@ -21,7 +21,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-037/test/TEST-12-RAID-DEG/create-root.sh dracut-037-busybox/test/TEST-12-RAID-DEG/create-root.sh |
194 | --- dracut-037/test/TEST-12-RAID-DEG/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
195 | +++ dracut-037-busybox/test/TEST-12-RAID-DEG/create-root.sh 2014-03-28 12:29:46.777000000 +0000 |
196 | @@ -31,7 +31,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-037/test/TEST-12-RAID-DEG/test.sh dracut-037-busybox/test/TEST-12-RAID-DEG/test.sh |
206 | --- dracut-037/test/TEST-12-RAID-DEG/test.sh 2014-03-19 16:16:08.000000000 +0000 |
207 | +++ dracut-037-busybox/test/TEST-12-RAID-DEG/test.sh 2014-03-28 12:30:15.921000000 +0000 |
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-037/test/TEST-13-ENC-RAID-LVM/create-root.sh dracut-037-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh |
220 | --- dracut-037/test/TEST-13-ENC-RAID-LVM/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
221 | +++ dracut-037-busybox/test/TEST-13-ENC-RAID-LVM/create-root.sh 2014-03-28 12:30:55.504000000 +0000 |
222 | @@ -31,7 +31,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-037/test/TEST-14-IMSM/create-root.sh dracut-037-busybox/test/TEST-14-IMSM/create-root.sh |
232 | --- dracut-037/test/TEST-14-IMSM/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
233 | +++ dracut-037-busybox/test/TEST-14-IMSM/create-root.sh 2014-03-28 12:31:22.473000000 +0000 |
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-037/test/TEST-15-BTRFSRAID/create-root.sh dracut-037-busybox/test/TEST-15-BTRFSRAID/create-root.sh |
244 | --- dracut-037/test/TEST-15-BTRFSRAID/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
245 | +++ dracut-037-busybox/test/TEST-15-BTRFSRAID/create-root.sh 2014-03-28 12:31:42.601000000 +0000 |
246 | @@ -22,7 +22,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-037/test/TEST-17-LVM-THIN/create-root.sh dracut-037-busybox/test/TEST-17-LVM-THIN/create-root.sh |
256 | --- dracut-037/test/TEST-17-LVM-THIN/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
257 | +++ dracut-037-busybox/test/TEST-17-LVM-THIN/create-root.sh 2014-03-28 12:33:26.762000000 +0000 |
258 | @@ -22,7 +22,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-037/test/TEST-30-ISCSI/create-root.sh dracut-037-busybox/test/TEST-30-ISCSI/create-root.sh |
268 | --- dracut-037/test/TEST-30-ISCSI/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
269 | +++ dracut-037-busybox/test/TEST-30-ISCSI/create-root.sh 2014-03-28 12:32:16.809000000 +0000 |
270 | @@ -8,7 +8,7 @@ |
271 | mkfs.ext3 -j -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-037/test/TEST-40-NBD/create-root.sh dracut-037-busybox/test/TEST-40-NBD/create-root.sh |
289 | --- dracut-037/test/TEST-40-NBD/create-root.sh 2014-03-19 16:16:08.000000000 +0000 |
290 | +++ dracut-037-busybox/test/TEST-40-NBD/create-root.sh 2014-03-28 12:32:41.169000000 +0000 |
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 |