Fix botched IBM patch (multiple partition handling on rs6k)

* IBM file.c patch is broken, fix file.c so yaboot finds its config on
  systems with more then one primary GNU/Linux filesystem partition.
git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-48

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index ed49d306de237583bec339f13fa6f01f22054d31..02e306e2a498a6c95f4d2ab0cd8487fb10ebe005 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,256 +1,256 @@
-./include/xfs/.arch-ids/=id    1044767195      1017069090
-./include/xfs/.arch-ids/xfs.h.id       1044767195      1017069096
-./include/xfs/.arch-ids        1044768386      1017069096
-./include/xfs/xfs.h    1044767195      1002101334
-./include/xfs  1044768386      1007269244
-./include/.arch-ids/errors.h.id        1044767194      1017069108
-./include/.arch-ids/=id        1044767193      1017027153
-./include/.arch-ids/bootinfo.h.id      1044767193      1017027154
-./include/.arch-ids/byteorder.h.id     1044767193      1017027154
-./include/.arch-ids/cfg.h.id   1044767193      1017027154
-./include/.arch-ids/cmdline.h.id       1044767193      1017027154
-./include/.arch-ids/ctype.h.id 1044767193      1017027155
-./include/.arch-ids/fdisk-part.h.id    1044767194      1017027157
-./include/.arch-ids/file.h.id  1044767194      1017027157
-./include/.arch-ids/fs.h.id    1044767194      1017027157
-./include/.arch-ids/mac-part.h.id      1044767194      1017027159
-./include/.arch-ids/md5.h.id   1044767194      1017027159
-./include/.arch-ids/partition.h.id     1044767194      1017027159
-./include/.arch-ids/prom.h.id  1044767194      1017027159
-./include/.arch-ids/setjm2.h.id        1044767194      1017027160
-./include/.arch-ids/setjmp.h.id        1044767194      1017027160
-./include/.arch-ids/stdlib.h.id        1044767194      1017027161
-./include/.arch-ids/string.h.id        1044767194      1017027161
-./include/.arch-ids/swab.h.id  1044767194      1017027161
-./include/.arch-ids/types.h.id 1044767194      1017027162
-./include/.arch-ids/yaboot.h.id        1044767194      1017027162
-./include/.arch-ids/debug.h.id 1044767193      1017154770
-./include/.arch-ids    1044768386      1017154770
-./include/asm/.arch-ids/=id    1044767194      1017027153
-./include/asm/.arch-ids/elf.h.id       1044767194      1017027153
-./include/asm/.arch-ids/ppc_asm.tmpl.id        1044767194      1017027153
-./include/asm/.arch-ids/processor.h.id 1044767194      1017027154
-./include/asm/.arch-ids        1044768386      1017027154
-./include/asm/elf.h    1044767194      1000991730
-./include/asm/ppc_asm.tmpl     1044767194      1000991730
-./include/asm/processor.h      1044767194      1000991730
-./include/asm  1044768386      1007269243
-./include/et/.arch-ids/=id     1044767194      1017027155
-./include/et/.arch-ids/com_err.h.id    1044767194      1017027155
-./include/et/.arch-ids 1044768386      1017155400
-./include/et/com_err.h 1044767194      1000991731
-./include/et   1044768386      1007269243
-./include/ext2fs/.arch-ids/=id 1044767194      1017027156
-./include/ext2fs/.arch-ids/bitops.h.id 1044767194      1017027156
-./include/ext2fs/.arch-ids/ext2_err.h.id       1044767194      1017027156
-./include/ext2fs/.arch-ids/ext2_io.h.id        1044767194      1017027156
-./include/ext2fs/.arch-ids/ext2fs.h.id 1044767194      1017027156
-./include/ext2fs/.arch-ids     1044768386      1017027156
-./include/ext2fs/bitops.h      1044767194      1003927524
-./include/ext2fs/ext2_err.h    1044767194      1003927524
-./include/ext2fs/ext2_io.h     1044767194      1003927524
-./include/ext2fs/ext2fs.h      1044767195      1003927524
-./include/ext2fs       1044768386      1007269243
-./include/linux/.arch-ids/=id  1044767195      1017027157
-./include/linux/.arch-ids/elf.h.id     1044767195      1017027158
-./include/linux/.arch-ids/ext2_fs.h.id 1044767195      1017027158
-./include/linux/.arch-ids/iso_fs.h.id  1044767195      1017027158
-./include/linux/.arch-ids/stat.h.id    1044767195      1017027158
-./include/linux/.arch-ids/types.h.id   1044767195      1017027159
-./include/linux/.arch-ids      1044768386      1017027159
-./include/linux/elf.h  1044767195      1000991731
-./include/linux/ext2_fs.h      1044767195      1000991731
-./include/linux/iso_fs.h       1044767195      1000991731
-./include/linux/stat.h 1044767195      1000991731
-./include/linux/types.h        1044767195      1000991731
-./include/linux        1044768386      1007269243
-./include/reiserfs/.arch-ids/=id       1044767195      1017027160
-./include/reiserfs/.arch-ids/reiserfs.h.id     1044767195      1017027160
-./include/reiserfs/.arch-ids   1044768386      1017027160
-./include/reiserfs/reiserfs.h  1044767195      1025684115
-./include/reiserfs     1044768386      1025684115
-./include/errors.h     1044767194      1007200690
-./include/bootinfo.h   1044767194      1007200690
-./include/byteorder.h  1044767194      1000991730
-./include/cfg.h        1044767194      1007200690
-./include/cmdline.h    1044767194      1007200690
-./include/ctype.h      1044767194      1003656411
-./include/fdisk-part.h 1044767195      1007200690
-./include/file.h       1044767195      1007200690
-./include/fs.h 1044767195      1007200690
-./include/mac-part.h   1044767195      1007200690
-./include/md5.h        1044767195      1000991730
-./include/partition.h  1044767195      1007200690
-./include/prom.h       1044767195      1007200690
-./include/setjm2.h     1044767195      1000991730
-./include/setjmp.h     1044767195      1000991730
-./include/stdlib.h     1044767195      1000991730
-./include/string.h     1044767195      1002620217
-./include/swab.h       1044767195      1000991730
-./include/types.h      1044767195      1000991730
-./include/yaboot.h     1044767195      1007200690
-./include/debug.h      1044767194      1007200690
-./include      1044768386      1007269244
-./second/.arch-ids/fs_xfs.c.id 1044767196      1017069120
-./second/.arch-ids/=id 1044767196      1017027166
-./second/.arch-ids/cache.S.id  1044767196      1017027167
-./second/.arch-ids/cfg.c.id    1044767196      1017027167
-./second/.arch-ids/cmdline.c.id        1044767196      1017027167
-./second/.arch-ids/crt0.S.id   1044767196      1017027167
-./second/.arch-ids/file.c.id   1044767196      1017027167
-./second/.arch-ids/fs.c.id     1044767196      1017027168
-./second/.arch-ids/fs_ext2.c.id        1044767196      1017027168
-./second/.arch-ids/fs_iso.c.id 1044767196      1017027168
-./second/.arch-ids/fs_of.c.id  1044767196      1017027168
-./second/.arch-ids/fs_reiserfs.c.id    1044767196      1017027169
-./second/.arch-ids/iso_util.c.id       1044767197      1017027170
-./second/.arch-ids/md5.c.id    1044767197      1017027170
-./second/.arch-ids/partition.c.id      1044767197      1017027170
-./second/.arch-ids/prom.c.id   1044767197      1017027170
-./second/.arch-ids/setjmp.S.id 1044767197      1017027171
-./second/.arch-ids/yaboot.c.id 1044767197      1017027171
-./second/.arch-ids     1044768386      1017069120
-./second/fs_xfs.c      1044767197      1032059541
-./second/cache.S       1044767197      1007200690
-./second/cfg.c 1044767197      1007200690
-./second/cmdline.c     1044767197      1032059589
-./second/crt0.S        1044767197      1000991731
-./second/file.c        1044767197      1032059581
-./second/fs.c  1044767197      1032059574
-./second/fs_ext2.c     1044767197      1032059564
-./second/fs_iso.c      1044767197      1007200690
-./second/fs_of.c       1044767197      1032059553
-./second/fs_reiserfs.c 1044767197      1007200690
-./second/iso_util.c    1044767197      1003656415
-./second/md5.c 1044767197      1032059532
-./second/partition.c   1044767197      1032059525
-./second/prom.c        1044767197      1032059515
-./second/setjmp.S      1044767197      1000991732
-./second/yaboot.c      1044767197      1032059504
-./second       1044768386      1037576162
-./.arch-ids/Config.id  1044767192      1017069133
-./.arch-ids/0arch-timestamps0.id       1044767192      1020516949
-./.arch-ids/ChangeLog.id       1044767192      1017026820
-./.arch-ids/BUGS.id    1044767192      1017027147
-./.arch-ids/COPYING.id 1044767192      1017027147
-./.arch-ids/INSTALL.id 1044767192      1017027147
-./.arch-ids/Makefile.id        1044767192      1017027148
-./.arch-ids/README.id  1044767192      1017027148
-./.arch-ids/README.man.patch.id        1044767192      1017027148
-./.arch-ids/THANKS.id  1044767192      1017027148
-./.arch-ids/TODO.id    1044767192      1017027149
-./.arch-ids/changelog.id       1044767192      1017027149
-./.arch-ids/man.patch.id       1044767192      1017027166
-./.arch-ids    1044768386      1020516949
-./doc/.arch-ids/=id    1044767192      1017027149
-./doc/.arch-ids/README.ofboot.id       1044767192      1017027149
-./doc/.arch-ids/README.ofpath.id       1044767192      1017027149
-./doc/.arch-ids/README.rs6000.id       1044767192      1017027150
-./doc/.arch-ids/Makefile.id    1044767192      1017235762
-./doc/.arch-ids/yaboot-howto.sgml.id   1044767192      1017235765
-./doc/.arch-ids/yaboot-howto.de.sgml.id        1044767192      1017238100
-./doc/.arch-ids        1044768386      1017238100
-./doc/examples/.arch-ids/=id   1044767193      1017027150
-./doc/examples/.arch-ids/README.dualboot.chrp.id       1044767193      1017027150
-./doc/examples/.arch-ids/README.mbicons.id     1044767193      1017027150
-./doc/examples/.arch-ids/README.simpleboot.chrp.id     1044767193      1017027150
-./doc/examples/.arch-ids/dualboot.chrp.id      1044767193      1017027151
-./doc/examples/.arch-ids/large-penguin.mbicon.id       1044767193      1017027151
-./doc/examples/.arch-ids/simpleboot.chrp.id    1044767193      1017027151
-./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1044767193      1017027151
-./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1044767193      1017027152
-./doc/examples/.arch-ids       1044768386      1017236175
-./doc/examples/README.dualboot.chrp    1044767193      1000991730
-./doc/examples/README.mbicons  1044767193      1000991730
-./doc/examples/README.simpleboot.chrp  1044767193      1000991730
-./doc/examples/dualboot.chrp   1044767193      1044766918
-./doc/examples/large-penguin.mbicon    1044767193      1000991730
-./doc/examples/simpleboot.chrp 1044767193      1044766860
-./doc/examples/yaboot.conf.multi-boot  1044767193      1006348765
-./doc/examples/yaboot.conf.rs6000      1044767193      1006348765
-./doc/examples 1044768386      1044766918
-./doc/README.ofboot    1044767193      1000991730
-./doc/README.ofpath    1044767193      1000991730
-./doc/README.rs6000    1044767193      1007200689
-./doc/Makefile 1044767192      1019310768
-./doc/yaboot-howto.sgml        1044767193      1032059987
-./doc/yaboot-howto.de.sgml     1044767193      1032059970
-./doc  1044768386      1032059987
-./etc/.arch-ids/=id    1044767193      1017027152
-./etc/.arch-ids/yaboot.conf.id 1044767193      1017027152
-./etc/.arch-ids        1044768386      1017027152
-./etc/yaboot.conf      1044767193      1006348765
-./etc  1044768386      1007269243
-./first/.arch-ids/=id  1044767193      1017027152
-./first/.arch-ids/ofboot.id    1044767193      1017027152
-./first/.arch-ids      1044768386      1017027152
-./first/ofboot 1044767193      1044766440
-./first        1044768386      1044766440
-./lib/.arch-ids/=id    1044767195      1017027162
-./lib/.arch-ids/ctype.c.id     1044767195      1017027163
-./lib/.arch-ids/libext2fs.a.id 1044767195      1017027163
-./lib/.arch-ids/malloc.c.id    1044767195      1017027163
-./lib/.arch-ids/nosys.c.id     1044767195      1017027163
-./lib/.arch-ids/string.S.id    1044767195      1017027163
-./lib/.arch-ids/strstr.c.id    1044767195      1017027164
-./lib/.arch-ids/strtol.c.id    1044767196      1017027164
-./lib/.arch-ids/vsprintf.c.id  1044767196      1017027164
-./lib/.arch-ids        1044768386      1017027164
-./lib/ctype.c  1044767196      1000991731
-./lib/libext2fs.a      1044767196      1003927524
-./lib/malloc.c 1044767196      1007200690
-./lib/nosys.c  1044767196      1000991731
-./lib/string.S 1044767196      1007200690
-./lib/strstr.c 1044767196      1000991731
-./lib/strtol.c 1044767196      1000991731
-./lib/vsprintf.c       1044767196      1000991731
-./lib  1044768386      1037576162
-./man/.arch-ids/=id    1044767196      1017027164
-./man/.arch-ids/bootstrap.8.id 1044767196      1017027165
-./man/.arch-ids/mkofboot.8.id  1044767196      1017027165
-./man/.arch-ids/ofpath.8.id    1044767196      1017027165
-./man/.arch-ids/yaboot.8.id    1044767196      1017027165
-./man/.arch-ids/yaboot.conf.5.id       1044767196      1017027166
-./man/.arch-ids/yabootconfig.8.id      1044767196      1017027166
-./man/.arch-ids/ybin.8.id      1044767196      1017027166
-./man/.arch-ids        1044768386      1017027166
-./man/bootstrap.8      1044767196      1000991731
-./man/mkofboot.8       1044767196      1006348765
-./man/ofpath.8 1044767196      1000991731
-./man/yaboot.8 1044767196      1006348765
-./man/yaboot.conf.5    1044767196      1004256691
-./man/yabootconfig.8   1044767196      1027929577
-./man/ybin.8   1044767196      1006348765
-./man  1044768386      1027929577
-./util/.arch-ids/=id   1044767197      1017027171
-./util/.arch-ids/addnote.c.id  1044767197      1017027171
-./util/.arch-ids/elfextract.c.id       1044767197      1017027172
-./util/.arch-ids       1044768386      1017027172
-./util/addnote.c       1044767197      1007200691
-./util/elfextract.c    1044767197      1007303237
-./util 1044768386      1037576162
-./ybin/.arch-ids/=id   1044767197      1017027172
-./ybin/.arch-ids/mkofboot.id   1044767197      1017027172
-./ybin/.arch-ids/ofpath.id     1044767197      1017027172
-./ybin/.arch-ids/yabootconfig.id       1044767197      1017027172
-./ybin/.arch-ids/ybin.id       1044767197      1017027173
-./ybin/.arch-ids       1044768386      1017027173
-./ybin/ofpath  1044767198      1044766402
-./ybin/yabootconfig    1044767198      1044766426
-./ybin/ybin    1044768368      1044768375
-./ybin/mkofboot        1044767197      1037576159
-./ybin 1044768386      1044768375
-./Config       1044768379      1002101497
-./0arch-timestamps0    1044767192      1044768386
-./ChangeLog    1044767192      1039508063
-./BUGS 1044767192      1000991730
-./COPYING      1044767192      1000991730
-./INSTALL      1044767192      1000991730
-./README       1044767192      1044766458
-./README.man.patch     1044767192      1000991730
-./THANKS       1044767192      1006350263
-./TODO 1044767192      1044766566
-./changelog    1044767192      1044766831
-./man.patch    1044767196      1006348761
-./Makefile     1044768379      1044768365
-.      1044768386      1044768380
+./include/xfs/.arch-ids/=id    1044870709      1017069090
+./include/xfs/.arch-ids/xfs.h.id       1044870709      1017069096
+./include/xfs/.arch-ids        1044870764      1017069096
+./include/xfs/xfs.h    1044870709      1002101334
+./include/xfs  1044870764      1007269244
+./include/.arch-ids/errors.h.id        1044870707      1017069108
+./include/.arch-ids/=id        1044870707      1017027153
+./include/.arch-ids/bootinfo.h.id      1044870707      1017027154
+./include/.arch-ids/byteorder.h.id     1044870707      1017027154
+./include/.arch-ids/cfg.h.id   1044870707      1017027154
+./include/.arch-ids/cmdline.h.id       1044870707      1017027154
+./include/.arch-ids/ctype.h.id 1044870707      1017027155
+./include/.arch-ids/fdisk-part.h.id    1044870707      1017027157
+./include/.arch-ids/file.h.id  1044870707      1017027157
+./include/.arch-ids/fs.h.id    1044870707      1017027157
+./include/.arch-ids/mac-part.h.id      1044870707      1017027159
+./include/.arch-ids/md5.h.id   1044870707      1017027159
+./include/.arch-ids/partition.h.id     1044870707      1017027159
+./include/.arch-ids/prom.h.id  1044870707      1017027159
+./include/.arch-ids/setjm2.h.id        1044870707      1017027160
+./include/.arch-ids/setjmp.h.id        1044870707      1017027160
+./include/.arch-ids/stdlib.h.id        1044870707      1017027161
+./include/.arch-ids/string.h.id        1044870708      1017027161
+./include/.arch-ids/swab.h.id  1044870708      1017027161
+./include/.arch-ids/types.h.id 1044870708      1017027162
+./include/.arch-ids/yaboot.h.id        1044870708      1017027162
+./include/.arch-ids/debug.h.id 1044870707      1017154770
+./include/.arch-ids    1044870764      1017154770
+./include/asm/.arch-ids/=id    1044870708      1017027153
+./include/asm/.arch-ids/elf.h.id       1044870708      1017027153
+./include/asm/.arch-ids/ppc_asm.tmpl.id        1044870708      1017027153
+./include/asm/.arch-ids/processor.h.id 1044870708      1017027154
+./include/asm/.arch-ids        1044870764      1017027154
+./include/asm/elf.h    1044870708      1000991730
+./include/asm/ppc_asm.tmpl     1044870708      1000991730
+./include/asm/processor.h      1044870708      1000991730
+./include/asm  1044870764      1007269243
+./include/et/.arch-ids/=id     1044870708      1017027155
+./include/et/.arch-ids/com_err.h.id    1044870708      1017027155
+./include/et/.arch-ids 1044870764      1017155400
+./include/et/com_err.h 1044870708      1000991731
+./include/et   1044870764      1007269243
+./include/ext2fs/.arch-ids/=id 1044870708      1017027156
+./include/ext2fs/.arch-ids/bitops.h.id 1044870708      1017027156
+./include/ext2fs/.arch-ids/ext2_err.h.id       1044870708      1017027156
+./include/ext2fs/.arch-ids/ext2_io.h.id        1044870708      1017027156
+./include/ext2fs/.arch-ids/ext2fs.h.id 1044870708      1017027156
+./include/ext2fs/.arch-ids     1044870764      1017027156
+./include/ext2fs/bitops.h      1044870708      1003927524
+./include/ext2fs/ext2_err.h    1044870708      1003927524
+./include/ext2fs/ext2_io.h     1044870708      1003927524
+./include/ext2fs/ext2fs.h      1044870708      1003927524
+./include/ext2fs       1044870764      1007269243
+./include/linux/.arch-ids/=id  1044870708      1017027157
+./include/linux/.arch-ids/elf.h.id     1044870708      1017027158
+./include/linux/.arch-ids/ext2_fs.h.id 1044870708      1017027158
+./include/linux/.arch-ids/iso_fs.h.id  1044870708      1017027158
+./include/linux/.arch-ids/stat.h.id    1044870708      1017027158
+./include/linux/.arch-ids/types.h.id   1044870708      1017027159
+./include/linux/.arch-ids      1044870764      1017027159
+./include/linux/elf.h  1044870708      1000991731
+./include/linux/ext2_fs.h      1044870708      1000991731
+./include/linux/iso_fs.h       1044870708      1000991731
+./include/linux/stat.h 1044870708      1000991731
+./include/linux/types.h        1044870708      1000991731
+./include/linux        1044870764      1007269243
+./include/reiserfs/.arch-ids/=id       1044870709      1017027160
+./include/reiserfs/.arch-ids/reiserfs.h.id     1044870709      1017027160
+./include/reiserfs/.arch-ids   1044870764      1017027160
+./include/reiserfs/reiserfs.h  1044870709      1025684115
+./include/reiserfs     1044870764      1025684115
+./include/errors.h     1044870708      1007200690
+./include/bootinfo.h   1044870708      1007200690
+./include/byteorder.h  1044870708      1000991730
+./include/cfg.h        1044870708      1007200690
+./include/cmdline.h    1044870708      1007200690
+./include/ctype.h      1044870708      1003656411
+./include/fdisk-part.h 1044870708      1007200690
+./include/file.h       1044870708      1007200690
+./include/fs.h 1044870708      1007200690
+./include/mac-part.h   1044870709      1007200690
+./include/md5.h        1044870709      1000991730
+./include/partition.h  1044870709      1007200690
+./include/prom.h       1044870709      1007200690
+./include/setjm2.h     1044870709      1000991730
+./include/setjmp.h     1044870709      1000991730
+./include/stdlib.h     1044870709      1000991730
+./include/string.h     1044870709      1002620217
+./include/swab.h       1044870709      1000991730
+./include/types.h      1044870709      1000991730
+./include/yaboot.h     1044870709      1007200690
+./include/debug.h      1044870708      1007200690
+./include      1044870764      1007269244
+./second/.arch-ids/fs_xfs.c.id 1044870710      1017069120
+./second/.arch-ids/=id 1044870710      1017027166
+./second/.arch-ids/cache.S.id  1044870710      1017027167
+./second/.arch-ids/cfg.c.id    1044870710      1017027167
+./second/.arch-ids/cmdline.c.id        1044870710      1017027167
+./second/.arch-ids/crt0.S.id   1044870710      1017027167
+./second/.arch-ids/file.c.id   1044870710      1017027167
+./second/.arch-ids/fs.c.id     1044870710      1017027168
+./second/.arch-ids/fs_ext2.c.id        1044870710      1017027168
+./second/.arch-ids/fs_iso.c.id 1044870710      1017027168
+./second/.arch-ids/fs_of.c.id  1044870710      1017027168
+./second/.arch-ids/fs_reiserfs.c.id    1044870710      1017027169
+./second/.arch-ids/iso_util.c.id       1044870710      1017027170
+./second/.arch-ids/md5.c.id    1044870710      1017027170
+./second/.arch-ids/partition.c.id      1044870710      1017027170
+./second/.arch-ids/prom.c.id   1044870710      1017027170
+./second/.arch-ids/setjmp.S.id 1044870710      1017027171
+./second/.arch-ids/yaboot.c.id 1044870710      1017027171
+./second/.arch-ids     1044870764      1017069120
+./second/fs_xfs.c      1044870710      1032059541
+./second/cache.S       1044870710      1007200690
+./second/cfg.c 1044870710      1007200690
+./second/cmdline.c     1044870710      1032059589
+./second/crt0.S        1044870710      1000991731
+./second/fs.c  1044870710      1032059574
+./second/fs_ext2.c     1044870710      1032059564
+./second/fs_iso.c      1044870710      1007200690
+./second/fs_of.c       1044870710      1032059553
+./second/fs_reiserfs.c 1044870710      1007200690
+./second/iso_util.c    1044870710      1003656415
+./second/md5.c 1044870711      1032059532
+./second/partition.c   1044870711      1032059525
+./second/prom.c        1044870711      1032059515
+./second/setjmp.S      1044870711      1000991732
+./second/yaboot.c      1044870711      1032059504
+./second/file.c        1044870710      1044868693
+./second       1044870764      1044870683
+./.arch-ids/Config.id  1044870705      1017069133
+./.arch-ids/0arch-timestamps0.id       1044870705      1020516949
+./.arch-ids/ChangeLog.id       1044870705      1017026820
+./.arch-ids/BUGS.id    1044870705      1017027147
+./.arch-ids/COPYING.id 1044870705      1017027147
+./.arch-ids/INSTALL.id 1044870705      1017027147
+./.arch-ids/Makefile.id        1044870705      1017027148
+./.arch-ids/README.id  1044870705      1017027148
+./.arch-ids/README.man.patch.id        1044870705      1017027148
+./.arch-ids/THANKS.id  1044870706      1017027148
+./.arch-ids/TODO.id    1044870706      1017027149
+./.arch-ids/changelog.id       1044870706      1017027149
+./.arch-ids/man.patch.id       1044870706      1017027166
+./.arch-ids    1044870764      1020516949
+./doc/.arch-ids/=id    1044870706      1017027149
+./doc/.arch-ids/README.ofboot.id       1044870706      1017027149
+./doc/.arch-ids/README.ofpath.id       1044870706      1017027149
+./doc/.arch-ids/README.rs6000.id       1044870706      1017027150
+./doc/.arch-ids/Makefile.id    1044870706      1017235762
+./doc/.arch-ids/yaboot-howto.sgml.id   1044870706      1017235765
+./doc/.arch-ids/yaboot-howto.de.sgml.id        1044870706      1017238100
+./doc/.arch-ids        1044870764      1017238100
+./doc/examples/.arch-ids/=id   1044870706      1017027150
+./doc/examples/.arch-ids/README.dualboot.chrp.id       1044870706      1017027150
+./doc/examples/.arch-ids/README.mbicons.id     1044870706      1017027150
+./doc/examples/.arch-ids/README.simpleboot.chrp.id     1044870706      1017027150
+./doc/examples/.arch-ids/dualboot.chrp.id      1044870706      1017027151
+./doc/examples/.arch-ids/large-penguin.mbicon.id       1044870706      1017027151
+./doc/examples/.arch-ids/simpleboot.chrp.id    1044870707      1017027151
+./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1044870707      1017027151
+./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1044870707      1017027152
+./doc/examples/.arch-ids       1044870764      1017236175
+./doc/examples/README.dualboot.chrp    1044870707      1000991730
+./doc/examples/README.mbicons  1044870707      1000991730
+./doc/examples/README.simpleboot.chrp  1044870707      1000991730
+./doc/examples/dualboot.chrp   1044870707      1044766918
+./doc/examples/large-penguin.mbicon    1044870707      1000991730
+./doc/examples/simpleboot.chrp 1044870707      1044766860
+./doc/examples/yaboot.conf.multi-boot  1044870707      1006348765
+./doc/examples/yaboot.conf.rs6000      1044870707      1006348765
+./doc/examples 1044870764      1044766918
+./doc/README.ofboot    1044870706      1000991730
+./doc/README.ofpath    1044870706      1000991730
+./doc/README.rs6000    1044870706      1007200689
+./doc/Makefile 1044870706      1019310768
+./doc/yaboot-howto.sgml        1044870707      1032059987
+./doc/yaboot-howto.de.sgml     1044870707      1032059970
+./doc  1044870764      1032059987
+./etc/.arch-ids/=id    1044870707      1017027152
+./etc/.arch-ids/yaboot.conf.id 1044870707      1017027152
+./etc/.arch-ids        1044870764      1017027152
+./etc/yaboot.conf      1044870707      1006348765
+./etc  1044870764      1007269243
+./first/.arch-ids/=id  1044870707      1017027152
+./first/.arch-ids/ofboot.id    1044870707      1017027152
+./first/.arch-ids      1044870764      1017027152
+./first/ofboot 1044870707      1044766440
+./first        1044870764      1044766440
+./lib/.arch-ids/=id    1044870709      1017027162
+./lib/.arch-ids/ctype.c.id     1044870709      1017027163
+./lib/.arch-ids/libext2fs.a.id 1044870709      1017027163
+./lib/.arch-ids/malloc.c.id    1044870709      1017027163
+./lib/.arch-ids/nosys.c.id     1044870709      1017027163
+./lib/.arch-ids/string.S.id    1044870709      1017027163
+./lib/.arch-ids/strstr.c.id    1044870709      1017027164
+./lib/.arch-ids/strtol.c.id    1044870709      1017027164
+./lib/.arch-ids/vsprintf.c.id  1044870709      1017027164
+./lib/.arch-ids        1044870764      1017027164
+./lib/ctype.c  1044870709      1000991731
+./lib/libext2fs.a      1044870709      1003927524
+./lib/malloc.c 1044870709      1007200690
+./lib/nosys.c  1044870709      1000991731
+./lib/string.S 1044870709      1007200690
+./lib/strstr.c 1044870709      1000991731
+./lib/strtol.c 1044870709      1000991731
+./lib/vsprintf.c       1044870709      1000991731
+./lib  1044870764      1044870683
+./man/.arch-ids/=id    1044870709      1017027164
+./man/.arch-ids/bootstrap.8.id 1044870709      1017027165
+./man/.arch-ids/mkofboot.8.id  1044870709      1017027165
+./man/.arch-ids/ofpath.8.id    1044870709      1017027165
+./man/.arch-ids/yaboot.8.id    1044870709      1017027165
+./man/.arch-ids/yaboot.conf.5.id       1044870710      1017027166
+./man/.arch-ids/yabootconfig.8.id      1044870710      1017027166
+./man/.arch-ids/ybin.8.id      1044870710      1017027166
+./man/.arch-ids        1044870764      1017027166
+./man/bootstrap.8      1044870710      1000991731
+./man/mkofboot.8       1044870710      1006348765
+./man/ofpath.8 1044870710      1000991731
+./man/yaboot.8 1044870710      1006348765
+./man/yaboot.conf.5    1044870710      1004256691
+./man/yabootconfig.8   1044870710      1027929577
+./man/ybin.8   1044870710      1006348765
+./man  1044870764      1027929577
+./util/.arch-ids/=id   1044870711      1017027171
+./util/.arch-ids/addnote.c.id  1044870711      1017027171
+./util/.arch-ids/elfextract.c.id       1044870711      1017027172
+./util/.arch-ids       1044870764      1017027172
+./util/addnote.c       1044870711      1007200691
+./util/elfextract.c    1044870711      1007303237
+./util 1044870764      1044870683
+./ybin/.arch-ids/=id   1044870711      1017027172
+./ybin/.arch-ids/mkofboot.id   1044870711      1017027172
+./ybin/.arch-ids/ofpath.id     1044870711      1017027172
+./ybin/.arch-ids/yabootconfig.id       1044870711      1017027172
+./ybin/.arch-ids/ybin.id       1044870711      1017027173
+./ybin/.arch-ids       1044870764      1017027173
+./ybin/ofpath  1044870711      1044766402
+./ybin/yabootconfig    1044870711      1044766426
+./ybin/ybin    1044870737      1037576159
+./ybin/mkofboot        1044870762      1044870737
+./ybin 1044870764      1044870737
+./Config       1044870760      1002101497
+./0arch-timestamps0    1044870706      1044870764
+./ChangeLog    1044870706      1039508063
+./BUGS 1044870706      1000991730
+./COPYING      1044870706      1000991730
+./INSTALL      1044870706      1000991730
+./README       1044870706      1044766458
+./README.man.patch     1044870706      1000991730
+./THANKS       1044870706      1006350263
+./TODO 1044870706      1044766566
+./changelog    1044870706      1044766831
+./man.patch    1044870709      1006348761
+./Makefile     1044870760      1044768365
+.      1044870764      1044870760

diff --git a/ChangeLog b/ChangeLog
index b859d384a8b4b2f5f1370171c1de0b815bda7974..8087755fe49fa029ef347fee0b7684da42bf4e9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2003-02-10 09:55:05 GMT        Ethan Benson <erbenson@alaska.net>      patch-48
+
+    Summary:
+      Fix botched IBM patch (multiple partition handling on rs6k)
+    Revision:
+      yaboot--devel--1.3--patch-48
+
+    * IBM file.c patch is broken, fix file.c so yaboot finds its config on
+      systems with more then one primary GNU/Linux filesystem partition.
+
+    modified files:
+     0arch-timestamps0 ChangeLog second/file.c
+
+
 2003-02-09 05:28:41 GMT        Ethan Benson <erbenson@alaska.net>      patch-47
 
     Summary:

diff --git a/second/file.c b/second/file.c
index da66de6a121df892424c2b04394611ad78d73fba..b5763a235f6d5db62ad5fb1b4c92254b89775270 100644 (file)
--- a/second/file.c
+++ b/second/file.c
@@ -166,8 +166,12 @@ file_block_open(   struct boot_file_t*     file,
                  p->part_number, p->part_start, p->part_size );
          if (partition == -1) {
               file->fs = fs_open( file, dev_name, p, file_name );
-              if (file->fs != FILE_ERR_OK)
-                   goto bail;
+              if (file->fs == NULL || fserrorno != FILE_ERR_OK)
+                   continue;
+              else {
+                   partition = p->part_number;
+                   goto done;
+              }
          }
          if ((partition >= 0) && (partition == p->part_number))
               found = p;
@@ -183,7 +187,7 @@ file_block_open(    struct boot_file_t*     file,
      DEBUG_F( "Using OF defaults.. (found = %p)\n", found );
      file->fs = fs_open( file, dev_name, found, file_name );
 
-bail:
+done:
      if (parts)
          partitions_free(parts);