[Frugalware-git] frugalware-current: frugalwareutils-1.0.0-7-x86_64 * fix grubconfig from git

[James Buren]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=61de7dcf4f370ceec3f84093cdb2032fb33a3588

commit 61de7dcf4f370ceec3f84093cdb2032fb33a3588
Author: James Buren <ryuo at frugalware.org>
Date:   Wed Jul 4 20:33:16 2012 -0500

frugalwareutils-1.0.0-7-x86_64
* fix grubconfig from git

diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild
index 2961d20..94bb969 100644
--- a/source/base/frugalwareutils/FrugalBuild
+++ b/source/base/frugalwareutils/FrugalBuild
@@ -10,7 +10,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"}
pkgname=frugalwareutils
pkgver=1.0.0
Fuse $USE_DEVEL && pkgver=0.9.9.7.gb874e50
-pkgrel=6
+pkgrel=7
pkgdesc="Frugalware configuration utilities."
url="http://ftp.frugalware.org/pub/other/frugalwareutils"
depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=3.1' \
diff --git a/source/base/frugalwareutils/git.patch b/source/base/frugalwareutils/git.patch
index a44eac9..c51bee9 100644
--- a/source/base/frugalwareutils/git.patch
+++ b/source/base/frugalwareutils/git.patch
@@ -30,7 +30,7 @@ index d8a58d9..9812485 100644
$(INSTALL) -m644 netconfig/netconfig-rfkill.rules $(DESTDIR)$(libdir)/udev/rules.d/97-netconfig-rfkill.rules
$(INSTALL) -d $(DESTDIR)$(mandir)/man1
diff --git a/grubconfig/grubconfig.c b/grubconfig/grubconfig.c
-index 1751ad0..01b2cdd 100644
+index 1751ad0..1389258 100644
--- a/grubconfig/grubconfig.c
+++ b/grubconfig/grubconfig.c
@@ -37,8 +37,7 @@ enum fwgrub_install_mode ask_mode()
@@ -55,7 +55,7 @@ index 1751ad0..01b2cdd 100644
-		ret=FWGRUB_INSTALL_MBR_FIRST;
-	else if(!strcmp(ptr, _("Root")))
-		ret=FWGRUB_INSTALL_MBR_ROOT;
-+	if(!strcmp(ptr, _("Root")))
++	if(!strcmp(ptr, _("MBR")))
+		ret=FWGRUB_INSTALL_MBR;
else if(!strcmp(ptr, _("Skip")))
ret=-1;