From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VpDVk-0000Dk-Gi for mharc-grub-devel@gnu.org; Sat, 07 Dec 2013 03:45:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpDVa-00006R-Li for grub-devel@gnu.org; Sat, 07 Dec 2013 03:45:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpDVP-00053K-Pz for grub-devel@gnu.org; Sat, 07 Dec 2013 03:45:06 -0500 Received: from mail-la0-x22a.google.com ([2a00:1450:4010:c03::22a]:37943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpDVP-00053A-Hu for grub-devel@gnu.org; Sat, 07 Dec 2013 03:44:55 -0500 Received: by mail-la0-f42.google.com with SMTP id ec20so648622lab.15 for ; Sat, 07 Dec 2013 00:44:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=yDTPm0cMJUHsmWCq9Dma5/CmJLl5Ti7DWDnV/YG/a84=; b=AgZuiu63fSYkjRuvJIKxQDMxnkdI1JRZMMB7tPQ77q6Uzsx3vuABo99WAl1IZoTgir Qocg6g4tQ0VwEcND8hqVuTN3gvpbi4qFqKaLwRMLcRoGNPWxbU4tzX6zHzvaecAq0snC 8l2ihU4dTes6TTZhOoSX8Zj8/hj3yp+sGom1WPEdVn+Nr40boOCrkGbEZ8DjAqEF0DOf Dnk0rOL0HbHWkdUj2X7aKrW11eqxCmv5yuBxZqTJF6EKlTgtXb0mj14Z7gnkvyHIX7p5 1GXoYouXq2RYHrbIP2/ZPYJt0cEbuCQf7gtdfC6kl6aunuP10rqFllWXVnirq7LTHGBM oFZA== X-Received: by 10.152.44.202 with SMTP id g10mr2010964lam.16.1386405894464; Sat, 07 Dec 2013 00:44:54 -0800 (PST) Received: from localhost.localdomain (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id mv9sm1329363lbc.0.2013.12.07.00.44.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Dec 2013 00:44:53 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH 2/2] second attempt to fix using grub device name as install device Date: Sat, 7 Dec 2013 12:44:32 +0400 Message-Id: <1386405872-28362-2-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1386405872-28362-1-git-send-email-arvidjaar@gmail.com> References: <1386405872-28362-1-git-send-email-arvidjaar@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22a 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: Sat, 07 Dec 2013 08:45:15 -0000 grub-install already resolved passed install device to grub device. So do the same as grub-setup and strip parenthesis if we get legacy (hdX). --- ChangeLog | 4 ++-- util/grub-install.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b93db5e..161c568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2013-11-29 Andrey Borzenkov - Revert commit 69ca97c820, it cause failures in using OS device name - in grub-install. + Revert commit 69ca97c820, it caused failures when using OS device name + in grub-install. Instead just strip off parenthesis in grub-install if (hdX) was passed. 2013-12-06 Vladimir Serbinenko diff --git a/util/grub-install.c b/util/grub-install.c index 7a1db42..831c550 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1098,7 +1098,11 @@ main (int argc, char *argv[]) { if (install_device[0] == '(' && install_device[grub_strlen (install_device) - 1] == ')') - install_drive = xstrdup (install_device); + { + install_device[grub_strlen (install_device) - 1] = '\0'; + install_drive = xstrdup (install_device + 1); + install_device[grub_strlen (install_device) - 1] = ')'; + } else { grub_util_pull_device (install_device); -- 1.8.1.4