From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RtGh0-0005EX-32 for mharc-grub-devel@gnu.org; Fri, 03 Feb 2012 05:48:34 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtGgw-0005E4-1L for grub-devel@gnu.org; Fri, 03 Feb 2012 05:48:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtGgp-0002mB-QQ for grub-devel@gnu.org; Fri, 03 Feb 2012 05:48:30 -0500 Received: from mail-we0-f169.google.com ([74.125.82.169]:50171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtGgp-0002lr-H0 for grub-devel@gnu.org; Fri, 03 Feb 2012 05:48:23 -0500 Received: by wera13 with SMTP id a13so3342215wer.0 for ; Fri, 03 Feb 2012 02:48:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=8MW94nXFJ6hKUARahTsRzcRRVdNOdv+vWSPiYCCR/P4=; b=KM+8/KVQ5mT5aYpDJVrQ9/eReFXNj6jzjkU1rOPGe8/aA60esFSKp+ZrWbyfsA5AAj MI7Neme7E9dNylUn3JHDNr9+lmlIh2A/hV+NE46MlvZDntmPmq7tkTClZYLTallP7az6 uqWPQCJ3jiI8zLHc1lIwXZTwENpU4m+X47eEs= Received: by 10.180.96.230 with SMTP id dv6mr10545121wib.11.1328266101823; Fri, 03 Feb 2012 02:48:21 -0800 (PST) Received: from [192.168.1.37] ([88.160.112.182]) by mx.google.com with ESMTPS id y1sm16137264wiw.6.2012.02.03.02.48.20 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Feb 2012 02:48:21 -0800 (PST) Message-ID: <4F2BBB72.2060507@gmail.com> Date: Fri, 03 Feb 2012 11:48:18 +0100 From: =?ISO-8859-1?Q?Gr=E9goire_Sutre?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111114 Iceowl/1.0b2 Icedove/3.1.16 MIME-Version: 1.0 To: The development of GNU GRUB Subject: [PATCH] NetBSD disk wedge support Content-Type: multipart/mixed; boundary="------------000602040807030000060801" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.169 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: Fri, 03 Feb 2012 10:48:31 -0000 This is a multi-part message in MIME format. --------------000602040807030000060801 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit The attached patch makes it possible to install GRUB from NetBSD on a GPT partition. Those are available as so-called disk wedges on NetBSD (see [1]). Tested under NetBSD -current. Grégoire [1] http://netbsd.gw.com/cgi-bin/man-cgi?dk++NetBSD-current --------------000602040807030000060801 Content-Type: text/x-patch; name="patch-wedge.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-wedge.diff" === modified file 'grub-core/kern/emu/hostdisk.c' --- grub-core/kern/emu/hostdisk.c 2012-01-29 20:49:44 +0000 +++ grub-core/kern/emu/hostdisk.c 2012-02-03 09:37:01 +0000 @@ -98,10 +98,11 @@ struct hd_geometry #if defined(__NetBSD__) # define HAVE_DIOCGDINFO # include # include /* struct disklabel */ +# include /* struct dkwedge_info */ #else /* !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) */ # undef HAVE_DIOCGDINFO #endif /* defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */ #if defined(__NetBSD__) @@ -481,10 +482,13 @@ grub_hostdisk_find_partition_start (cons #ifdef __sun__ struct extpart_info pinfo; # elif !defined(HAVE_DIOCGDINFO) struct hd_geometry hdg; # else /* defined(HAVE_DIOCGDINFO) */ +# if defined(__NetBSD__) + struct dkwedge_info dkw; +# endif /* defined(__NetBSD__) */ struct disklabel label; int p_index; # endif /* !defined(HAVE_DIOCGDINFO) */ # ifdef HAVE_DEVICE_MAPPER @@ -572,10 +576,16 @@ devmapper_fail: # elif !defined(HAVE_DIOCGDINFO) if (ioctl (fd, HDIO_GETGEO, &hdg)) # else /* defined(HAVE_DIOCGDINFO) */ # if defined(__NetBSD__) configure_device_driver (fd); + /* First handle the case of disk wedges. */ + if (ioctl (fd, DIOCGWEDGEINFO, &dkw) == 0) + { + close (fd); + return (grub_disk_addr_t) dkw.dkw_offset; + } # endif /* defined(__NetBSD__) */ if (ioctl (fd, DIOCGDINFO, &label) == -1) # endif /* !defined(HAVE_DIOCGDINFO) */ { grub_error (GRUB_ERR_BAD_DEVICE, === modified file 'util/getroot.c' --- util/getroot.c 2012-02-03 10:02:06 +0000 +++ util/getroot.c 2012-02-03 10:25:17 +0000 @@ -122,10 +122,11 @@ #if defined(__NetBSD__) # define HAVE_DIOCGDINFO # include # include /* struct disklabel */ +# include /* struct dkwedge_info */ #else /* !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) */ # undef HAVE_DIOCGDINFO #endif /* defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */ #if defined(__NetBSD__) @@ -1712,35 +1713,64 @@ devmapper_out: } } return path; #elif defined(__NetBSD__) - /* NetBSD uses "/dev/r[a-z]+[0-9][a-z]". */ - char *path = xstrdup (os_dev); - if (strncmp ("/dev/r", path, sizeof("/dev/r") - 1) == 0 && - (path[sizeof("/dev/r") - 1] >= 'a' && path[sizeof("/dev/r") - 1] <= 'z') && - strncmp ("fd", path + sizeof("/dev/r") - 1, sizeof("fd") - 1) != 0) /* not a floppy device name */ + int rawpart = -1; +# ifdef HAVE_GETRAWPARTITION + rawpart = getrawpartition(); +# endif /* HAVE_GETRAWPARTITION */ + if (rawpart < 0) + return xstrdup (os_dev); + + /* NetBSD disk wedges are of the form "/dev/rdk.*". */ + if (strncmp ("/dev/rdk", os_dev, sizeof("/dev/rdk") - 1) == 0) + { + struct dkwedge_info dkw; + int fd; + + fd = open (os_dev, O_RDONLY); + if (fd == -1) + { + grub_error (GRUB_ERR_BAD_DEVICE, + "cannot open `%s' while attempting to get disk wedge info", os_dev); + return xstrdup (os_dev); + } + /* We don't call configure_device_driver since this isn't a floppy device name. */ + if (ioctl (fd, DIOCGWEDGEINFO, &dkw) == -1) + { + grub_error (GRUB_ERR_BAD_DEVICE, + "cannot get disk wedge info of `%s'", os_dev); + close (fd); + return xstrdup (os_dev); + } + close (fd); + return xasprintf ("/dev/r%s%c", dkw.dkw_parent, 'a' + rawpart); + } + + /* NetBSD (disk label) partitions are of the form "/dev/r[a-z]+[0-9][a-z]". */ + if (strncmp ("/dev/r", os_dev, sizeof("/dev/r") - 1) == 0 && + (os_dev[sizeof("/dev/r") - 1] >= 'a' && os_dev[sizeof("/dev/r") - 1] <= 'z') && + strncmp ("fd", os_dev + sizeof("/dev/r") - 1, sizeof("fd") - 1) != 0) /* not a floppy device name */ { + char *path = xstrdup (os_dev); char *p; for (p = path + sizeof("/dev/r"); *p >= 'a' && *p <= 'z'; p++); if (grub_isdigit(*p)) { p++; if ((*p >= 'a' && *p <= 'z') && (*(p+1) == '\0')) { /* path matches the required regular expression and p points to its last character. */ - int rawpart = -1; -# ifdef HAVE_GETRAWPARTITION - rawpart = getrawpartition(); -# endif /* HAVE_GETRAWPARTITION */ - if (rawpart >= 0) - *p = 'a' + rawpart; + *p = 'a' + rawpart; } - } + } + return path; } - return path; + + return xstrdup (os_dev); #elif defined (__sun__) char *colon = grub_strrchr (os_dev, ':'); if (grub_memcmp (os_dev, "/devices", sizeof ("/devices") - 1) == 0 && colon) --------------000602040807030000060801 Content-Type: text/plain; name="ChangeLog.wedge" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="ChangeLog.wedge" 2012-02-03 Grégoire Sutre NetBSD disk wedge support. * grub-core/kern/emu/hostdisk.c (grub_hostdisk_find_partition_start) [__NetBSD__]: Handle NetBSD disk wedges. * util/getroot.c (convert_system_partition_to_system_disk) [__NetBSD__]: Likewise. --------------000602040807030000060801--