Contents of /trunk/dracut/patches/dracut-040-busybox-grep.patch
Parent Directory
| 
Revision Log
Revision 2554 -
(show annotations)
(download)
Thu Mar 26 10:24:55 2015 UTC (9 years, 1 month ago) by niro
File size: 3004 byte(s)
Thu Mar 26 10:24:55 2015 UTC (9 years, 1 month ago) by niro
File size: 3004 byte(s)
-re-diffed busybox patches for dracut-040
| 1 | diff -Naur dracut-040/modules.d/45url-lib/module-setup.sh dracut-040-busybox/modules.d/45url-lib/module-setup.sh |
| 2 | --- dracut-040/modules.d/45url-lib/module-setup.sh 2014-10-24 13:19:58.000000000 +0200 |
| 3 | +++ dracut-040-busybox/modules.d/45url-lib/module-setup.sh 2015-03-26 11:04:08.903256738 +0100 |
| 4 | @@ -29,7 +29,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-040/test/TEST-12-RAID-DEG/test.sh dracut-040-busybox/test/TEST-12-RAID-DEG/test.sh |
| 14 | --- dracut-040/test/TEST-12-RAID-DEG/test.sh 2014-10-24 13:19:58.000000000 +0200 |
| 15 | +++ dracut-040-busybox/test/TEST-12-RAID-DEG/test.sh 2015-03-26 11:07:30.780966481 +0100 |
| 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 | @@ -121,7 +121,7 @@ |
| 26 | -initrd $TESTDIR/initramfs.makeroot || return 1 |
| 27 | |
| 28 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 |
| 29 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) |
| 30 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) |
| 31 | eval $(grep -F -a -m 1 ID_FS_UUID $TESTDIR/root.ext2) |
| 32 | echo $ID_FS_UUID > $TESTDIR/luksuuid |
| 33 | |
| 34 | diff -Naur dracut-040/test/TEST-13-ENC-RAID-LVM/test.sh dracut-040-busybox/test/TEST-13-ENC-RAID-LVM/test.sh |
| 35 | --- dracut-040/test/TEST-13-ENC-RAID-LVM/test.sh 2014-10-24 13:19:58.000000000 +0200 |
| 36 | +++ dracut-040-busybox/test/TEST-13-ENC-RAID-LVM/test.sh 2015-03-26 11:05:27.622362902 +0100 |
| 37 | @@ -112,7 +112,7 @@ |
| 38 | -append "root=/dev/fakeroot rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ |
| 39 | -initrd $TESTDIR/initramfs.makeroot || return 1 |
| 40 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 |
| 41 | - cryptoUUIDS=$(grep -F --binary-files=text -m 3 ID_FS_UUID $TESTDIR/root.ext2) |
| 42 | + cryptoUUIDS=$(grep -F -m 3 ID_FS_UUID $TESTDIR/root.ext2) |
| 43 | for uuid in $cryptoUUIDS; do |
| 44 | eval $uuid |
| 45 | printf ' rd.luks.uuid=luks-%s ' $ID_FS_UUID |
| 46 | diff -Naur dracut-040/test/TEST-14-IMSM/test.sh dracut-040-busybox/test/TEST-14-IMSM/test.sh |
| 47 | --- dracut-040/test/TEST-14-IMSM/test.sh 2014-10-24 13:19:58.000000000 +0200 |
| 48 | +++ dracut-040-busybox/test/TEST-14-IMSM/test.sh 2015-03-26 11:06:30.429650488 +0100 |
| 49 | @@ -107,7 +107,7 @@ |
| 50 | -append "root=/dev/dracut/root rw rootfstype=ext2 quiet console=ttyS0,115200n81 selinux=0" \ |
| 51 | -initrd $TESTDIR/initramfs.makeroot || return 1 |
| 52 | grep -F -m 1 -q dracut-root-block-created $TESTDIR/root.ext2 || return 1 |
| 53 | - eval $(grep -F --binary-files=text -m 1 MD_UUID $TESTDIR/root.ext2) |
| 54 | + eval $(grep -F -m 1 MD_UUID $TESTDIR/root.ext2) |
| 55 | echo $MD_UUID > $TESTDIR/mduuid |
| 56 | ( |
| 57 | export initdir=$TESTDIR/overlay |