Annotation of /trunk/dracut/patches/dracut-024-busybox-compat-2.patch
Parent Directory | Revision Log
Revision 1948 -
(hide annotations)
(download)
Thu Nov 15 15:53:52 2012 UTC (11 years, 7 months ago) by niro
File size: 4279 byte(s)
Thu Nov 15 15:53:52 2012 UTC (11 years, 7 months ago) by niro
File size: 4279 byte(s)
-improved patch
1 | niro | 1948 | diff -Naur dracut-024/dracut-functions.sh dracut-024-magellan/dracut-functions.sh |
2 | --- dracut-024/dracut-functions.sh 2012-10-16 16:31:06.000000000 +0200 | ||
3 | +++ dracut-024-magellan/dracut-functions.sh 2012-11-15 20:58:01.252181606 +0100 | ||
4 | @@ -226,7 +226,7 @@ | ||
5 | echo "$__newpath" | ||
6 | } | ||
7 | |||
8 | -if strstr "$(ln --help)" "--relative"; then | ||
9 | +if strstr "$(ln --help &>/dev/null)" "--relative"; then | ||
10 | ln_r() { | ||
11 | ln -sfnr "${initdir}/$1" "${initdir}/$2" | ||
12 | } | ||
13 | @@ -611,7 +611,7 @@ | ||
14 | else | ||
15 | # create directory | ||
16 | mkdir -m 0755 -p "${initdir}/$_file" || return 1 | ||
17 | - [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file" | ||
18 | + [[ -e "$_file" ]] && chmod $(stat -c %a "$_file") "${initdir}/$_file" | ||
19 | chmod u+w "${initdir}/$_file" | ||
20 | fi | ||
21 | done | ||
22 | @@ -646,7 +646,7 @@ | ||
23 | fi | ||
24 | fi | ||
25 | ddebug "Installing $_src" | ||
26 | - cp --reflink=auto --sparse=auto -pfL "$_src" "${initdir}/$_target" | ||
27 | + cp -pfL "$_src" "${initdir}/$_target" | ||
28 | } | ||
29 | |||
30 | # same as above, but specialized for symlinks | ||
31 | diff -Naur dracut-024/dracut.sh dracut-024-magellan/dracut.sh | ||
32 | --- dracut-024/dracut.sh 2012-10-16 16:31:06.000000000 +0200 | ||
33 | +++ dracut-024-magellan/dracut.sh 2012-11-15 20:57:48.068181694 +0100 | ||
34 | @@ -972,11 +972,11 @@ | ||
35 | if [[ -d "$i" ]]; then | ||
36 | if ! [[ -e "$s" ]]; then | ||
37 | mkdir -m 0755 -p "$s" | ||
38 | - chmod --reference="$i" "$s" | ||
39 | + chmod $(stat -c %a "$i") "$s" | ||
40 | fi | ||
41 | - cp --reflink=auto --sparse=auto -fa -t "$s" "$i"/* | ||
42 | + cp -fa -t "$s" "$i"/* | ||
43 | else | ||
44 | - cp --reflink=auto --sparse=auto -fa -t "$s" "$i" | ||
45 | + cp -fa -t "$s" "$i" | ||
46 | fi | ||
47 | done | ||
48 | fi | ||
49 | diff -Naur dracut-024/install/dracut-install.c dracut-024-magellan/install/dracut-install.c | ||
50 | --- dracut-024/install/dracut-install.c 2012-10-16 16:31:06.000000000 +0200 | ||
51 | +++ dracut-024-magellan/install/dracut-install.c 2012-11-15 20:57:48.068181694 +0100 | ||
52 | @@ -230,7 +230,7 @@ | ||
53 | normal_copy: | ||
54 | pid = fork(); | ||
55 | if (pid == 0) { | ||
56 | - execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode", "-fL", src, dst, NULL); | ||
57 | + execlp("cp", "cp", "-pfL", src, dst, NULL); | ||
58 | _exit(EXIT_FAILURE); | ||
59 | } | ||
60 | |||
61 | diff -Naur dracut-024/modules.d/10i18n/module-setup.sh dracut-024-magellan/modules.d/10i18n/module-setup.sh | ||
62 | --- dracut-024/modules.d/10i18n/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 | ||
63 | +++ dracut-024-magellan/modules.d/10i18n/module-setup.sh 2012-11-15 20:57:48.069181694 +0100 | ||
64 | @@ -96,7 +96,7 @@ | ||
65 | |||
66 | for _src in $(eval echo ${kbddir}/{${KBDSUBDIRS}}); do | ||
67 | inst_dir "$_src" | ||
68 | - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_src}" "$_src"/* | ||
69 | + cp -prfL -t "${initdir}/${_src}" "$_src"/* | ||
70 | done | ||
71 | |||
72 | # remove unnecessary files | ||
73 | diff -Naur dracut-024/modules.d/95terminfo/module-setup.sh dracut-024-magellan/modules.d/95terminfo/module-setup.sh | ||
74 | --- dracut-024/modules.d/95terminfo/module-setup.sh 2012-10-16 16:31:06.000000000 +0200 | ||
75 | +++ dracut-024-magellan/modules.d/95terminfo/module-setup.sh 2012-11-15 20:58:36.676181354 +0100 | ||
76 | @@ -11,6 +11,6 @@ | ||
77 | |||
78 | if [ -d ${_terminfodir} ]; then | ||
79 | inst_dir "$_terminfodir" | ||
80 | - cp --reflink=auto --sparse=auto -prfL -t "${initdir}/${_terminfodir}" "$_terminfodir"/* | ||
81 | + cp -prfL "$_terminfodir"/* "${initdir}/${_terminfodir}" | ||
82 | fi | ||
83 | } | ||
84 | diff -Naur dracut-024/test/TEST-12-RAID-DEG/test.sh dracut-024-magellan/test/TEST-12-RAID-DEG/test.sh | ||
85 | --- dracut-024/test/TEST-12-RAID-DEG/test.sh 2012-10-16 16:31:06.000000000 +0200 | ||
86 | +++ dracut-024-magellan/test/TEST-12-RAID-DEG/test.sh 2012-11-15 20:57:48.069181694 +0100 | ||
87 | @@ -9,8 +9,8 @@ | ||
88 | |||
89 | client_run() { | ||
90 | echo "CLIENT TEST START: $@" | ||
91 | - cp --sparse=always --reflink=auto $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
92 | - cp --sparse=always --reflink=auto $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
93 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new | ||
94 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new | ||
95 | |||
96 | $testdir/run-qemu \ | ||
97 | -hda $TESTDIR/root.ext2 -m 256M -nographic \ |