From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1LThj3-0006Vy-Nj for mharc-grub-devel@gnu.org; Sun, 01 Feb 2009 14:11:25 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LThj1-0006Tm-R5 for grub-devel@gnu.org; Sun, 01 Feb 2009 14:11:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LThiz-0006RF-5h for grub-devel@gnu.org; Sun, 01 Feb 2009 14:11:23 -0500 Received: from [199.232.76.173] (port=54018 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LThiz-0006RA-0g for grub-devel@gnu.org; Sun, 01 Feb 2009 14:11:21 -0500 Received: from fg-out-1718.google.com ([72.14.220.156]:32306) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LThiy-0007Cg-HD for grub-devel@gnu.org; Sun, 01 Feb 2009 14:11:20 -0500 Received: by fg-out-1718.google.com with SMTP id l27so494341fgb.30 for ; Sun, 01 Feb 2009 11:11:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :content-type; bh=+a+nUY9ZEy2Ag4JYIeo8uencnqXX4wZRwEQvd7vDgWU=; b=fRVukjTTR41H+Db0l0eCwUbU8aBweDv7Q0200kM840iMZy5LOln9alQ3XYVjXI/dOy wO8U/eVtuLnlp26dtjI2WfekfOat8b4R3k1vGdowIbAAkR/S/B1S+mHuKiVYHY+n30Hh liwRIZyP7E9RVCdHGE59vAn3lb51UYNax2NUs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; b=PJ7MFGRPKKBIKlRpw+ilbhNFKeuhSGhzyzqfG2WE59O9yBfSzPWjdKHxWUS/ZptQRP n3bAHtZ7A1ORJOSfnwjEqU3XrU/eZbeV/Ew0g1LYMkDpAsH3qEJFmY91UhHiCSmk7ETO GRJk6FVm++mG7N62Xko58F7wTiHF8lZD3iBf8= Received: by 10.86.100.19 with SMTP id x19mr1871241fgb.18.1233515479509; Sun, 01 Feb 2009 11:11:19 -0800 (PST) Received: from ?192.168.1.25? (84-160.62-81.cust.bluewin.ch [81.62.160.84]) by mx.google.com with ESMTPS id l12sm32833fgb.41.2009.02.01.11.11.17 (version=SSLv3 cipher=RC4-MD5); Sun, 01 Feb 2009 11:11:18 -0800 (PST) Message-ID: <4985F3D2.4010308@gmail.com> Date: Sun, 01 Feb 2009 20:11:14 +0100 From: phcoder User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: The development of GRUB 2 References: <4984E8DE.2090608@gmail.com> In-Reply-To: <4984E8DE.2090608@gmail.com> Content-Type: multipart/mixed; boundary="------------080003020207070608090808" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: [PATCH] Allow to install in non-default prefixes X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2009 19:11:24 -0000 This is a multi-part message in MIME format. --------------080003020207070608090808 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit After speaking with daChaac on IRC some problems with patch were identified. Fixed now Thanks daChaac. phcoder phcoder wrote: > This patch adds -p option for grub-setup on i386-pc. Without it install > to any prefix different from /boot/grub failed > Thank > Vladimir 'phcoder' Serbinenko > --------------080003020207070608090808 Content-Type: text/plain; name="prefpatch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="prefpatch" Index: ChangeLog =================================================================== --- ChangeLog (revision 1966) +++ ChangeLog (working copy) @@ -1,3 +1,9 @@ +2009-02-01 Vladimir Serbinenko + + Add prefix option for grub-setup + + * util/i386/pc/grub-setup.c (grub_video_vbe_scroll): Add -p option. + 2009-02-01 Vesa Jääskeläinen Base on patch on bug #24154 created by Tomas Tintera Index: util/i386/pc/grub-setup.c =================================================================== --- util/i386/pc/grub-setup.c (revision 1966) +++ util/i386/pc/grub-setup.c (working copy) @@ -94,6 +94,7 @@ static void setup (const char *dir, + const char *prefix_dir, const char *boot_file, const char *core_file, const char *root, const char *dest, int must_embed) { @@ -373,7 +374,7 @@ /* Make sure that GRUB reads the identical image as the OS. */ tmp_img = xmalloc (core_size); - core_path_dev = grub_util_get_path (DEFAULT_DIRECTORY, core_file); + core_path_dev = grub_util_get_path (prefix_dir, core_file); /* It is a Good Thing to sync two times. */ sync (); @@ -540,6 +541,7 @@ -b, --boot-image=FILE use FILE as the boot image [default=%s]\n\ -c, --core-image=FILE use FILE as the core image [default=%s]\n\ -d, --directory=DIR use GRUB files in the directory DIR [default=%s]\n\ + -p, --prefix=DIR specify the name of GRUB directory relative to partition root [default=%s]\n \ -m, --device-map=FILE use FILE as the device map [default=%s]\n\ -r, --root-device=DEV use DEV as the root device [default=guessed]\n\ -h, --help display this message and exit\n\ @@ -548,7 +550,8 @@ \n\ Report bugs to <%s>.\n\ ", - DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY, + DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY, + DEFAULT_DIRECTORY, DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT); exit (status); @@ -575,6 +578,7 @@ char *dev_map = 0; char *root_dev = 0; char *dest_dev; + char *prefix_dir = 0; int must_embed = 0; progname = "grub-setup"; @@ -582,7 +586,7 @@ /* Check for options. */ while (1) { - int c = getopt_long (argc, argv, "b:c:d:m:r:hVv", options, 0); + int c = getopt_long (argc, argv, "p:b:c:d:m:r:hVv", options, 0); if (c == -1) break; @@ -603,6 +607,13 @@ core_file = xstrdup (optarg); break; + case 'p': + if (prefix_dir) + free (prefix_dir); + + prefix_dir = xstrdup (optarg); + break; + case 'd': if (dir) free (dir); @@ -723,6 +734,7 @@ for (i = 0; devicelist[i]; i++) { setup (dir ? : DEFAULT_DIRECTORY, + prefix_dir ? : DEFAULT_DIRECTORY, boot_file ? : DEFAULT_BOOT_FILE, core_file ? : DEFAULT_CORE_FILE, root_dev, grub_util_get_grub_dev (devicelist[i]), 1); @@ -732,6 +744,7 @@ #endif /* Do the real work. */ setup (dir ? : DEFAULT_DIRECTORY, + prefix_dir ? : DEFAULT_DIRECTORY, boot_file ? : DEFAULT_BOOT_FILE, core_file ? : DEFAULT_CORE_FILE, root_dev, dest_dev, must_embed); @@ -743,6 +756,7 @@ free (boot_file); free (core_file); free (dir); + free (prefix_dir); free (dev_map); free (root_dev); free (dest_dev); --------------080003020207070608090808--