From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1W5eVb-0003KI-In for mharc-grub-devel@gnu.org; Tue, 21 Jan 2014 11:49:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5eVQ-0003Fp-VM for grub-devel@gnu.org; Tue, 21 Jan 2014 11:49:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5eVI-0000QQ-Hj for grub-devel@gnu.org; Tue, 21 Jan 2014 11:48:52 -0500 Received: from mail-lb0-x22b.google.com ([2a00:1450:4010:c04::22b]:63903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5eVI-0000QE-9J for grub-devel@gnu.org; Tue, 21 Jan 2014 11:48:44 -0500 Received: by mail-lb0-f171.google.com with SMTP id c11so6118840lbj.16 for ; Tue, 21 Jan 2014 08:48:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:in-reply-to:references:mime-version :content-type; bh=l34M6XnQN+IZpTi4Nkk/DdNF0qZu720KxaMjFdabjpY=; b=sfWxlr+Wb69pSouBN0w1swCJSPmetWy4VItGii2DFbStzDsXFi4dDjQLVHotbm86Fc Fp3FyQXYgVUC/kQnoS8qV64Gq9sL0UQ0X5gCwB9BbeRhbhJfPYtDXxCdqYh88BYjSmDx CZeTCyDBse9zYgX+vnxNYag7Pg/1k/nKwadqKvvzMU9tENmiRQ8GZhI3Wl7diLDd/vYJ X2Qd6tZg6aJ3onEBL82dEM5EkBvL+FIjWrB89j9FfQsQqdiEOzZDX0Xd1vfxQN8PA6MD 3iGXgF++0ndf/1h3h61JTP7b0vxsoCPU+oShTedc/roZB5Yz5UnyZ4ZYSuBXlQtBht/R I1Rg== X-Received: by 10.152.28.137 with SMTP id b9mr17068563lah.4.1390322922982; Tue, 21 Jan 2014 08:48:42 -0800 (PST) Received: from opensuse.site (ppp91-76-154-95.pppoe.mtu-net.ru. [91.76.154.95]) by mx.google.com with ESMTPSA id n13sm4590782lbl.17.2014.01.21.08.48.42 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 21 Jan 2014 08:48:42 -0800 (PST) Date: Tue, 21 Jan 2014 20:48:41 +0400 From: Andrey Borzenkov To: grub-devel@gnu.org Subject: Re: [PATCH] normalize default prefix in grub-mkimage Message-ID: <20140121204841.0c0ae8af@opensuse.site> In-Reply-To: <52DE1F7C.3080809@gmail.com> References: <1388166076-10718-1-git-send-email-arvidjaar@gmail.com> <52DE1F7C.3080809@gmail.com> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.22; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/iRrgw/Jgjr3G3ZWcALYP30R"; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22b 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 16:49:01 -0000 --Sig_/iRrgw/Jgjr3G3ZWcALYP30R Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable =D0=92 Tue, 21 Jan 2014 08:19:24 +0100 Vladimir '=CF=86-coder/phcoder' Serbinenko =D0=BF=D0=B8= =D1=88=D0=B5=D1=82: > 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. I prefer the latter. Any default will most likely be wrong, so it is better to be explicit about it. From: Andrey Borzenkov Subject: [PATCH] do not set default prefix in grub-mkimage Default prefix is likely wrong on Unix and completely wrong on Windows. Let caller set it explicitly to avoid any ambiguity. --- util/grub-mkimage.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c index a2bd4c1..1e0bcf1 100644 --- a/util/grub-mkimage.c +++ b/util/grub-mkimage.c @@ -64,7 +64,7 @@ static struct argp_option options[] =3D { {"directory", 'd', N_("DIR"), 0, /* TRANSLATORS: platform here isn't identifier. It can be translated. = */ N_("use images and modules under DIR [default=3D%s/]"), 0}, - {"prefix", 'p', N_("DIR"), 0, N_("set prefix directory [default=3D%s]")= , 0}, + {"prefix", 'p', N_("DIR"), 0, N_("set prefix directory"), 0}, {"memdisk", 'm', N_("FILE"), 0, /* TRANSLATORS: "memdisk" here isn't an identifier, it can be translate= d. "embed" is a verb (command description). "*/ @@ -93,8 +93,6 @@ help_filter (int key, const char *text, void *input __att= ribute__ ((unused))) { case 'd': return xasprintf (text, grub_util_get_pkglibdir ()); - case 'p': - return xasprintf (text, DEFAULT_DIRECTORY); case 'O': { char *formats =3D grub_install_get_image_targets_string (), *ret; @@ -268,6 +266,15 @@ main (int argc, char *argv[]) exit(1); } =20 + if (!arguments.prefix) + { + char *program =3D xstrdup(program_name); + printf ("%s\n", _("Prefix not specified (use the -p option).")); + argp_help (&argp, stderr, ARGP_HELP_STD_USAGE, program); + free (program); + exit(1); + } + if (arguments.output) { fp =3D grub_util_fopen (arguments.output, "wb"); @@ -287,8 +294,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, --=20 tg: (443b322..) u/mingw/default-prefix (depends on: master) --Sig_/iRrgw/Jgjr3G3ZWcALYP30R Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlLepOkACgkQR6LMutpd94x+mgCg1WKL0GF8xid0KOQh3X//ahoX KYoAn1+0ZUc6fGeYLMpUwFhD0f+Qm6pk =hnIU -----END PGP SIGNATURE----- --Sig_/iRrgw/Jgjr3G3ZWcALYP30R--