Index: ChangeLog =================================================================== RCS file: /sources/grub/grub/ChangeLog,v retrieving revision 1.627 retrieving revision 1.647 diff -u -p -u -r1.627 -r1.647 --- foo/ChangeLog 8 May 2005 02:51:51 -0000 1.627 +++ foo/ChangeLog 20 May 2008 11:04:17 -0000 1.647 @@ -1,3 +1,127 @@ +2008-05-20 Robert Millan + + * netboot/cs89x0.c: Fix license violation. + * netboot/cs89x0.h: Likewise. + +2008-04-10 Pavel Roskin + + * configure.ac: Always use "_cv_" in cache variables for + compatibility with Autoconf 2.62. + +2008-03-28 Robert Millan + + Surpass 1 TiB disk addressing limit. Note: there are no plans to handle + the 2 TiB disk limit in GRUB Legacy, since that would need considerable + rework. If you have >2TiB disks, use GRUB 2 instead. + + * grub/asmstub.c (biosdisk): Add unsigned qualifier to `sector'. + * stage2/bios.c (biosdisk): Likewise. + * stage2/disk_io.c (rawread, devread, rawwrite, devwrite): Likewise. + * stage2/shared.h (rawread, devread, rawwrite, devwrite): Likewise. + * lib/device.c (get_drive_geometry): Replace BLKGETSIZE with + BLKGETSIZE64. + +2007-10-29 Pavel Roskin + + * configure.ac: Test if '--build-id=none' is supported by the + linker and add it to LDFLAGS if possible. Build ID causes + objcopy to generate huge binary files. + * aclocal.m4 (grub_PROG_OBJCOPY_ABSOLUTE): Use LDFLAGS when + linking, so that build ID doesn't break the test. + * stage1/Makefile.am: Preserve LDFLAGS, use stage1_exec_LDFLAGS. + +2007-02-22 Pavel Roskin + + * stage2/iso9660.h: Remove unnecessary packed attributes. + +2007-02-22 Robert Millan + + * util/mkbimage: Update my email address, and remove my name from + some places where unnecessary credit is given. + +2006-09-10 Pavel Roskin + + * netboot/natsemi.c: Fix compile error with gcc 4.1.1. Cast + cannot make a variable volatile - it should be declared as such. + * netboot/sis900.c: Likewise. + +2006-09-08 Pavel Roskin + + * netboot/etherboot.h: Remove incorrect extern declarations of + the variables later declared static. Move BOOTP_DATA_ADDR ... + * netboot/main.c: ... here. Eliminate end_of_rfc1533 - it's + write-only. + +2006-06-24 Yoshinori K. Okuji + + * docs/grub.texi: Changed the license term to the GNU Free + Documentation License 1.2. + + * docs/multiboot.texi: Reformatted to show the license term + and the version number explicitly. + + * docs/fdl.texi: New file. + + * docs/Makefile.am (grub_TEXINFOS): Added fdl.texi. + +2006-06-24 Robert Millan + + * lib/device.c (write_to_partition): /dev/ataraid/ and /dev/rd/ + partitions have a "p" prefix. Add it. + +2006-06-24 Robert Millan + + * lib/device.c (get_i2o_disk_name): New function. + (init_device_map) [__linux__]: Add support for I2O devices. + +2006-05-02 Pavel Roskin + + * stage2/stage2.c (run_menu): Fix "savedefault" to save only top + level menu positions. Remember current position when calling a + submenu. Don't recalculate it when booting from a submenu. + + * grub/main.c (main): Make sure the boot drive number doesn't + exceed 255. + +2006-05-02 Vesa Jaaskelainen + + * stage2/shared.h (vbe_mode): Back ported aligment fix from GRUB 2 + to GRUB Legacy. Problem reported by Gerardo Richarte. + +2006-04-23 Robert Millan + + * grub/asmstub.c (get_diskinfo): Optimize sysctl routine. + +2006-04-20 Robert Millan + + Fixes for kernel of FreeBSD: + * grub/asmstub.c (get_diskinfo): Toggle "kern.geom.debugflags" sysctl + before opening a device for writing. + * util/grub-install.in: Devices don't have this "r" prefix anymore. + +2006-04-16 Yoshinori K. Okuji + + * docs/multiboot.texi: Correct the offset of address + fields. Reported by Jeroen Dekkers. + +2006-03-21 Yoshinori K. Okuji + + * stage2/builtins.c (setup_func): Specify the size of DEVICE to + grub_strncat instead of a strange number 256. Reported by Vitaly + Fertman . + +2005-09-29 Yoshinori K. Okuji + + * docs/multiboot.texi: Fix a bug in the byte order of + boot_device. I hope this won't affect any OS image. + Increased the version number to 0.6.94. + +2005-09-28 Yoshinori K. Okuji + + * stage2/boot.c (load_image): Even if an OS image is an ELF + object, use the a.out kludge if MULTIBOOT_AOUT_KLUDGE is + specified. + 2005-05-08 Yoshinori K. Okuji * configure.ac (AC_INIT): Upgraded to 0.97. Index: THANKS =================================================================== RCS file: /sources/grub/grub/THANKS,v retrieving revision 1.100 retrieving revision 1.101 diff -u -p -u -r1.100 -r1.101 --- foo/THANKS 8 May 2005 02:18:14 -0000 1.100 +++ foo/THANKS 21 Mar 2006 20:51:58 -0000 1.101 @@ -121,3 +121,4 @@ Vesa Jaaskelainen Yury V. Umanets Yuri Zaporogets +Vitaly Fertman Index: acinclude.m4 =================================================================== RCS file: /sources/grub/grub/acinclude.m4,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -u -r1.21 -r1.22 --- foo/acinclude.m4 23 Apr 2004 13:39:01 -0000 1.21 +++ foo/acinclude.m4 5 Nov 2007 01:29:46 -0000 1.22 @@ -57,7 +57,7 @@ else fi grub_cv_prog_objcopy_absolute=yes for link_addr in 2000 8000 7C00; do - if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then : + if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} ${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then : else AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr]) fi Index: configure.ac =================================================================== RCS file: /sources/grub/grub/configure.ac,v retrieving revision 1.9 retrieving revision 1.11 diff -u -p -u -r1.9 -r1.11 --- foo/configure.ac 8 May 2005 02:51:51 -0000 1.9 +++ foo/configure.ac 10 Apr 2008 22:26:50 -0000 1.11 @@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then fi STAGE1_CFLAGS="-O2" GRUB_CFLAGS="-O2" - AC_CACHE_CHECK([whether optimization for size works], size_flag, [ + AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [ saved_CFLAGS=$CFLAGS CFLAGS="-Os -g" - AC_TRY_COMPILE(, , size_flag=yes, size_flag=no) + AC_TRY_COMPILE(, , grub_cv_cc_Os=yes, grub_cv_cc_Os=no) CFLAGS=$saved_CFLAGS ]) - if test "x$size_flag" = xyes; then + if test "x$grub_cv_cc_Os" = xyes; then STAGE2_CFLAGS="-Os" else STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops" @@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then # OpenBSD has a GCC extension for protecting applications from # stack smashing attacks, but GRUB doesn't want this feature. AC_CACHE_CHECK([whether gcc has -fno-stack-protector], - no_stack_protector_flag, [ + grub_cv_cc_no_stack_protector, [ saved_CFLAGS=$CFLAGS CFLAGS="-fno-stack-protector" AC_TRY_COMPILE(, , - no_stack_protector_flag=yes, - no_stack_protector_flag=no) + grub_cv_cc_no_stack_protector=yes, + grub_cv_cc_no_stack_protector=no) CFLAGS=$saved_CFLAGS ]) - if test "x$no_stack_protector_flag" = xyes; then + if test "x$grub_cv_cc_no_stack_protector" = xyes; then STAGE2_CFLAGS="$STAGE2_CFLAGS -fno-stack-protector" fi fi @@ -123,33 +123,44 @@ AC_SUBST(GRUB_CFLAGS) CPPFLAGS="$CPPFLAGS -Wall -Wmissing-prototypes -Wunused -Wshadow" CPPFLAGS="$CPPFLAGS -Wpointer-arith" -AC_CACHE_CHECK([whether -Wundef works], undef_flag, [ +AC_CACHE_CHECK([whether -Wundef works], grub_cv_cc_Wundef, [ saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-Wundef" - AC_TRY_COMPILE(, , undef_flag=yes, undef_flag=no) + AC_TRY_COMPILE(, , grub_cv_cc_Wundef=yes, grub_cv_cc_Wundef=no) CPPFLAGS="$saved_CPPFLAGS" ]) # The options `-falign-*' are supported by gcc 3.0 or later. # Probably it is sufficient to only check for -falign-loops. -AC_CACHE_CHECK([whether -falign-loops works], [falign_loop_flag], [ +AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [ saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="-falign-loops=1" - AC_TRY_COMPILE(, , [falign_loop_flag=yes], [falign_loop_flag=no]) + AC_TRY_COMPILE(, , [grub_cv_cc_falign_loop=yes], [grub_cv_cc_falign_loop=no]) CPPFLAGS="$saved_CPPFLAGS" ]) # Force no alignment to save space. -if test "x$falign_loop_flag" = xyes; then +if test "x$grub_cv_cc_falign_loop" = xyes; then CPPFLAGS="$CPPFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1" else CPPFLAGS="$CPPFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1" fi -if test "x$undef_flag" = xyes; then +if test "x$grub_cv_cc_Wundef" = xyes; then CPPFLAGS="$CPPFLAGS -Wundef" fi +# Check if build ID can be disabled in the linker +AC_MSG_CHECKING([whether linker accepts `--build-id=none']) +save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS -Wl,--build-id=none" +AC_TRY_LINK(, , build_id_flag=yes, build_id_flag=no) +AC_MSG_RESULT([$build_id_flag]) +LDFLAGS="$save_LDFLAGS" +if test "x$build_id_flag" = xyes; then + LDFLAGS="$LDFLAGS -Wl,--build-id=none" +fi + if test "x$with_binutils" != x; then dnl AC_PATH_TOOL(OBJCOPY, objcopy, , "$with_binutils:$PATH") AC_PATH_PROG(OBJCOPY, objcopy, , "$with_binutils:$PATH") Index: docs/Makefile.am =================================================================== RCS file: /sources/grub/grub/docs/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -u -r1.25 -r1.26 --- foo/docs/Makefile.am 29 Nov 2002 20:39:23 -0000 1.25 +++ foo/docs/Makefile.am 24 Jun 2006 14:40:02 -0000 1.26 @@ -1,5 +1,5 @@ info_TEXINFOS = grub.texi multiboot.texi -grub_TEXINFOS = internals.texi +grub_TEXINFOS = internals.texi fdl.texi EXAMPLES = boot.S kernel.c multiboot.h multiboot_TEXINFOS = boot.S.texi kernel.c.texi multiboot.h.texi man_MANS = grub.8 mbchk.1 grub-install.8 grub-md5-crypt.8 grub-terminfo.8 Index: docs/fdl.texi =================================================================== RCS file: docs/fdl.texi diff -N docs/fdl.texi --- foo//dev/null 1 Jan 1970 00:00:00 -0000 +++ foo/docs/fdl.texi 24 Jun 2006 14:40:02 -0000 1.1 @@ -0,0 +1,452 @@ + +@node GNU Free Documentation License +@appendixsec GNU Free Documentation License + +@cindex FDL, GNU Free Documentation License +@center Version 1.2, November 2002 + +@display +Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. +51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. +@end display + +@enumerate 0 +@item +PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document @dfn{free} in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of ``copyleft'', which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + +@item +APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The ``Document'', below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as ``you''. You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A ``Modified Version'' of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A ``Secondary Section'' is a named appendix or a front-matter section +of the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The ``Invariant Sections'' are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The ``Cover Texts'' are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A ``Transparent'' copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not ``Transparent'' is called ``Opaque''. + +Examples of suitable formats for Transparent copies include plain +@sc{ascii} without markup, Texinfo input format, La@TeX{} input +format, @acronym{SGML} or @acronym{XML} using a publicly available +@acronym{DTD}, and standard-conforming simple @acronym{HTML}, +PostScript or @acronym{PDF} designed for human modification. Examples +of transparent image formats include @acronym{PNG}, @acronym{XCF} and +@acronym{JPG}. Opaque formats include proprietary formats that can be +read and edited only by proprietary word processors, @acronym{SGML} or +@acronym{XML} for which the @acronym{DTD} and/or processing tools are +not generally available, and the machine-generated @acronym{HTML}, +PostScript or @acronym{PDF} produced by some word processors for +output purposes only. + +The ``Title Page'' means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, ``Title Page'' means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +A section ``Entitled XYZ'' means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as ``Acknowledgements'', +``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title'' +of such a section when you modify the Document means that it remains a +section ``Entitled XYZ'' according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +@item +VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + +@item +COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + +@item +MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +@enumerate A +@item +Use in the Title Page (and on the covers, if any) a title distinct +from that of the Document, and from those of previous versions +(which should, if there were any, be listed in the History section +of the Document). You may use the same title as a previous version +if the original publisher of that version gives permission. + +@item +List on the Title Page, as authors, one or more persons or entities +responsible for authorship of the modifications in the Modified +Version, together with at least five of the principal authors of the +Document (all of its principal authors, if it has fewer than five), +unless they release you from this requirement. + +@item +State on the Title page the name of the publisher of the +Modified Version, as the publisher. + +@item +Preserve all the copyright notices of the Document. + +@item +Add an appropriate copyright notice for your modifications +adjacent to the other copyright notices. + +@item +Include, immediately after the copyright notices, a license notice +giving the public permission to use the Modified Version under the +terms of this License, in the form shown in the Addendum below. + +@item +Preserve in that license notice the full lists of Invariant Sections +and required Cover Texts given in the Document's license notice. + +@item +Include an unaltered copy of this License. + +@item +Preserve the section Entitled ``History'', Preserve its Title, and add +to it an item stating at least the title, year, new authors, and +publisher of the Modified Version as given on the Title Page. If +there is no section Entitled ``History'' in the Document, create one +stating the title, year, authors, and publisher of the Document as +given on its Title Page, then add an item describing the Modified +Version as stated in the previous sentence. + +@item +Preserve the network location, if any, given in the Document for +public access to a Transparent copy of the Document, and likewise +the network locations given in the Document for previous versions +it was based on. These may be placed in the ``History'' section. +You may omit a network location for a work that was published at +least four years before the Document itself, or if the original +publisher of the version it refers to gives permission. + +@item +For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve +the Title of the section, and preserve in the section all the +substance and tone of each of the contributor acknowledgements and/or +dedications given therein. + +@item +Preserve all the Invariant Sections of the Document, +unaltered in their text and in their titles. Section numbers +or the equivalent are not considered part of the section titles. + +@item +Delete any section Entitled ``Endorsements''. Such a section +may not be included in the Modified Version. + +@item +Do not retitle any existing section to be Entitled ``Endorsements'' or +to conflict in title with any Invariant Section. + +@item +Preserve any Warranty Disclaimers. +@end enumerate + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled ``Endorsements'', provided it contains +nothing but endorsements of your Modified Version by various +parties---for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + +@item +COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled ``History'' +in the various original documents, forming one section Entitled +``History''; likewise combine any sections Entitled ``Acknowledgements'', +and any sections Entitled ``Dedications''. You must delete all +sections Entitled ``Endorsements.'' + +@item +COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + +@item +AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an ``aggregate'' if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + +@item +TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled ``Acknowledgements'', +``Dedications'', or ``History'', the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + +@item +TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + +@item +FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +@uref{http://www.gnu.org/copyleft/}. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License ``or any later version'' applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. +@end enumerate + +@page +@appendixsubsec ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + +@smallexample +@group + Copyright (C) @var{year} @var{your name}. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled ``GNU + Free Documentation License''. +@end group +@end smallexample + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the ``with...Texts.'' line with this: + +@smallexample +@group + with the Invariant Sections being @var{list their titles}, with + the Front-Cover Texts being @var{list}, and with the Back-Cover Texts + being @var{list}. +@end group +@end smallexample + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. + +@c Local Variables: +@c ispell-local-pdict: "ispell-dict" +@c End: + Index: docs/grub-install.8 =================================================================== RCS file: /sources/grub/grub/docs/grub-install.8,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -u -r1.52 -r1.53 --- foo/docs/grub-install.8 8 May 2005 02:51:52 -0000 1.52 +++ foo/docs/grub-install.8 24 Jun 2006 14:40:02 -0000 1.53 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB-INSTALL "8" "May 2005" "grub-install (GNU GRUB 0.97)" FSF +.TH GRUB-INSTALL "8" "June 2006" "grub-install (GNU GRUB 0.97)" FSF .SH NAME grub-install \- install GRUB on your drive .SH SYNOPSIS Index: docs/grub-md5-crypt.8 =================================================================== RCS file: /sources/grub/grub/docs/grub-md5-crypt.8,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -u -r1.32 -r1.33 --- foo/docs/grub-md5-crypt.8 8 May 2005 02:51:52 -0000 1.32 +++ foo/docs/grub-md5-crypt.8 24 Jun 2006 14:40:02 -0000 1.33 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB-MD5-CRYPT "8" "May 2005" "grub-md5-crypt (GNU GRUB )" FSF +.TH GRUB-MD5-CRYPT "8" "June 2006" "grub-md5-crypt (GNU GRUB )" FSF .SH NAME grub-md5-crypt \- Encrypt a password in MD5 format .SH SYNOPSIS Index: docs/grub-terminfo.8 =================================================================== RCS file: /sources/grub/grub/docs/grub-terminfo.8,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -u -r1.12 -r1.13 --- foo/docs/grub-terminfo.8 8 May 2005 02:51:52 -0000 1.12 +++ foo/docs/grub-terminfo.8 24 Jun 2006 14:40:02 -0000 1.13 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB-TERMINFO "8" "May 2005" "grub-terminfo (GNU GRUB 0.97)" FSF +.TH GRUB-TERMINFO "8" "June 2006" "grub-terminfo (GNU GRUB 0.97)" FSF .SH NAME grub-terminfo \- Generate a terminfo command from a terminfo name .SH SYNOPSIS Index: docs/grub.8 =================================================================== RCS file: /sources/grub/grub/docs/grub.8,v retrieving revision 1.65 retrieving revision 1.67 diff -u -p -u -r1.65 -r1.67 --- foo/docs/grub.8 8 May 2005 02:51:52 -0000 1.65 +++ foo/docs/grub.8 24 Jun 2006 14:40:02 -0000 1.67 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH GRUB "8" "May 2005" "grub (GNU GRUB 0.97)" FSF +.TH GRUB "8" "June 2006" "grub (GNU GRUB 0.97)" FSF .SH NAME grub \- the grub shell .SH SYNOPSIS Index: docs/grub.texi =================================================================== RCS file: /sources/grub/grub/docs/grub.texi,v retrieving revision 1.84 retrieving revision 1.85 diff -u -p -u -r1.84 -r1.85 --- foo/docs/grub.texi 20 Sep 2004 21:55:00 -0000 1.84 +++ foo/docs/grub.texi 24 Jun 2006 14:40:02 -0000 1.85 @@ -2,22 +2,41 @@ @c -*-texinfo-*- @c %**start of header @setfilename grub.info -@settitle GRUB Manual -@c %**end of header - @include version.texi - +@settitle GNU GRUB Manual @value{VERSION} @c Unify all our little indices for now. @syncodeindex fn cp @syncodeindex vr cp @syncodeindex ky cp @syncodeindex pg cp @syncodeindex tp cp +@c %**end of header @footnotestyle separate @paragraphindent 3 @finalout +@copying +This manual is for GNU GRUB (version @value{VERSION}, +@value{UPDATED}). + +Copyright @copyright{} 1999,2000,2001,2002,2004,2006 Free Software Foundation, Inc. + +@quotation +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.2 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,'' +and with the Back-Cover Texts as in (a) below. A copy of the +license is included in the section entitled ``GNU Free Documentation +License.'' + +(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify +this GNU Manual, like GNU software. Copies published by the Free +Software Foundation raise funds for GNU development.'' +@end quotation +@end copying + @dircategory Kernel @direntry * GRUB: (grub). The GRand Unified Bootloader @@ -34,53 +53,16 @@ @setchapternewpage odd -@ifinfo -Copyright @copyright{} 1999,2000,2001,2002,2004 Free Software Foundation, Inc. - -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -@ignore -Permission is granted to process this file through TeX and print the -results, provided the printed document carries a copying permission -notice identical to this one except for the removal of this paragraph -(this paragraph not being relevant to the printed manual). - -@end ignore - -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided also that -the entire resulting derived work is distributed under the terms of a -permission notice identical to this one. - -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions. -@end ifinfo - @titlepage @sp 10 -@title the GRUB manual +@title the GNU GRUB manual @subtitle The GRand Unified Bootloader, version @value{VERSION}, @value{UPDATED}. @author Gordon Matzigkeit @author Yoshinori K. Okuji @c The following two commands start the copyright page. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1999,2000,2001,2002,2004 Free Software Foundation, Inc. - -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided that the entire -resulting derived work is distributed under the terms of a permission -notice identical to this one. - -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions, -except that this permission notice may be stated in a translation approved -by Free Software Foundation. +@insertcopying @end titlepage @c Output the table of contents at the beginning. @@ -91,12 +73,14 @@ by Free Software Foundation. @ifnottex @node Top -@top GRUB manual +@top GNU GRUB manual This is the documentation of GNU GRUB, the GRand Unified Bootloader, a flexible and powerful boot loader program for @sc{pc}s. This edition documents version @value{VERSION}. + +@insertcopying @end ifnottex @menu @@ -124,6 +108,7 @@ This edition documents version @value{VE * Reporting bugs:: Where you should send a bug report * Future:: Some future plans on GRUB * Internals:: Hacking GRUB +* Copying This Manual:: Copying This Manual * Index:: @end menu @@ -3965,6 +3950,16 @@ homepage}. @include internals.texi +@node Copying This Manual +@appendix Copying This Manual + +@menu +* GNU Free Documentation License:: License for copying this manual. +@end menu + +@include fdl.texi + + @node Index @unnumbered Index Index: docs/mbchk.1 =================================================================== RCS file: /sources/grub/grub/docs/mbchk.1,v retrieving revision 1.53 retrieving revision 1.54 diff -u -p -u -r1.53 -r1.54 --- foo/docs/mbchk.1 8 May 2005 02:51:52 -0000 1.53 +++ foo/docs/mbchk.1 24 Jun 2006 14:40:02 -0000 1.54 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.23. -.TH MBCHK "1" "May 2005" "mbchk (GNU GRUB 0.97)" FSF +.TH MBCHK "1" "June 2006" "mbchk (GNU GRUB 0.97)" FSF .SH NAME mbchk \- check the format of a Multiboot kernel .SH SYNOPSIS Index: docs/multiboot.texi =================================================================== RCS file: /sources/grub/grub/docs/multiboot.texi,v retrieving revision 1.18 retrieving revision 1.21 diff -u -p -u -r1.18 -r1.21 --- foo/docs/multiboot.texi 16 Jun 2002 03:12:58 -0000 1.18 +++ foo/docs/multiboot.texi 24 Jun 2006 14:40:02 -0000 1.21 @@ -1,32 +1,28 @@ \input texinfo @c -*-texinfo-*- -@c -*-texinfo-*- @c %**start of header @setfilename multiboot.info -@settitle Multiboot Specification -@c %**end of header - +@set VERSION 0.6.95 +@settitle Multiboot Specification version @value{VERSION} @c Unify all our little indices for now. @syncodeindex fn cp @syncodeindex vr cp @syncodeindex ky cp @syncodeindex pg cp @syncodeindex tp cp +@c %**end of header @footnotestyle separate @paragraphindent 3 @finalout +@copying +Copyright @copyright{} 1995,96 Bryan Ford -@dircategory Kernel -@direntry -* Multiboot Specification: (multiboot). Multiboot Specification. -@end direntry +Copyright @copyright{} 1995,96 Erich Stefan Boleyn -@ifinfo -Copyright @copyright{} 1995, 96 Bryan Ford -Copyright @copyright{} 1995, 96 Erich Stefan Boleyn -Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 1999,2000,2001,2002,2005,2006 Free Software Foundation, Inc. +@quotation Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. @@ -36,7 +32,6 @@ Permission is granted to process this fi results, provided the printed document carries a copying permission notice identical to this one except for the removal of this paragraph (this paragraph not being relevant to the printed manual). - @end ignore Permission is granted to copy and distribute modified versions of this @@ -45,31 +40,23 @@ the entire resulting derived work is dis permission notice identical to this one. Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions. -@end ifinfo +into another language, under the above conditions for modified +versions. +@end quotation +@end copying + +@dircategory Kernel +@direntry +* Multiboot Specification: (multiboot). Multiboot Specification. +@end direntry @titlepage @sp 10 -@title The Multiboot Specification +@title The Multiboot Specification version @value{VERSION} @author Yoshinori K. Okuji, Bryan Ford, Erich Stefan Boleyn, Kunihiro Ishiguro @page - @vskip 0pt plus 1filll -Copyright @copyright{} 1995, 96 Bryan Ford -Copyright @copyright{} 1995, 96 Erich Stefan Boleyn -Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -Permission is granted to make and distribute verbatim copies of -this manual provided the copyright notice and this permission notice -are preserved on all copies. - -Permission is granted to copy and distribute modified versions of this -manual under the conditions for verbatim copying, provided also that -the entire resulting derived work is distributed under the terms of a -permission notice identical to this one. - -Permission is granted to copy and distribute translations of this manual -into another language, under the above conditions for modified versions. +@insertcopying @end titlepage @finalout @@ -80,7 +67,9 @@ into another language, under the above c @top Multiboot Specification This file documents Multiboot Specification, the proposal for the boot -sequence standard. This edition documents version 0.6.93. +sequence standard. This edition documents version @value{VERSION}. + +@insertcopying @end ifnottex @menu @@ -426,7 +415,7 @@ mode table (@pxref{Boot information form kernel. If bit 16 in the @samp{flags} word is set, then the fields at offsets -8-24 in the Multiboot header are valid, and the boot loader should use +12-28 in the Multiboot header are valid, and the boot loader should use them instead of the fields in the actual executable header to calculate where to load the OS image. This information does not need to be provided if the kernel image is in @sc{elf} format, but it @emph{must} @@ -677,7 +666,7 @@ follows: @example @group +-------+-------+-------+-------+ -| drive | part1 | part2 | part3 | +| part3 | part2 | part1 | drive | +-------+-------+-------+-------+ @end group @end example @@ -1197,6 +1186,17 @@ Rewritten, using more strict words. @item The maintainer changes to the GNU GRUB maintainer team @email{bug-grub@@gnu.org}, from Bryan Ford and Erich Stefan Boleyn. + +@item +The byte order of the @samp{boot_device} in Multiboot information is +reversed. This was a mistake. + +@item +The offset of the address fields were wrong. + +@item +The format is adapted to a newer Texinfo, and the version number is +specified more explicitly in the title. @end itemize @item 0.6 Index: docs/stamp-vti =================================================================== RCS file: /sources/grub/grub/docs/stamp-vti,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -u -r1.47 -r1.48 Index: docs/version.texi =================================================================== RCS file: /sources/grub/grub/docs/version.texi,v retrieving revision 1.47 retrieving revision 1.48 diff -u -p -u -r1.47 -r1.48 Index: grub/asmstub.c =================================================================== RCS file: /sources/grub/grub/grub/asmstub.c,v retrieving revision 1.84 retrieving revision 1.87 diff -u -p -u -r1.84 -r1.87 --- foo/grub/asmstub.c 16 Feb 2005 20:45:48 -0000 1.84 +++ foo/grub/asmstub.c 28 Mar 2008 13:22:28 -0000 1.87 @@ -55,6 +55,10 @@ int grub_stage2 (void); # endif /* ! BLKFLSBUF */ #endif /* __linux__ */ +#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__) +# include +#endif + /* We want to prevent any circularararity in our stubs, as well as libc name clashes. */ #define WITHOUT_LIBC_STUBS 1 @@ -777,7 +781,39 @@ get_diskinfo (int drive, struct geometry /* Open read/write, or read-only if that failed. */ if (! read_only) - disks[drive].flags = open (devname, O_RDWR); + { +/* By default, kernel of FreeBSD does not allow overwriting MBR */ +#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__) +#define GEOM_SYSCTL "kern.geom.debugflags" + int old_flags, flags; + size_t sizeof_int = sizeof (int); + + if (sysctlbyname (GEOM_SYSCTL, &old_flags, &sizeof_int, NULL, 0) != 0) + grub_printf ("failed to get " GEOM_SYSCTL "sysctl: %s\n", strerror (errno)); + + if ((old_flags & 0x10) == 0) + { + /* "allow foot shooting", see geom(4) */ + flags = old_flags | 0x10; + + if (sysctlbyname (GEOM_SYSCTL, NULL, NULL, &flags, sizeof (int)) != 0) + { + flags = old_flags; + grub_printf ("failed to set " GEOM_SYSCTL "sysctl: %s\n", strerror (errno)); + } + } + else + flags = old_flags; +#endif + disks[drive].flags = open (devname, O_RDWR); +#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__) + if (flags != old_flags) + { + if (sysctlbyname (GEOM_SYSCTL, NULL, NULL, &old_flags, sizeof (int)) != 0) + grub_printf ("failed to set " GEOM_SYSCTL "sysctl: %s\n", strerror (errno)); + } +#endif + } if (disks[drive].flags == -1) { @@ -926,7 +962,7 @@ hex_dump (void *buf, size_t size) int biosdisk (int subfunc, int drive, struct geometry *geometry, - int sector, int nsec, int segment) + unsigned int sector, int nsec, int segment) { char *buf; int fd = geometry->flags; Index: grub/main.c =================================================================== RCS file: /sources/grub/grub/grub/main.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -u -r1.23 -r1.24 --- foo/grub/main.c 11 Jun 2002 16:36:54 -0000 1.23 +++ foo/grub/main.c 5 May 2006 21:43:46 -0000 1.24 @@ -32,6 +32,7 @@ int grub_stage2 (void); #define WITHOUT_LIBC_STUBS 1 #include #include +#include char *program_name = 0; int use_config_file = 1; @@ -192,6 +193,12 @@ main (int argc, char **argv) perror ("strtoul"); exit (1); } + if (boot_drive >= NUM_DISKS) + { + fprintf (stderr, "boot_drive should be from 0 to %d\n", + NUM_DISKS - 1); + exit (1); + } break; case OPT_NO_CONFIG_FILE: Index: lib/device.c =================================================================== RCS file: /sources/grub/grub/lib/device.c,v retrieving revision 1.26 retrieving revision 1.29 diff -u -p -u -r1.26 -r1.29 --- foo/lib/device.c 27 Mar 2005 23:20:09 -0000 1.26 +++ foo/lib/device.c 28 Mar 2008 13:22:28 -0000 1.29 @@ -69,9 +69,9 @@ struct hd_geometry # ifndef CDROM_GET_CAPABILITY # define CDROM_GET_CAPABILITY 0x5331 /* get capabilities */ # endif /* ! CDROM_GET_CAPABILITY */ -# ifndef BLKGETSIZE -# define BLKGETSIZE _IO(0x12,96) /* return device size */ -# endif /* ! BLKGETSIZE */ +# ifndef BLKGETSIZE64 +# define BLKGETSIZE64 _IOR(0x12,114,size_t) /* return device size */ +# endif /* ! BLKGETSIZE64 */ #endif /* __linux__ */ /* Use __FreeBSD_kernel__ instead of __FreeBSD__ for compatibility with @@ -152,19 +152,19 @@ get_drive_geometry (struct geometry *geo /* Linux */ { struct hd_geometry hdg; - unsigned long nr; + unsigned long long nr; if (ioctl (fd, HDIO_GETGEO, &hdg)) goto fail; - if (ioctl (fd, BLKGETSIZE, &nr)) + if (ioctl (fd, BLKGETSIZE64, &nr)) goto fail; /* Got the geometry, so save it. */ geom->cylinders = hdg.cylinders; geom->heads = hdg.heads; geom->sectors = hdg.sectors; - geom->total_sectors = nr; + geom->total_sectors = nr / 512; goto success; } @@ -407,6 +407,12 @@ get_ataraid_disk_name (char *name, int u { sprintf (name, "/dev/ataraid/d%c", unit + '0'); } + +static void +get_i2o_disk_name (char *name, char unit) +{ + sprintf (name, "/dev/i2o/hd%c", unit); +} #endif /* Check if DEVICE can be read. If an error occurs, return zero, @@ -801,6 +807,29 @@ init_device_map (char ***map, const char } } } + + /* This is for I2O - we have /dev/i2o/hd */ + { + int unit; + + for (unit = 'a'; unit < 'f'; unit++) + { + char name[24]; + + get_i2o_disk_name (name, unit); + if (check_device (name)) + { + (*map)[num_hd + 0x80] = strdup (name); + assert ((*map)[num_hd + 0x80]); + + /* If the device map file is opened, write the map. */ + if (fp) + fprintf (fp, "(hd%d)\t%s\n", num_hd, name); + + num_hd++; + } + } + } #endif /* __linux__ */ /* OK, close the device map file if opened. */ @@ -861,6 +890,12 @@ write_to_partition (char **map, int driv if (strcmp (dev + strlen(dev) - 5, "/disc") == 0) strcpy (dev + strlen(dev) - 5, "/part"); } + else + { + if ((strncmp (dev, "/dev/ataraid/", 13) == 0) || + (strncmp (dev, "/dev/rd/", 8) == 0)) + strcpy (dev + strlen(dev), "p"); + } sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1); /* Open the partition. */ Index: netboot/cs89x0.c =================================================================== RCS file: /sources/grub/grub/netboot/cs89x0.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -u -r1.5 -r1.6 --- foo/netboot/cs89x0.c 2 Jan 2002 21:56:40 -0000 1.5 +++ foo/netboot/cs89x0.c 20 May 2008 11:04:18 -0000 1.6 @@ -1,3 +1,21 @@ +/** + Per an email message from Russ Nelson on + 18 March 2008 this file is now licensed under GPL Version 2. + + From: Russ Nelson + Date: Tue, 18 Mar 2008 12:42:00 -0400 + Subject: Re: [Etherboot-developers] cs89x0 driver in etherboot + -- quote from email + As copyright holder, if I say it doesn't conflict with the GPL, + then it doesn't conflict with the GPL. + + However, there's no point in causing people's brains to overheat, + so yes, I grant permission for the code to be relicensed under the + GPLv2. Please make sure that this change in licensing makes its + way upstream. -russ + -- quote from email +**/ + /* cs89x0.c: A Crystal Semiconductor CS89[02]0 driver for etherboot. */ /* Permission is granted to distribute the enclosed cs89x0.[ch] driver Index: netboot/cs89x0.h =================================================================== RCS file: /sources/grub/grub/netboot/cs89x0.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -u -r1.3 -r1.4 --- foo/netboot/cs89x0.h 22 Apr 2000 01:17:09 -0000 1.3 +++ foo/netboot/cs89x0.h 20 May 2008 11:04:18 -0000 1.4 @@ -1,3 +1,21 @@ +/** + Per an email message from Russ Nelson on + 18 March 2008 this file is now licensed under GPL Version 2. + + From: Russ Nelson + Date: Tue, 18 Mar 2008 12:42:00 -0400 + Subject: Re: [Etherboot-developers] cs89x0 driver in etherboot + -- quote from email + As copyright holder, if I say it doesn't conflict with the GPL, + then it doesn't conflict with the GPL. + + However, there's no point in causing people's brains to overheat, + so yes, I grant permission for the code to be relicensed under the + GPLv2. Please make sure that this change in licensing makes its + way upstream. -russ + -- quote from email +**/ + /* Copyright, 1988-1992, Russell Nelson, Crynwr Software This program is free software; you can redistribute it and/or modify Index: netboot/etherboot.h =================================================================== RCS file: /sources/grub/grub/netboot/etherboot.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -u -r1.12 -r1.13 --- foo/netboot/etherboot.h 8 May 2002 07:12:29 -0000 1.12 +++ foo/netboot/etherboot.h 8 Sep 2006 12:56:22 -0000 1.13 @@ -531,9 +531,6 @@ extern int ip_abort; extern int network_ready; extern struct rom_info rom; extern struct arptable_t arptable[MAX_ARP]; -extern struct bootpd_t bootp_data; -#define BOOTP_DATA_ADDR (&bootp_data) -extern unsigned char *end_of_rfc1533; /* config.c */ extern struct nic nic; Index: netboot/main.c =================================================================== RCS file: /sources/grub/grub/netboot/main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -u -r1.16 -r1.17 --- foo/netboot/main.c 20 May 2004 22:17:27 -0000 1.16 +++ foo/netboot/main.c 8 Sep 2006 12:56:22 -0000 1.17 @@ -56,7 +56,8 @@ static int vendorext_isvalid; static unsigned long netmask; static struct bootpd_t bootp_data; static unsigned long xid; -static unsigned char *end_of_rfc1533 = NULL; + +#define BOOTP_DATA_ADDR (&bootp_data) #ifndef NO_DHCP_SUPPORT #endif /* NO_DHCP_SUPPORT */ @@ -967,7 +968,6 @@ decode_rfc1533 (unsigned char *p, int bl if (block == 0) { - end_of_rfc1533 = NULL; vendorext_isvalid = 0; if (grub_memcmp (p, rfc1533_cookie, 4)) @@ -1021,7 +1021,7 @@ decode_rfc1533 (unsigned char *p, int bl } else if (c == RFC1533_END) { - end_of_rfc1533 = endp = p; + endp = p; continue; } else if (c == RFC1533_NETMASK) Index: netboot/natsemi.c =================================================================== RCS file: /sources/grub/grub/netboot/natsemi.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -u -r1.1 -r1.2 --- foo/netboot/natsemi.c 15 Jan 2002 10:32:22 -0000 1.1 +++ foo/netboot/natsemi.c 10 Sep 2006 07:26:10 -0000 1.2 @@ -608,7 +608,7 @@ natsemi_transmit(struct nic *nic, const char *p) /* Packet */ { u32 status, to, nstype; - u32 tx_status; + volatile u32 tx_status; /* Stop the transmitter */ outl(TxOff, ioaddr + ChipCmd); @@ -647,7 +647,7 @@ natsemi_transmit(struct nic *nic, to = currticks() + TX_TIMEOUT; - while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) /* wait */ ; if (currticks() >= to) { Index: netboot/sis900.c =================================================================== RCS file: /sources/grub/grub/netboot/sis900.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -u -r1.1 -r1.2 --- foo/netboot/sis900.c 2 Jan 2002 21:56:40 -0000 1.1 +++ foo/netboot/sis900.c 10 Sep 2006 07:26:10 -0000 1.2 @@ -901,7 +901,7 @@ sis900_transmit(struct nic *nic, const char *p) /* Packet */ { u32 status, to, nstype; - u32 tx_status; + volatile u32 tx_status; /* Stop the transmitter */ outl(TxDIS, ioaddr + cr); @@ -940,7 +940,7 @@ sis900_transmit(struct nic *nic, to = currticks() + TX_TIMEOUT; - while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) /* wait */ ; if (currticks() >= to) { Index: stage1/Makefile.am =================================================================== RCS file: /sources/grub/grub/stage1/Makefile.am,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -u -r1.17 -r1.18 --- foo/stage1/Makefile.am 24 Jun 2004 17:04:37 -0000 1.17 +++ foo/stage1/Makefile.am 5 Nov 2007 01:29:46 -0000 1.18 @@ -5,7 +5,7 @@ CLEANFILES = $(nodist_pkglib_DATA) # We can't use builtins or standard includes. AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc -LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 +stage1_exec_LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 noinst_PROGRAMS = stage1.exec stage1_exec_SOURCES = stage1.S stage1.h Index: stage2/bios.c =================================================================== RCS file: /sources/grub/grub/stage2/bios.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -u -r1.16 -r1.17 --- foo/stage2/bios.c 27 Mar 2004 17:02:54 -0000 1.16 +++ foo/stage2/bios.c 28 Mar 2008 13:22:28 -0000 1.17 @@ -47,7 +47,7 @@ extern int get_diskinfo_floppy (int driv return the error number. Otherwise, return 0. */ int biosdisk (int read, int drive, struct geometry *geometry, - int sector, int nsec, int segment) + unsigned int sector, int nsec, int segment) { int err; Index: stage2/boot.c =================================================================== RCS file: /sources/grub/grub/stage2/boot.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -u -r1.46 -r1.47 --- foo/stage2/boot.c 29 Mar 2004 14:54:30 -0000 1.46 +++ foo/stage2/boot.c 28 Sep 2005 21:47:55 -0000 1.47 @@ -1,7 +1,7 @@ /* boot.c - load and bootstrap a kernel */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc. + * Copyright (C) 1999,2000,2001,2002,2003,2004,2005 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -96,7 +96,7 @@ load_image (char *kernel, char *arg, ker lh = (struct linux_kernel_header *) buffer; /* ELF loading supported if multiboot, FreeBSD and NetBSD. */ - if ((type == KERNEL_TYPE_MULTIBOOT + if (((type == KERNEL_TYPE_MULTIBOOT && ! (flags & MULTIBOOT_AOUT_KLUDGE)) || pu.elf->e_ident[EI_OSABI] == ELFOSABI_FREEBSD || grub_strcmp (pu.elf->e_ident + EI_BRAND, "FreeBSD") == 0 || suggested_type == KERNEL_TYPE_NETBSD) Index: stage2/builtins.c =================================================================== RCS file: /sources/grub/grub/stage2/builtins.c,v retrieving revision 1.151 retrieving revision 1.152 diff -u -p -u -r1.151 -r1.152 --- foo/stage2/builtins.c 15 Feb 2005 22:05:07 -0000 1.151 +++ foo/stage2/builtins.c 21 Mar 2006 20:51:58 -0000 1.152 @@ -3830,15 +3830,15 @@ setup_func (char *arg, int flags) { char tmp[16]; grub_sprintf (tmp, ",%d", (partition >> 16) & 0xFF); - grub_strncat (device, tmp, 256); + grub_strncat (device, tmp, sizeof (device)); } if ((partition & 0x00FF00) != 0x00FF00) { char tmp[16]; grub_sprintf (tmp, ",%c", 'a' + ((partition >> 8) & 0xFF)); - grub_strncat (device, tmp, 256); + grub_strncat (device, tmp, sizeof (device)); } - grub_strncat (device, ")", 256); + grub_strncat (device, ")", sizeof (device)); } int embed_stage1_5 (char *stage1_5, int drive, int partition) Index: stage2/disk_io.c =================================================================== RCS file: /sources/grub/grub/stage2/disk_io.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -u -r1.58 -r1.59 --- foo/stage2/disk_io.c 23 May 2004 16:45:45 -0000 1.58 +++ foo/stage2/disk_io.c 28 Mar 2008 13:22:28 -0000 1.59 @@ -137,7 +137,7 @@ log2 (unsigned long word) } int -rawread (int drive, int sector, int byte_offset, int byte_len, char *buf) +rawread (int drive, unsigned int sector, int byte_offset, int byte_len, char *buf) { int slen, sectors_per_vtrack; int sector_size_bits = log2 (buf_geom.sector_size); @@ -261,7 +261,7 @@ rawread (int drive, int sector, int byte */ if (disk_read_func) { - int sector_num = sector; + unsigned int sector_num = sector; int length = buf_geom.sector_size - byte_offset; if (length > size) length = size; @@ -291,7 +291,7 @@ rawread (int drive, int sector, int byte int -devread (int sector, int byte_offset, int byte_len, char *buf) +devread (unsigned int sector, int byte_offset, int byte_len, char *buf) { /* * Check partition boundaries @@ -330,7 +330,7 @@ devread (int sector, int byte_offset, in #ifndef STAGE1_5 int -rawwrite (int drive, int sector, char *buf) +rawwrite (int drive, unsigned int sector, char *buf) { if (sector == 0) { @@ -363,7 +363,7 @@ rawwrite (int drive, int sector, char *b } int -devwrite (int sector, int sector_count, char *buf) +devwrite (unsigned int sector, int sector_count, char *buf) { #if defined(GRUB_UTIL) && defined(__linux__) if (current_partition != 0xFFFFFF Index: stage2/iso9660.h =================================================================== RCS file: /sources/grub/grub/stage2/iso9660.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -u -r1.1 -r1.2 --- foo/stage2/iso9660.h 27 Mar 2004 17:02:54 -0000 1.1 +++ foo/stage2/iso9660.h 22 Feb 2007 23:40:25 -0000 1.2 @@ -73,11 +73,11 @@ typedef union { typedef struct __iso_16bit { u_int16_t l, b; -} iso_16bit_t __attribute__ ((packed)); +} iso_16bit_t; typedef struct __iso_32bit { u_int32_t l, b; -} iso_32bit_t __attribute__ ((packed)); +} iso_32bit_t; typedef u_int8_t iso_date_t[7]; Index: stage2/shared.h =================================================================== RCS file: /sources/grub/grub/stage2/shared.h,v retrieving revision 1.99 retrieving revision 1.101 diff -u -p -u -r1.99 -r1.101 --- foo/stage2/shared.h 20 Jun 2004 13:48:47 -0000 1.99 +++ foo/stage2/shared.h 28 Mar 2008 13:22:28 -0000 1.101 @@ -499,7 +499,11 @@ struct vbe_mode unsigned char linear_reserved_field_position; unsigned long max_pixel_clock; - unsigned char reserved3[189]; + /* Reserved field to make structure to be 256 bytes long, VESA BIOS + Extension 3.0 Specification says to reserve 189 bytes here but + that doesn't make structure to be 256 bytes. So additional one is + added here. */ + unsigned char reserved3[189 + 1]; } __attribute__ ((packed)); @@ -807,7 +811,7 @@ int checkkey (void); /* Low-level disk I/O */ int get_diskinfo (int drive, struct geometry *geometry); int biosdisk (int subfunc, int drive, struct geometry *geometry, - int sector, int nsec, int segment); + unsigned int sector, int nsec, int segment); void stop_floppy (void); /* Command-line interface functions. */ @@ -920,10 +924,10 @@ int gunzip_test_header (void); int gunzip_read (char *buf, int len); #endif /* NO_DECOMPRESSION */ -int rawread (int drive, int sector, int byte_offset, int byte_len, char *buf); -int devread (int sector, int byte_offset, int byte_len, char *buf); -int rawwrite (int drive, int sector, char *buf); -int devwrite (int sector, int sector_len, char *buf); +int rawread (int drive, unsigned int sector, int byte_offset, int byte_len, char *buf); +int devread (unsigned int sector, int byte_offset, int byte_len, char *buf); +int rawwrite (int drive, unsigned int sector, char *buf); +int devwrite (unsigned int sector, int sector_len, char *buf); /* Parse a device string and initialize the global parameters. */ char *set_device (char *device); Index: stage2/stage2.c =================================================================== RCS file: /sources/grub/grub/stage2/stage2.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -u -r1.46 -r1.47 --- foo/stage2/stage2.c 19 Mar 2005 18:02:52 -0000 1.46 +++ foo/stage2/stage2.c 5 May 2006 22:06:31 -0000 1.47 @@ -651,7 +651,10 @@ restart: *(new_heap++) = 0; if (config_entries) - run_menu (heap, NULL, new_num_entries, new_heap, 0); + { + current_entryno = first_entry + entryno; + run_menu (heap, NULL, new_num_entries, new_heap, 0); + } else { cls (); @@ -727,7 +730,8 @@ restart: cur_entry = get_entry (config_entries, first_entry + entryno, 1); /* Set CURRENT_ENTRYNO for the command "savedefault". */ - current_entryno = first_entry + entryno; + if (config_entries) + current_entryno = first_entry + entryno; if (run_script (cur_entry, heap)) { Index: util/.cvsignore =================================================================== RCS file: /sources/grub/grub/util/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -u -r1.2 -r1.3 Index: util/grub-install.in =================================================================== RCS file: /sources/grub/grub/util/grub-install.in,v retrieving revision 1.48 retrieving revision 1.49 diff -u -p -u -r1.48 -r1.49 --- foo/util/grub-install.in 20 Jul 2004 19:30:24 -0000 1.48 +++ foo/util/grub-install.in 20 Apr 2006 13:46:46 -0000 1.49 @@ -112,8 +112,8 @@ convert () { tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;; freebsd* | kfreebsd*-gnu) - tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \ - | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'` + tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%\1%' \ + | sed 's%r\{0,1\}\(da[0-9]*\).*$%\1%'` tmp_part=`echo "$1" \ | sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \ | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"` Index: util/mkbimage =================================================================== RCS file: /sources/grub/grub/util/mkbimage,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -u -r1.19 -r1.20 --- foo/util/mkbimage 21 Jul 2004 14:43:04 -0000 1.19 +++ foo/util/mkbimage 22 Feb 2007 16:01:03 -0000 1.20 @@ -1,7 +1,7 @@ #!/bin/sh # MaKe a Bootable IMAGE --- 1.44, 2.88 and El Torito no-emulation mode # C) 2001,2002,2003 Thierry Laronde -# C) 2001,2002,2003 Robert Millan +# C) 2001,2002,2003 Robert Millan # This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ # program's maintainer or write to: The Free Software Foundation, # Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA. -# $Id: mkbimage,v 1.19 2004/07/21 14:43:04 robertmh Exp $ +# $Id: mkbimage,v 1.20 2007/02/22 16:01:03 robertmh Exp $ # Global variables tarfile= @@ -58,7 +58,7 @@ stage2_os_name= # Name by which this script was invoked. program=`echo "$0" | sed -e 's/[^\/]*\///g'` -version_number='$Revision: 1.19 $' +version_number='$Revision: 1.20 $' usage=" Usage: $program [-hVF] [-t TYPE] [-d DIRECTORY] [-s FS_TYPE] -f TAR_FILE @@ -94,15 +94,13 @@ Options: display Version information and exit Copyright (c) 2001,2002,2003 Thierry Laronde . -Copyright (c) 2001,2002 Robert Millan . GPLed." version="mkbimage $version_number -Written by Thierry Laronde and Robert Millan. +Written by Thierry Laronde. Copyright (c) 2001,2002,2003 Thierry Laronde . -Copyright (c) 2001,2002,2003 Robert Millan . This is free software under the GPL version 2 or later; see the source for copying conditions. There is NO warranty, not even for MERCHANTABILITY or