Annotation of /trunk/busybox/patches/dracut-037-busybox-grep.patch
Parent Directory | Revision Log
Revision 2479 -
(hide annotations)
(download)
Thu Jul 10 08:53:39 2014 UTC (10 years, 2 months ago) by niro
File size: 2624 byte(s)
Thu Jul 10 08:53:39 2014 UTC (10 years, 2 months ago) by niro
File size: 2624 byte(s)
-fix some grep commands with busybox
1 | niro | 2479 | diff -Naur dracut-037/modules.d/45url-lib/module-setup.sh dracut-037-busybox/modules.d/45url-lib/module-setup.sh |
2 | --- dracut-037/modules.d/45url-lib/module-setup.sh 2014-03-19 17:16:08.000000000 +0100 | ||
3 | +++ dracut-037-busybox/modules.d/45url-lib/module-setup.sh 2014-07-10 15:10:20.603307722 +0200 | ||
4 | @@ -28,7 +28,7 @@ | ||
5 | [[ -d $_dir ]] || continue | ||
6 | for _lib in $_dir/libcurl.so.*; do | ||
7 | [[ -e $_lib ]] || continue | ||
8 | - _crt=$(grep -F --binary-files=text -z .crt $_lib) | ||
9 | + _crt=$(grep -F .crt $_lib) | ||
10 | [[ $_crt ]] || continue | ||
11 | [[ $_crt == /*/* ]] || continue | ||
12 | if ! inst_simple "$_crt"; then | ||
13 | diff -Naur dracut-037/test/TEST-12-RAID-DEG/test.sh dracut-037-busybox/test/TEST-12-RAID-DEG/test.sh | ||
14 | --- dracut-037/test/TEST-12-RAID-DEG/test.sh 2014-03-19 17:16:08.000000000 +0100 | ||
15 | +++ dracut-037-busybox/test/TEST-12-RAID-DEG/test.sh 2014-07-10 15:11:49.068307101 +0200 | ||
16 | @@ -32,7 +32,7 @@ | ||
17 | } | ||
18 | |||
19 | test_run() { | ||
20 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
21 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
22 | echo "MD_UUID=$MD_UUID" | ||
23 | read LUKS_UUID < $TESTDIR/luksuuid | ||
24 | |||
25 | diff -Naur dracut-037/test/TEST-13-ENC-RAID-LVM/test.sh dracut-037-busybox/test/TEST-13-ENC-RAID-LVM/test.sh | ||
26 | --- dracut-037/test/TEST-13-ENC-RAID-LVM/test.sh 2014-03-19 17:16:08.000000000 +0100 | ||
27 | +++ dracut-037-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2014-07-10 15:11:34.492307204 +0200 | ||
28 | @@ -104,7 +104,7 @@ | ||
29 | -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
30 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
31 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
32 | - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
33 | + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) | ||
34 | for uuid in $cryptoUUIDS; do | ||
35 | eval $uuid | ||
36 | printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID | ||
37 | diff -Naur dracut-037/test/TEST-14-IMSM/test.sh dracut-037-busybox/test/TEST-14-IMSM/test.sh | ||
38 | --- dracut-037/test/TEST-14-IMSM/test.sh 2014-03-19 17:16:08.000000000 +0100 | ||
39 | +++ dracut-037-busybox/test/TEST-14-IMSM/test.sh 2014-07-10 15:11:19.140307311 +0200 | ||
40 | @@ -100,7 +100,7 @@ | ||
41 | -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ | ||
42 | -initrd $TESTDIR/initramfs.makeroot || return 1 | ||
43 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 | ||
44 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) | ||
45 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) | ||
46 | echo $MD_UUID > $TESTDIR/mduuid | ||
47 | ( | ||
48 | export initdir=$TESTDIR/overlay |