Colin Watson
6d1e76899b
fix changelog dates
2010-01-14 14:06:36 +00:00
Colin Watson
7d1468e4b6
merge from trunk
2010-01-14 14:04:44 +00:00
Colin Watson
a788afb626
2010-01-11 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-install.in (usage): Clarify meaning of --root-directory,
and make it clearer that it's optional. Based on confusion
witnessed on IRC.
2010-01-11 12:00:57 +00:00
Colin Watson
3bff18c5c6
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
...
* util/mkisofs/write.c (padblock_write): Switch size and nmemb
arguments to fread so that we get a return value in bytes, rather
than something that will normally be rounded down to 0.
Adjust error handling to avoid producing garbage when size_t is not
the same size as long long.
2010-01-05 16:09:02 +00:00
Colin Watson
a136811886
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
...
* util/mkisofs/write.c (padblock_write): Check return value of
fread.
2010-01-05 12:40:30 +00:00
Colin Watson
cf2fd2a6d1
2010-10-05 Jordan Uggla <jordan.uggla@gmail.com>
...
2010-10-05 Colin Watson <cjwatson@ubuntu.com >
* util/grub-reboot.in: Make sure prev_saved_entry always gets a
non-empty value.
2010-01-05 11:16:42 +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
fcab4f04e5
missing backslash
2010-01-05 10:39:30 +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
Colin Watson
e2d70b5cea
2010-01-03 Colin Watson <cjwatson@ubuntu.com>
...
* include/grub/misc.h (GNUC_PREREQ): New macro.
(ATTRIBUTE_ERROR): New macro.
* include/grub/list.h (grub_bad_type_cast_real): Use
ATTRIBUTE_ERROR.
2010-01-03 21:50:53 +00:00
Colin Watson
da8d5c53e9
2010-01-02 Colin Watson <cjwatson@ubuntu.com>
...
* term/i386/pc/at_keyboard.c
(keyboard_controller_wait_untill_ready): Rename to ...
(keyboard_controller_wait_until_ready): ... this. Update all users.
2010-01-02 15:19:57 +00:00
Colin Watson
c631d9fb17
2009-12-09 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-mkconfig_lib.in: Don't set grub_probe or grub_mkrelpath
if they're already set. This resolves the conflict between my
grub-install change on 2009-10-06 and Felix' change on 2009-11-11,
fixing the --grub-probe option again.
* util/sparc64/ieee1275/grub-install.in: Revert the last piece of my
change on 2009-10-06, so that we now once again source
`${libdir}/grub/grub-mkconfig_lib' after options have been parsed.
2009-12-09 16:20:17 +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
47075ea3c7
2009-12-08 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-reboot.in: Fix --version output.
* util/grub-set-default.in: Likewise.
2009-12-08 01:00:26 +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
Colin Watson
d6ceebf1d9
2009-12-07 Colin Watson <cjwatson@ubuntu.com>
...
* configure.ac: Check for vasprintf.
* util/misc.c (asprintf): Move allocation from here ...
(vasprintf): ... to here. New function.
(xasprintf): New function.
* include/grub/util/misc.h (vasprintf, xasprintf): Add
prototypes.
* util/getroot.c (grub_util_get_grub_dev): Use xasprintf.
* util/grub-mkfont.c (write_font): Likewise.
* util/grub-probe.c (probe): Likewise.
* util/hostdisk.c (make_device_name): Likewise.
2009-12-07 16:46:24 +00: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