vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2629 commits 7 branches 0 tags 73 MiB
Commit graph

114 commits

Author SHA1 Message Date
Samuel Thibault
c273d4cea9 2010-01-24 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub.d/10_hurd.in: Add a recovery mode.
 2010-01-24 14:30:10 +01:00
Robert Millan
96d73208a1 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
	can be reliably determined to be supported.
 2010-01-20 17:01:12 +00:00
Robert Millan
34a66d995b 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/00_header.in: Fix stupid mistake from last commit.
 2010-01-20 14:10:46 +00:00
Robert Millan
94fabf587a 2010-01-20 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/00_header.in: Fix handling of locale_dir.
 2010-01-20 13:55:30 +00:00
carles
5c71db1b9b 2010-01-14 Carles Pina i Estany <carles@pina.cat> 
* util/grub.d/30_os-prober.in: Use `set var=val' rather than plain
	`var=val'.
 2010-01-14 23:20:13 +00:00
Colin Watson
7d1468e4b6 merge from trunk 2010-01-14 14:04:44 +00:00
Robert Millan
1a064917fe 2010-01-09 Robert Millan <rmh.grub@aybabtu.com> 
Make loader output a bit more user-friendly.
	
	* util/grub.d/10_hurd.in: Print message indicating that GNU Mach
	is being loaded.  Likewise for the Hurd.
	
	* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Print message indicating
	that kernel of FreeBSD ${version} is being loaded.
	
	* loader/i386/linux.c (grub_cmd_linux): Move debug info to
	grub_dprintf().
	(grub_cmd_initrd): Likewise.
	* util/grub.d/10_linux.in (linux_entry): Print message indicating
	that Linux ${version} is being loaded.  Likewise for initrd.
 2010-01-09 22:02:00 +00:00
Colin Watson
bc11fee9f5 merge from trunk 2010-01-05 10:53:03 +00:00
Colin Watson
5c23bb0f52 2010-10-05 Jordan Uggla <jordan.uggla@gmail.com> 
2010-10-05  Colin Watson  <cjwatson@ubuntu.com>

	* util/grub.d/00_header.in: Define a "savedefault" function for use
	in menu entries.
	* util/grub-mkconfig_lib.in (save_default_entry): Use it.
 2010-01-05 10:41:51 +00:00
Colin Watson
b445cfaa4d 2010-10-05 Jordan Uggla <jordan.uggla@gmail.com> 
2010-10-05  Colin Watson  <cjwatson@ubuntu.com>

	* util/grub-mkconfig_lib.in (save_default_entry): Only set
	saved_entry if boot_once is unset.
	* util/grub.d/00_header.in: Set boot_once to "true" if there was a
	previous saved entry (i.e. grub-reboot).
 2010-01-05 10:30:14 +00:00
Robert Millan
58bc8bd5b1 2010-01-03 Robert Millan <rmh.grub@aybabtu.com> 
* boot/i386/pc/boot.S: Update copyright year.
	* boot/i386/pc/cdboot.S: Likewise.
	* boot/i386/pc/diskboot.S: Likewise.
	* boot/i386/pc/lnxboot.S: Likewise.
	* boot/i386/pc/pxeboot.S: Likewise.
	* bus/pci.c: Likewise.
	* commands/cmp.c: Likewise.
	* commands/help.c: Likewise.
	* commands/hexdump.c: Likewise.
	* commands/i386/pc/halt.c: Likewise.
	* commands/i386/pc/play.c: Likewise.
	* commands/i386/pc/vbeinfo.c: Likewise.
	* commands/ls.c: Likewise.
	* commands/test.c: Likewise.
	* disk/dmraid_nvidia.c: Likewise.
	* disk/i386/pc/biosdisk.c: Likewise.
	* disk/ieee1275/nand.c: Likewise.
	* disk/ieee1275/ofdisk.c: Likewise.
	* disk/lvm.c: Likewise.
	* disk/raid.c: Likewise.
	* disk/raid6_recover.c: Likewise.
	* disk/scsi.c: Likewise.
	* fs/affs.c: Likewise.
	* fs/cpio.c: Likewise.
	* fs/ext2.c: Likewise.
	* fs/hfs.c: Likewise.
	* fs/iso9660.c: Likewise.
	* fs/ntfs.c: Likewise.
	* fs/sfs.c: Likewise.
	* fs/udf.c: Likewise.
	* fs/ufs.c: Likewise.
	* fs/xfs.c: Likewise.
	* gencmdlist.sh: Likewise.
	* genmk.rb: Likewise.
	* include/grub/disk.h: Likewise.
	* include/grub/efi/api.h: Likewise.
	* include/grub/efi/efi.h: Likewise.
	* include/grub/efi/pe32.h: Likewise.
	* include/grub/elf.h: Likewise.
	* include/grub/fs.h: Likewise.
	* include/grub/i386/at_keyboard.h: Likewise.
	* include/grub/i386/pc/memory.h: Likewise.
	* include/grub/i386/pc/vbe.h: Likewise.
	* include/grub/i386/pci.h: Likewise.
	* include/grub/i386/tsc.h: Likewise.
	* include/grub/ieee1275/ieee1275.h: Likewise.
	* include/grub/ntfs.h: Likewise.
	* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
	* include/grub/sparc64/libgcc.h: Likewise.
	* include/grub/symbol.h: Likewise.
	* include/grub/types.h: Likewise.
	* include/multiboot2.h: Likewise.
	* io/gzio.c: Likewise.
	* kern/device.c: Likewise.
	* kern/disk.c: Likewise.
	* kern/efi/efi.c: Likewise.
	* kern/efi/mm.c: Likewise.
	* kern/elf.c: Likewise.
	* kern/file.c: Likewise.
	* kern/i386/dl.c: Likewise.
	* kern/i386/pc/init.c: Likewise.
	* kern/i386/pc/startup.S: Likewise.
	* kern/ieee1275/ieee1275.c: Likewise.
	* kern/ieee1275/init.c: Likewise.
	* kern/main.c: Likewise.
	* kern/mm.c: Likewise.
	* kern/powerpc/dl.c: Likewise.
	* kern/sparc64/dl.c: Likewise.
	* kern/x86_64/dl.c: Likewise.
	* lib/hexdump.c: Likewise.
	* loader/efi/appleloader.c: Likewise.
	* loader/i386/ieee1275/linux.c: Likewise.
	* loader/i386/pc/chainloader.c: Likewise.
	* loader/i386/pc/linux.c: Likewise.
	* loader/i386/pc/multiboot2.c: Likewise.
	* loader/ieee1275/multiboot2.c: Likewise.
	* loader/multiboot2.c: Likewise.
	* loader/multiboot_loader.c: Likewise.
	* loader/powerpc/ieee1275/linux.c: Likewise.
	* normal/completion.c: Likewise.
	* normal/menu_entry.c: Likewise.
	* partmap/apple.c: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/hostfs.c: Likewise.
	* video/readers/png.c: Likewise.
 2010-01-03 22:05:07 +00:00
Felix Zielcke
a2c1332b70 2009-12-23 Felix Zielcke <fzielcke@z-51.de> 
* commands/i386/pc/drivemap.c: Remove all trailing whitespace.
	* commands/lspci.c: Likewise.
	* commands/probe.c: Likewise.
	* commands/xnu_uuid.c: Likewise.
	* conf/i386-coreboot.rmk: Likewise.
	* conf/i386-efi.rmk: Likewise.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-pc.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk: Likewise.
	* conf/x86_64-efi.rmk: Likewise.
	* fs/i386/pc/pxe.c: Likewise.
	* gettext/gettext.c: Likewise.
	* include/grub/efi/graphics_output.h: Likewise.
	* include/grub/i386/pc/memory.h: Likewise.
	* kern/env.c: Likewise.
	* kern/i386/qemu/startup.S: Likewise.
	* lib/i386/pc/biosnum.c: Likewise.
	* lib/i386/relocator.c: Likewise.
	* lib/i386/relocator_asm.S: Likewise.
	* lib/relocator.c: Likewise.
	* loader/i386/bsd.c: Likewise.
	* loader/i386/multiboot.c: Likewise.
	* loader/i386/pc/chainloader.c: Likewise.
	* loader/i386/xnu.c: Likewise.
	* loader/xnu.c: Likewise.
	* normal/main.c: Likewise.
	* normal/menu_text.c: Likewise.
	* util/getroot.c: Likewise.
	* util/grub-mkconfig_lib.in: Likewise.
	* util/grub.d/00_header.in: Likewise.
	* util/i386/pc/grub-mkimage.c: Likewise.
	* util/mkisofs/eltorito.c: Likewise.
	* util/mkisofs/exclude.h: Likewise.
	* util/mkisofs/hash.c: Likewise.
	* util/mkisofs/iso9660.h: Likewise.
	* util/mkisofs/joliet.c: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
	* util/mkisofs/multi.c: Likewise.
	* util/mkisofs/name.c: Likewise.
	* util/mkisofs/rock.c: Likewise.
	* util/mkisofs/tree.c: Likewise.
	* util/mkisofs/write.c: Likewise.
	* video/efi_gop.c: Likewise.
 2009-12-23 17:41:32 +01:00
Felix Zielcke
7e70dfffc1 2009-12-22 Felix Zielcke <fzielcke@z-51.de> 
* util/grub.d/30_os-prober.in (osx_entry): Add round brackets
	after function name.
	Noticed by Rene Engelhard <rene@debian.org>.
 2009-12-22 12:02:57 +01:00
Felix Zielcke
82000aa2b2 2009-12-22 Felix Zielcke <fzielcke@z-51.de> 
* util/grub.d/30_os-prober.in (osx_entry): Remove non POSIX compliant
	`function' keyword.
	Patch by Tony Mancill <tmancill@debian.org>.
 2009-12-22 10:35:04 +01:00
Vladimir 'phcoder' Serbinenko
7ea73643f5 merge mtrunk into xnu 2009-12-18 03:57:32 +01:00
Vladimir 'phcoder' Serbinenko
2cd7057fc8 30_os-prober update 2009-12-18 03:33:24 +01:00
Robert Millan
dc0c71d974 2009-12-12 Robert Millan <rmh@aybabtu.com> 
* gendistlist.sh (EXTRA_DISTFILES): Add `genvideolist.sh'.
        * genmk.rb (video): New variable.
        (CLEANFILES, VIDEOFILES): Add #{video}.
        (#{video}): New target rule.
        * genvideolist.sh: New file.
        * Makefile.in (pkglib_DATA): Add video.lst.
        (video.lst): New target rule.
        * util/grub-mkconfig.in: Initialize ${GRUB_VIDEO_BACKEND} using
        `video.lst'.
        * util/grub.d/30_os-prober.in: Replace `vbe' with
        ${GRUB_VIDEO_BACKEND}.
 2009-12-12 00:43:32 +00:00
Colin Watson
6c1f8c1215 2009-12-08 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/30_os-prober.in: Call save_default_entry for hurd.
 2009-12-08 01:02:08 +00:00
Colin Watson
b967a04d5b 2009-12-08 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/00_header.in: Use `set var=val' rather than plain
	`var=val'.
	* util/grub-mkconfig_lib.in (save_default_entry): Likewise.
 2009-12-08 01:01:21 +00:00
Colin Watson
42356b4d5e 2009-12-08 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/00_header.in: Silently ignore zero-sized environment
	blocks.
 2009-12-08 00:59:26 +00:00
Colin Watson
36cd6dd151 2009-12-08 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/00_header.in: Quote the value assigned to `default',
	in case it contains spaces.
 2009-12-08 00:57:46 +00:00
Colin Watson
b824145a8f 2009-12-08 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/30_os-prober.in: Fix merge error that moved a
	`save_default_entry' call from the macosx case to the linux case.
 2009-12-08 00:56:39 +00:00
Colin Watson
e8b2988803 merge from trunk 2009-12-08 00:55:17 +00:00
Felix Zielcke
6f61ed5513 2009-11-25 Felix Zielcke <fzielcke@z-51.de> 
* util/grub.d/10_linux.in (linux_entry): Quote the arguments to
	printf and print a newline after the menuentry header line.
	* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
 2009-11-25 19:13:35 +01:00
Felix Zielcke
f022876b03 2009-11-25 Felix Zielcke <fzielcke@z-51.de> 
autoconf >= 2.60 support $(localedir).

	* INSTALL: Note that autoconf 2.60 is required.
	* configure.ac (AC_PREREQ): Bump to 2.60.
	* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased @localedir@.
	* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
 2009-11-25 18:37:04 +01:00
Carles Pina i Estany
0648f857ea Different changes following Robert's email 20091121230904.GA29740@thorin 2009-11-22 11:49:54 +00:00
Carles Pina i Estany
a239a5e9cc merge with Trunk 2009-11-21 21:05:15 +00:00
Felix Zielcke
0b787d0e99 2009-11-21 Felix Zielcke <fzielcke@z-51.de> 
Patch from Loïc Minier <loic.minier@ubuntu.com>.
	* util/grub.d/30_os-prober.in: Cope with Linux entries where
	root and /boot are on different devices.
 2009-11-21 15:41:46 +01:00
Colin Watson
242f0731c7 reimported savedefault by cjwatson and myself 
Also-By: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
 2009-11-20 09:41:20 +01:00
Carles Pina i Estany
fbc5e89710 Syncs with trunk 2009-11-19 21:18:38 +00:00
Robert Millan
37fb845ba6 2009-11-17 Robert Millan <rmh.grub@aybabtu.com> 
* INSTALL: Document Automake is needed for bootstrap.
        * po/ca.po: Fix PO-Revision-Date and Language-Team fields.
        * util/grub.d/10_kfreebsd.in (bindir): New variable.
        Add gettext initialization.
        (kfreebsd_entry): Make menuentry output translatable.
 2009-11-17 11:44:43 +00:00
Robert Millan
5dd39a2f3b Use proper path for gettext.sh and export TEXTDOMAINDIR. 2009-11-17 11:32:05 +00:00
Robert Millan
a1085f18c5 Gettextify. 2009-11-16 20:19:42 +00:00
Carles Pina i Estany
203ffbfa31 Adds gettext support in Grub. Building system needs to be improved and maybe userland utilites improved. 
YYYY-MM-DD  Carles Pina i Estany <carles@pina.cat>

	* Makefile.in: Add uptrans target to help to update .pot file
	* conf/common.rmk: Add grub-gettext_lib target, dependency and SOURCES, CFLAGS, LDFLAGS
	* kern/misc.c: Define grub_gettext symbol and add implement grub_gettext_dummy function
	* po/TODO: Temporary file with instructions of what Makefile.in will do
	* po/ca.po: Catalan translation stub
	* include/grub/misc.h: Define macro _(char *s). Declare grub_gettext_dummy and grub_gettext
	* gettext/gettext.c: New file with gettext implementation
	* normal/menu.c (print_message): add _( ) to some strings
	* util/grub.d/10_linux.in: include grub-gettext_lib file. For the Linux menuentry, call eval_gettext
	* util/grub.d/00_header.in: add locale_prefix and gettext locale detection and setting up the access to the mo directory
	* util/grub-mkconfig_lib.in: add get_locale_lang
	* util/grub-gettext_lib.in: new file
 2009-11-13 20:39:33 +00:00
fzielcke
246cd78f70 2009-11-03 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub.d/30_os-prober.in: Restore default behavior for unsupported
	OSes.
 2009-11-03 14:25:34 +00:00
robertmh
4f9dfb3701 2009-11-02 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub.d/30_os-prober.in: Add GNU/Hurd support
 2009-11-02 21:01:14 +00:00
robertmh
b82bd5e192 2009-11-02 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub.d/10_hurd.in: Drop /dev/ prefix from root device path before
        giving it to GNU Mach.
 2009-11-02 19:32:12 +00:00
robertmh
61697d9c70 2009-11-02 Samuel Thibault <samuel.thibault@ens-lyon.org> 
* util/grub.d/10_hurd.in: Call prepare_grub_to_access_device  
        ${GRUB_DEVICE_BOOT} before loading /boot kernel.
 2009-11-02 13:55:25 +00:00
cjwatson
e4f6809bbc 2009-10-26 Colin Watson <cjwatson@ubuntu.com> 
Improve grub-mkconfig performance when there are several menu
	entries on a single filesystem.

	* util/grub.d/10_linux.in (linux_entry): Cache the output of
	prepare_grub_to_access_device.
	* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
	* util/grub.d/30_os-prober.in: Likewise.
 2009-10-26 16:28:04 +00:00
robertmh
ba36be4119 2009-10-26 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_freebsd.in: Remove.
        * util/grub.d/10_kfreebsd.in: New file (based on 10_linux.in).
        * configure.ac: Set host_kernel=kfreebsd for FreeBSD and GNU/kFreeBSD.
 2009-10-26 00:41:58 +00:00
robertmh
67937d4dca 2009-10-26 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_freebsd.in: Remove.
        * util/grub.d/10_kfreebsd.in: New file (based on 10_linux.in).
        * configure.ac: Set host_kernel=kfreebsd for FreeBSD and GNU/kFreeBSD.
 2009-10-26 00:41:54 +00:00
robertmh
ee3756ccb3 2009-10-26 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/10_freebsd.in: Remove.
 2009-10-26 00:38:26 +00:00
robertmh
f669389090 2009-10-25 Robert Millan <rmh.grub@aybabtu.com> 
Patch from Samuel Thibault <samuel.thibault@ens-lyon.org>
        * docs/grub.cfg: Compensate for recent change in multiboot
        loader (since 2009-08-14 it won't pass filename to payload).
        * util/grub.d/10_hurd.in: Likewise.
 2009-10-24 23:03:02 +00:00
robertmh
035f712204 2009-10-15 Robert Millan <rmh.grub@aybabtu.com> 
Make entry text a bit more readable.

        * util/grub.d/10_linux.in: Add `with' before `Linux'.
 2009-10-15 20:34:27 +00:00
robertmh
9155bc1796 2009-10-14 Robert Millan <rmh.grub@aybabtu.com> 
Refer to kernel of FreeBSD "kFreeBSD" to avoid confusion between
        the Operating System (FreeBSD) and its kernel (kernel of FreeBSD).

        * loader/i386/bsd.c (grub_freebsd_boot): Read kernel environment
        from "kFreeBSD" namespace (rather than "FreeBSD").  Update all
        users.

        (GRUB_MOD_INIT (bsd)): Rename "freebsd" command to "kfreebsd",
        "openbsd" to "kopenbsd", "netbsd" to "knetbsd", "freebsd_loadenv"
        to "kfreebsd_loadenv", "freebsd_module" to "kfreebsd_module",
        and "freebsd_module_elf" to "kfreebsd_module_elf".  Update all
        users.
 2009-10-14 16:49:22 +00:00
cjwatson
a83d079b1e 2009-09-19 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/30_os-prober.in: Don't throw away stderr from
	  os-prober. Under normal operation, it does not print anything to
	  stderr; if it does, we need to debug it, and throwing away stderr
	  makes that excessively difficult.
 2009-09-19 14:15:00 +00:00
cjwatson
d52109a7a2 2009-09-14 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober
	output.
 2009-09-14 11:32:00 +00:00
robertmh
48d9bb0a93 2009-09-10 Robert Millan <rmh.grub@aybabtu.com> 
* util/grub.d/40_custom.in: Ask user to type custom entries below
        comment, rather than below 'exec tail' line.
 2009-09-10 12:53:25 +00:00
cjwatson
3b0521bed2 2009-09-10 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/40_custom.in: Make sure that the explanatory text is
	visible in grub.cfg.
 2009-09-10 12:44:24 +00:00
cjwatson
50051d5542 2009-09-10 Colin Watson <cjwatson@ubuntu.com> 
* util/grub.d/40_custom.in: Make it a little clearer how to use this
	file.
 2009-09-10 12:10:33 +00:00