rpms/os-prober
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix yaboot.conf parsing and a patch reorder

Browse Source 
- mdraid patch appeared first, so move it upper :P
This commit is contained in:
Hedayat Vatankhah 2012-05-25 16:24:42 +04:30
parent 933050cfdb
commit 415df3509e
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os-prober-yaboot-parsefix.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot.parsefix os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot
--- os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot.parsefix 2012-05-25 15:57:13.477647064 +0430
+++ os-prober-1.53/linux-boot-probes/mounted/powerpc/40yaboot 2012-05-25 16:16:58.844827933 +0430
@@ -74,8 +74,8 @@ parse_yaboot_conf () {
kernel="$(dequote "$2")"
;;
append)
- shift 1
- parameters="$(dequote "${line#append=}")"
+ cleanappend=`printf %s "$line" | sed -E 's/append(\s)*=(\s)*//'`
+ parameters="$(dequote "$cleanappend")"
;;
initrd)
initrd="$(dequote "$2")"

15
os-prober.spec
View File

@ -13,8 +13,9 @@ Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{
Patch0: os-prober-newnsdirfix.patch Patch0: os-prober-newnsdirfix.patch
Patch1: os-porber-no-dummy-mach-kernel.patch Patch1: os-porber-no-dummy-mach-kernel.patch
# Sent upstream # Sent upstream
Patch2: os-prober-grub2-fedorafix.patch Patch2: os-prober-mdraidfix.patch
Patch3: os-prober-mdraidfix.patch Patch3: os-prober-grub2-fedorafix.patch
Patch4: os-prober-yaboot-parsefix.patch
Requires: udev coreutils util-linux Requires: udev coreutils util-linux
Requires: grep /bin/sed /sbin/modprobe Requires: grep /bin/sed /sbin/modprobe
@ -28,8 +29,10 @@ distributions can be added easily.
%setup -q %setup -q
%patch0 -p1 -b .newnsdirfix %patch0 -p1 -b .newnsdirfix
%patch1 -p1 -b .macosxdummyfix %patch1 -p1 -b .macosxdummyfix
%patch2 -p1 -b .grub2-fedorafix %patch2 -p1 -b .mdraidfix
%patch3 -p1 -b .mdraidfix %patch3 -p1 -b .grub2-fedorafix
%patch4 -p1 -b .yaboot-parsefix
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \; find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \ sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
linux-boot-probes/common/50mounted-tests linux-boot-probes/common/50mounted-tests
@ -80,9 +83,11 @@ fi
%changelog %changelog
* Fri May 25 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-2 * Fri May 25 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-2
- Add support for OSes installed on Linux mdraid partitions, bug #752402
- Add Fedora's grub2 config path, fixes generating menu entries for other - Add Fedora's grub2 config path, fixes generating menu entries for other
installed Fedora's installed Fedora's
- Add support for OSes installed on Linux mdraid partitions, bug #752402 - Fixed bug in parsing yaboot.conf: accept spaces around '=' for append,
bug #825041
* Fri May 11 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-1 * Fri May 11 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-1
- Updated to 1.53 for a bugfix - Updated to 1.53 for a bugfix