Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalwareutils.git;a=commitdiff;h=68b8421fa24a13f7507d19be0e2adf854eccfed3
commit 68b8421fa24a13f7507d19be0e2adf854eccfed3
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Sat Nov 29 15:48:43 2008 +0100
grubconfig: fix for the case when /boot is raid1
reported by IroNiQ, thanks
diff --git a/libfwgrubconfig/libfwgrubconfig.c
b/libfwgrubconfig/libfwgrubconfig.c
index 89235ea..b0aab5f 100644
--- a/libfwgrubconfig/libfwgrubconfig.c
+++ b/libfwgrubconfig/libfwgrubconfig.c
@@ -625,7 +625,15 @@ void fwgrub_create_menu(FILE *fp)
fprintf(fp, "default=0\ntimeout=5\n");
snprintf(path, PATH_MAX, "%s/grub/message", entry.bootstr);
if(is_raid1_device(entry.rootdev))
- *(entry.grubbootdev) = '\0';
+ {
+ if (entry.grubbootdev)
+ // in case /boot is not on raid1, it is already
+ // allocated.
+ *(entry.grubbootdev) = '\0';
+ else
+ // otherwise just allocate an empty string
+ entry.grubbootdev = strdup("");
+ }
if(!stat(path, &buf))
fprintf(fp, "gfxmenu %s%s/grub/message\n\n", entry.grubbootdev, entry.bootstr);
entry.kernel = strdup("/vmlinuz");
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
