From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W5WUa-0000Bd-EV for mharc-grub-devel@gnu.org; Tue, 21 Jan 2014 03:15:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5WUP-0008Rn-PS for grub-devel@gnu.org; Tue, 21 Jan 2014 03:15:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5WUH-0006xi-BH for grub-devel@gnu.org; Tue, 21 Jan 2014 03:15:17 -0500 Received: from mail-ee0-x22d.google.com ([2a00:1450:4013:c00::22d]:59608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5WUH-0006xU-5F for grub-devel@gnu.org; Tue, 21 Jan 2014 03:15:09 -0500 Received: by mail-ee0-f45.google.com with SMTP id b15so3798620eek.32 for ; Tue, 21 Jan 2014 00:15:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=g3TnfWRdEEln8+6Wg/F5ldOYfpOkcUTJ6mN91P5vGBA=; b=0fMk3BYiGWHTF6cGDgww3UD9l0CGUbswRFHVVzLeHr2InjovC2Ck5O0F9qbcHvgHDH wkWCQnT3YHpKxJUyz40kRc4D5CXjP96FC4dIrqzqsu7VwUz/ebMtNmODB9Qq7dm+hYc5 RK5Fjw22V4ui8nv1ENWSyyvMZXR5c3Hgz48rm8Ge6xFlE/VKRFt+OUC3WDswwF+yVp9N 0geWWFcd//c2F7PkeOqFwK3Euvrtcm40bwkTNdmSfhiXSbHDcjk5doR6I+oYSFBk4cpa ZLOH9KJzxiJRdZa08tu4yziixqweobQwS/g6vaDwwGuUWo9iU7Q0wzar9kH89GqG5CcZ w/Aw== X-Received: by 10.14.32.67 with SMTP id n43mr22249678eea.17.1390292108432; Tue, 21 Jan 2014 00:15:08 -0800 (PST) Received: from [192.168.42.236] (83-224.197-178.cust.bluewin.ch. [178.197.224.83]) by mx.google.com with ESMTPSA id k41sm11944321eey.0.2014.01.21.00.15.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 00:15:07 -0800 (PST) Message-ID: <52DE1F7C.3080809@gmail.com> Date: Tue, 21 Jan 2014 08:19:24 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.2.0 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] normalize default prefix in grub-mkimage References: <1388166076-10718-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1388166076-10718-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Obkf0FiVR7jj3r3DgdSe2VJgB5mrs4E5v" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22d X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jan 2014 08:15:26 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Obkf0FiVR7jj3r3DgdSe2VJgB5mrs4E5v Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 27.12.2013 18:41, Andrey Borzenkov wrote: > This fixes bogus "C:\boot\grub" at runtime for Windows build as well as= > the case when /boot is on separate mount point for other systems. >=20 grub-mkimage shouldn't perform any FS-based resolving, that's job of the caller. This default should either be hardwired to "/"GRUB_BOOT_DIR_NAME"/"GRUB_DIR_NAME or perhaps even to "/boot/grub" or default should be killed altogether. > --- > util/grub-mkimage.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) >=20 > diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c > index a2bd4c1..4d54f0a 100644 > --- a/util/grub-mkimage.c > +++ b/util/grub-mkimage.c > @@ -84,6 +84,7 @@ static struct argp_option options[] =3D { > { 0, 0, 0, 0, 0, 0 } > }; > =20 > +static char *default_prefix; > #pragma GCC diagnostic ignored "-Wformat-nonliteral" > =20 > static char * > @@ -94,7 +95,7 @@ help_filter (int key, const char *text, void *input _= _attribute__ ((unused))) > case 'd': > return xasprintf (text, grub_util_get_pkglibdir ()); > case 'p': > - return xasprintf (text, DEFAULT_DIRECTORY); > + return xasprintf (text, default_prefix); > case 'O': > { > char *formats =3D grub_install_get_image_targets_string (), *ret; > @@ -245,6 +246,7 @@ main (int argc, char *argv[]) > =20 > grub_util_host_init (&argc, &argv); > =20 > + default_prefix =3D grub_make_system_path_relative_to_its_root (DEFAU= LT_DIRECTORY); > memset (&arguments, 0, sizeof (struct arguments)); > arguments.comp =3D GRUB_COMPRESSION_AUTO; > arguments.modules_max =3D argc + 1; > @@ -252,6 +254,7 @@ main (int argc, char *argv[]) > * sizeof (arguments.modules[0])); > memset (arguments.modules, 0, (arguments.modules_max + 1) > * sizeof (arguments.modules[0])); > + arguments.prefix =3D xstrdup (default_prefix); > =20 > if (argp_parse (&argp, argc, argv, 0, 0, &arguments) !=3D 0) > { > @@ -287,8 +290,7 @@ main (int argc, char *argv[]) > strcpy (ptr, dn); > } > =20 > - grub_install_generate_image (arguments.dir, > - arguments.prefix ? : DEFAULT_DIRECTORY, fp, > + grub_install_generate_image (arguments.dir, arguments.prefix, fp, > arguments.output, arguments.modules, > arguments.memdisk, arguments.pubkeys, > arguments.npubkeys, arguments.config, > @@ -298,6 +300,8 @@ main (int argc, char *argv[]) > grub_util_file_sync (fp); > fclose (fp); > =20 > + free (default_prefix); > + > if (arguments.dir) > free (arguments.dir); > =20 >=20 --Obkf0FiVR7jj3r3DgdSe2VJgB5mrs4E5v Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlLeH3wACgkQmBXlbbo5nOvd/AD/eMwsoK1HwWOQa4yT8lFBA54F m04MZsGbkndQ0Vdyd2YBAKr2Vx4h66NqcM1SA12TeFHTSeF6nC6EtFeNFBXwCA3f =MQsN -----END PGP SIGNATURE----- --Obkf0FiVR7jj3r3DgdSe2VJgB5mrs4E5v--