Contents of /trunk/dracut/patches/dracut-019-busybox-compat.patch
Parent Directory | Revision Log
Revision 1861 -
(show annotations)
(download)
Thu Jul 26 15:13:44 2012 UTC (12 years, 2 months ago) by niro
File size: 2570 byte(s)
Thu Jul 26 15:13:44 2012 UTC (12 years, 2 months ago) by niro
File size: 2570 byte(s)
-added patches for busybox and alx
1 | diff -Naur dracut-019/dracut-functions.sh dracut-019-magellan/dracut-functions.sh |
2 | --- dracut-019/dracut-functions.sh 2012-06-04 14:24:25.000000000 +0200 |
3 | +++ dracut-019-magellan/dracut-functions.sh 2012-07-26 19:03:10.405981503 +0200 |
4 | @@ -369,7 +369,7 @@ |
5 | else |
6 | # create directory |
7 | mkdir -m 0755 -p "${initdir}/$_file" || return 1 |
8 | - [[ -e "$_file" ]] && chmod --reference="$_file" "${initdir}/$_file" |
9 | + [[ -e "$_file" ]] && chmod $(stat -c %a "$_file") "${initdir}/$_file" |
10 | chmod u+w "${initdir}/$_file" |
11 | fi |
12 | done |
13 | @@ -394,7 +394,7 @@ |
14 | inst "${_src%/*}/.${_src##*/}.hmac" "${target%/*}/.${target##*/}.hmac" |
15 | fi |
16 | ddebug "Installing $_src" |
17 | - cp --sparse=always -pfL "$_src" "${initdir}/$target" |
18 | + cp -pfL "$_src" "${initdir}/$target" |
19 | } |
20 | |
21 | # find symlinks linked to given library file |
22 | diff -Naur dracut-019/dracut.sh dracut-019-magellan/dracut.sh |
23 | --- dracut-019/dracut.sh 2012-06-04 14:24:25.000000000 +0200 |
24 | +++ dracut-019-magellan/dracut.sh 2012-07-26 19:02:27.756983119 +0200 |
25 | @@ -792,7 +792,7 @@ |
26 | if [[ -d "$i" ]]; then |
27 | if ! [[ -e "$s" ]]; then |
28 | mkdir -m 0755 -p "$s" |
29 | - chmod --reference="$i" "$s" |
30 | + chmod $(stat -c %a "$i") "$s" |
31 | fi |
32 | cp -a -t "$s" "$i"/* |
33 | else |
34 | diff -Naur dracut-019/lsinitrd.sh dracut-019-magellan/lsinitrd.sh |
35 | --- dracut-019/lsinitrd.sh 2012-06-04 14:24:25.000000000 +0200 |
36 | +++ dracut-019-magellan/lsinitrd.sh 2012-07-26 18:59:46.657983739 +0200 |
37 | @@ -36,8 +36,8 @@ |
38 | CAT=zcat |
39 | FILE_T=$(file --dereference "$image") |
40 | |
41 | -if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then |
42 | - XZ_SINGLE_STREAM="--single-stream" |
43 | +if echo "test"|xz >/dev/null 2>&1; then |
44 | + XZ_SINGLE_STREAM="" |
45 | fi |
46 | |
47 | if [[ "$FILE_T" =~ :\ gzip\ compressed\ data ]]; then |
48 | diff -Naur dracut-019/test/TEST-12-RAID-DEG/test.sh dracut-019-magellan/test/TEST-12-RAID-DEG/test.sh |
49 | --- dracut-019/test/TEST-12-RAID-DEG/test.sh 2012-06-04 14:24:25.000000000 +0200 |
50 | +++ dracut-019-magellan/test/TEST-12-RAID-DEG/test.sh 2012-07-26 19:00:52.993982361 +0200 |
51 | @@ -9,8 +9,8 @@ |
52 | |
53 | client_run() { |
54 | echo "CLIENT TEST START: $@" |
55 | - cp --sparse=always $TESTDIR/disk2.img $TESTDIR/disk2.img.new |
56 | - cp --sparse=always $TESTDIR/disk3.img $TESTDIR/disk3.img.new |
57 | + cp $TESTDIR/disk2.img $TESTDIR/disk2.img.new |
58 | + cp $TESTDIR/disk3.img $TESTDIR/disk3.img.new |
59 | |
60 | $testdir/run-qemu \ |
61 | -hda $TESTDIR/root.ext2 -m 256M -nographic \ |