Skip to contentSkip to conversation

hfs+ uuid

PATCH In review Vladimir 'phcoder' Serbinenko 2 participants 11 messages May 3, 2009 – Jun 15, 2009 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hfs+ uuid

This is a patch to support UUIDs on HFS+. MD5 code is copied from Michael Gorven's patch which is copied from libgcrypt nearly verbatim. Thanks for Cris for the info about how xnu expects UUID to be

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko
commands/xnu_uuid.c new file +436 -0
new file mode 100644
index 0000000..10429d1
@@ -0,0 +1,436 @@
+/* xnu_uuid.c - transform 64-bit serial number 
+   to 128-bit uuid suitable for xnu. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1995,1996,1998,1999,2001,2002,
+ *                2003, 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/device.h>
+#include <grub/disk.h>
+#include <grub/fs.h>
+#include <grub/file.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/command.h>
+
+struct tohash
+{
+  grub_uint8_t prefix[16];
+  grub_uint64_t serial;
+} __attribute__ ((packed));
+
+/* This prefix is used by xnu and boot-132 to hash 
+   together with volume serial. */
+static grub_uint8_t hash_prefix[16] 
+  = {0xB3, 0xE2, 0x0F, 0x39, 0xF2, 0x92, 0x11, 0xD6, 
+     0x97, 0xA4, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC};
+
+#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+#define ror(x,n) ( ((x) >> (n)) | ((x) << (32-(n))) )
+
+typedef struct {
+  grub_uint32_t A,B,C,D;	  /* chaining variables */
+  grub_uint32_t  nblocks;
+  grub_uint8_t buf[64];
+  int  count;
+} MD5_CONTEXT;
+
+static void
+md5_init( void *context )
+{
+  MD5_CONTEXT *ctx = context;
+
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
+
+  ctx->nblocks = 0;
+  ctx->count = 0;
+}
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+
+/****************
+ * transform n*64 grub_uint8_ts
+ */
+static void
+transform ( MD5_CONTEXT *ctx, const unsigned char *data )
+{
+  grub_uint32_t correct_words[16];
+  register grub_uint32_t A = ctx->A;
+  register grub_uint32_t B = ctx->B;
+  register grub_uint32_t C = ctx->C;
+  register grub_uint32_t D = ctx->D;
+  grub_uint32_t *cwp = correct_words;
+
+#ifdef WORDS_BIGENDIAN
+  { 
+    int i;
+    grub_uint8_t *p2, *p1;
+    for(i=0, p1=data, p2=(grub_uint8_t*)correct_words; i < 16; i++, p2 += 4 )
+    {
+      p2[3] = *p1++;
+      p2[2] = *p1++;
+      p2[1] = *p1++;
+      p2[0] = *p1++;
+    }
+  }
+#else
+  memcpy( correct_words, data, 64 );
+#endif
+
+#define OP(a, b, c, d, s, T) \
+  do			         	   \
+  {					   \
+    a += FF (b, c, d) + (*cwp++) + T;    \
+    a = rol(a, s);			   \
+    a += b;				   \
+  }					   \
+  while (0)
+
+  /* Before we start, one word about the strange constants.
+     They are defined in RFC 1321 as
+
+     T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+     */
+
+  /* Round 1.  */
+  OP (A, B, C, D,  7, 0xd76aa478);
+  OP (D, A, B, C, 12, 0xe8c7b756);
+  OP (C, D, A, B, 17, 0x242070db);
+  OP (B, C, D, A, 22, 0xc1bdceee);
+  OP (A, B, C, D,  7, 0xf57c0faf);
+  OP (D, A, B, C, 12, 0x4787c62a);
+  OP (C, D, A, B, 17, 0xa8304613);
+  OP (B, C, D, A, 22, 0xfd469501);
+  OP (A, B, C, D,  7, 0x698098d8);
+  OP (D, A, B, C, 12, 0x8b44f7af);
+  OP (C, D, A, B, 17, 0xffff5bb1);
+  OP (B, C, D, A, 22, 0x895cd7be);
+  OP (A, B, C, D,  7, 0x6b901122);
+  OP (D, A, B, C, 12, 0xfd987193);
+  OP (C, D, A, B, 17, 0xa679438e);
+  OP (B, C, D, A, 22, 0x49b40821);
+
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)  \
+  do								      \
+  { 							      \
+    a += f (b, c, d) + correct_words[k] + T;		      \
+    a = rol(a, s);						      \
+    a += b; 						      \
+  } 							      \
+  while (0)
+
+  /* Round 2.  */
+  OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
+  OP (FG, D, A, B, C,  6,  9, 0xc040b340);
+  OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+  OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
+  OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
+  OP (FG, D, A, B, C, 10,  9, 0x02441453);
+  OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+  OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
+  OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
+  OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
+  OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
+  OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
+  OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
+  OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
+  OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
+  OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+  /* Round 3.  */
+  OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
+  OP (FH, D, A, B, C,  8, 11, 0x8771f681);
+  OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+  OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+  OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
+  OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
+  OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
+  OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+  OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
+  OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
+  OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
+  OP (FH, B, C, D, A,  6, 23, 0x04881d05);
+  OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
+  OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+  OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+  OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
+
+  /* Round 4.  */
+  OP (FI, A, B, C, D,  0,  6, 0xf4292244);
+  OP (FI, D, A, B, C,  7, 10, 0x432aff97);
+  OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+  OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
+  OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
+  OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
+  OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+  OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
+  OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
+  OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+  OP (FI, C, D, A, B,  6, 15, 0xa3014314);
+  OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+  OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
+  OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+  OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
+  OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
+
+  /* Put checksum in context given as argument.  */
+  ctx->A += A;
+  ctx->B += B;
+  ctx->C += C;
+  ctx->D += D;
+}
+
+/* The routine updates the message-digest context to
+ * account for the presence of each of the characters inBuf[0..inLen-1]
+ * in the message whose digest is being computed.
+ */
+static void
+md5_write( void *context, const void *inbuf_arg , grub_size_t inlen)
+{
+  const unsigned char *inbuf = inbuf_arg;
+  MD5_CONTEXT *hd = context;
+
+  if( hd->count == 64 )  /* flush the buffer */
+  {
+    transform( hd, hd->buf );
+    //      _gcry_burn_stack (80+6*sizeof(void*));
+    hd->count = 0;
+    hd->nblocks++;
+  }
+  if( !inbuf )
+    return;
+
+  if( hd->count )
+  {
+    for( ; inlen && hd->count < 64; inlen-- )
+      hd->buf[hd->count++] = *inbuf++;
+    md5_write( hd, NULL, 0 );
+    if( !inlen )
+      return;
+  }
+  //  _gcry_burn_stack (80+6*sizeof(void*));
+
+  while( inlen >= 64 ) 
+  {
+    transform( hd, inbuf );
+    hd->count = 0;
+    hd->nblocks++;
+    inlen -= 64;
+    inbuf += 64;
+  }
+  for( ; inlen && hd->count < 64; inlen-- )
+    hd->buf[hd->count++] = *inbuf++;
+
+}
+
+
+
+/* The routine final terminates the message-digest computation and
+ * ends with the desired message digest in mdContext->digest[0...15].
+ * The handle is prepared for a new MD5 cycle.
+ * Returns 16 grub_uint8_ts representing the digest.
+ */
+static void
+md5_final( void *context)
+{
+  MD5_CONTEXT *hd = context;
+  grub_uint32_t t, msb, lsb;
+  grub_uint8_t *p;
+
+  md5_write(hd, NULL, 0); /* flush */;
+
+  t = hd->nblocks;
+  /* multiply by 64 to make a grub_uint8_t count */
+  lsb = t << 6;
+  msb = t >> 26;
+  /* add the count */
+  t = lsb;
+  if( (lsb += hd->count) < t )
+    msb++;
+  /* multiply by 8 to make a bit count */
+  t = lsb;
+  lsb <<= 3;
+  msb <<= 3;
+  msb |= t >> 29;
+
+  if( hd->count < 56 )  /* enough room */
+  {
+    hd->buf[hd->count++] = 0x80; /* pad */
+    while( hd->count < 56 )
+      hd->buf[hd->count++] = 0;  /* pad */
+  }
+  else  /* need one extra block */
+  {
+    hd->buf[hd->count++] = 0x80; /* pad character */
+    while( hd->count < 64 )
+      hd->buf[hd->count++] = 0;
+    md5_write(hd, NULL, 0);  /* flush */;
+    grub_memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
+  }
+  /* append the 64 bit count */
+  hd->buf[56] = lsb	   ;
+  hd->buf[57] = lsb >>  8;
+  hd->buf[58] = lsb >> 16;
+  hd->buf[59] = lsb >> 24;
+  hd->buf[60] = msb	   ;
+  hd->buf[61] = msb >>  8;
+  hd->buf[62] = msb >> 16;
+  hd->buf[63] = msb >> 24;
+  transform( hd, hd->buf );
+  //  _gcry_burn_stack (80+6*sizeof(void*));
+
+  p = hd->buf;
+#ifdef WORDS_BIGENDIAN
+#define X(a) do { *p++ = hd->a      ; *p++ = hd->a >> 8;      \
+  *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
+#else /* little endian */
+#define X(a) do { *(grub_uint32_t*)p = (*hd).a ; p += 4; } while(0)
+#endif
+  X(A);
+  X(B);
+  X(C);
+  X(D);
+#undef X
+
+}
+
+/**
+ * GRUB2 Crypto Interface
+ * Written by Michael Gorven
+ */
+static grub_err_t
+md5 (const char *in, grub_size_t insize, char *out)
+{
+  MD5_CONTEXT hd;
+
+  md5_init (&hd);
+  md5_write (&hd, in, insize);
+  md5_final (&hd);
+  grub_memcpy (out, hd.buf, 16);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
+		   int argc, char **args)
+
+{  
+  grub_device_t dev;
+  char *uuid, *ptr, *buf;
+  grub_err_t err;
+  struct tohash hashme;
+  grub_uint8_t xnu_uuid[16];
+  grub_fs_t fs;
+  char uuid_string[sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
+  char rd_string[sizeof ("rd=*uuid boot-uuid=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
+
+  if (argc < 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
+
+  ptr = args[0] + grub_strlen (args[0]) - 1;
+  if (args[0][0] == '(' && *ptr == ')')
+    {
+      *ptr = 0;
+      dev = grub_device_open (args[0] + 1);
+      *ptr =')';
+    }
+  else
+    dev = grub_device_open (args[0]);
+  if (! dev)
+    return grub_error (GRUB_ERR_BAD_DEVICE, "couldn't open device");
+  fs = grub_fs_probe (dev);
+  if (! fs)
+    return grub_error (GRUB_ERR_UNKNOWN_FS, "unrecognised fs");
+  if (! fs->uuid)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, 
+		       "uuid for this FS isn't supported yet");
+  err = fs->uuid (dev, &uuid);
+  if (err)
+    return err;
+  if (! uuid)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, 
+		       "uuid for this FS isn't supported yet");
+  hashme.serial = grub_cpu_to_be64 (grub_strtoull (uuid, 0, 16));
+  grub_memcpy (hashme.prefix, hash_prefix, sizeof (hashme.prefix));
+  
+  md5 ((char *) &hashme, sizeof (hashme), (char *) xnu_uuid);
+  xnu_uuid[6] = (xnu_uuid[6] & 0xf) | 0x30;
+  xnu_uuid[8] = (xnu_uuid[8] & 0x3f) | 0x80;
+  grub_sprintf (uuid_string, 
+		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		(unsigned int) xnu_uuid[0], (unsigned int) xnu_uuid[1], 
+		(unsigned int) xnu_uuid[2], (unsigned int) xnu_uuid[3],
+		(unsigned int) xnu_uuid[4], (unsigned int) xnu_uuid[5], 
+		(unsigned int) ((xnu_uuid[6] & 0xf) | 0x30),
+		(unsigned int) xnu_uuid[7], 
+		(unsigned int) ((xnu_uuid[8] & 0x3f) | 0x80), 
+		(unsigned int) xnu_uuid[9], 
+		(unsigned int) xnu_uuid[10], (unsigned int) xnu_uuid[11], 
+		(unsigned int) xnu_uuid[12], (unsigned int) xnu_uuid[13], 
+		(unsigned int) xnu_uuid[14], (unsigned int) xnu_uuid[15]);
+  for (ptr = uuid_string; *ptr; ptr++)
+    if (*ptr >= 'a' && *ptr <= 'f')
+      *ptr += 'A' - 'a';
+  grub_sprintf (rd_string, "rd=*uuid boot-uuid=%s", uuid_string);
+  if (argc == 1)
+    grub_printf ("The xnu-uuid of %s is %s\n"
+		 "To use it as a root pass '%s' to the kernel\n",
+		 args[0], uuid_string, rd_string);
+  if (argc > 1)
+    grub_env_set (args[1], uuid_string);
+  if (argc > 2)
+    grub_env_set (args[2], rd_string);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+
+GRUB_MOD_INIT(xnu_uuid)
+{
+  (void)mod;			/* To stop warning. */
+  cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid, 
+			       "xnu_uuid DEVICE [VARNAME]",
+			       "Fetch UUID of partition in format "
+			       "suitable for xnu.");
+}
+
+GRUB_MOD_FINI(xnu_uuid)
+{
+  grub_unregister_command (cmd);
+}
+
+
conf/common.rmk +8 -0
index 2335d8f..46c3bcb 100644
@@ -546,3 +546,11 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
 bufio_mod_SOURCES = io/bufio.c
 bufio_mod_CFLAGS = $(COMMON_CFLAGS)
 bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# Misc.
+pkglib_MODULES += xnu_uuid.mod
+
+# For elf.mod.
+xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
+xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
+xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
fs/hfsplus.c +33 -1
index 82ec880..6ca9218 100644
@@ -61,7 +61,8 @@ struct grub_hfsplus_volheader
   grub_uint32_t utime;
   grub_uint8_t unused2[16];
   grub_uint32_t blksize;
-  grub_uint8_t unused3[68];
+  grub_uint8_t unused3[60];
+  grub_uint64_t num_serial;
   struct grub_hfsplus_forkdata allocations_file;
   struct grub_hfsplus_forkdata extents_file;
   struct grub_hfsplus_forkdata catalog_file;
@@ -983,6 +984,36 @@ grub_hfsplus_mtime (grub_device_t device, grub_int32_t *tm)
 
 }
 
+static grub_err_t
+grub_hfsplus_uuid (grub_device_t device, char **uuid)
+{
+  struct grub_hfsplus_data *data;
+  grub_disk_t disk = device->disk;
+
+#ifndef GRUB_UTIL
+  grub_dl_ref (my_mod);
+#endif
+
+  data = grub_hfsplus_mount (disk);
+  if (data)
+    {
+      *uuid = grub_malloc (16 + sizeof ('\0'));
+      grub_sprintf (*uuid, "%016llx", 
+		    (unsigned long long) 
+		    grub_be_to_cpu64 (data->volheader.num_serial));
+    }
+  else
+    *uuid = NULL;
+
+#ifndef GRUB_UTIL
+  grub_dl_unref (my_mod);
+#endif
+
+  grub_free (data);
+
+  return grub_errno;
+}
+
 
 
 static struct grub_fs grub_hfsplus_fs =
@@ -994,6 +1025,7 @@ static struct grub_fs grub_hfsplus_fs =
     .close = grub_hfsplus_close,
     .label = grub_hfsplus_label,
     .mtime = grub_hfsplus_mtime,
+    .uuid = grub_hfsplus_uuid,
     .next = 0
   };
 
util/grub.d/30_os-prober.in +4 -5
index a145277..10e4ea7 100644
@@ -83,12 +83,10 @@ EOF
       done
     ;;
     macosx)
-      OSXROOT="`grub-probe --target=drive --device ${DEVICE} 2> /dev/null`"
-      # FIXME: use UUID
-      OSXDISK=disk"`echo ${OSXROOT} | awk -F , '{ print $1 ; }' | sed 's/(hd//;'`"s"`echo ${OSXROOT} | awk -F , '{ print $2 ; }' | sed 's/)//;'`"
+      OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
         cat << EOF
 menuentry "${LONGNAME} (on ${DEVICE})" {
-	set root=${OSXROOT}
+        search --fs-uuid --set ${OSXUUID}
         insmod vbe
         insmod gfxterm
         gfxmode="1024x768x32;800x600x32"
@@ -100,10 +98,11 @@ menuentry "${LONGNAME} (on ${DEVICE})" {
            fi
         fi
         if [ \$do_resume == 0 ]; then
+           xnu_uuid \$root uuid rdspec
            if [ -f /Extra/DSDT.aml ]; then
               acpi -e /Extra/DSDT.aml
            fi
-           xnu_kernel /mach_kernel rd=$OSXDISK
+           xnu_kernel /mach_kernel \${rdspec}
            if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
               xnu_mkext /System/Library/Extensions.mkext
            else
#1 lore raw
Quoted 3 lines · Vladimir 'phcoder' Serbinenko

This is a patch to support UUIDs on HFS+. MD5 code is copied from Michael Gorven's patch which is copied from libgcrypt nearly verbatim. Thanks for Cris for the info about how xnu expects UUID to be

I suggest that you run all new code through GNU indent. Spacing in "32-(n)" will probably need to be fixed manually, as it's a preprocessor directive.

Commented out call to to _gcry_burn_stack() should probably be removed. I would prefer that we don't use #undef. Instead, the preprocessor defines should use unique names that never need to be redefined.

Setting two environment variables is undocumented. I think rd_string should not be needed. If you need it due to the script engine problems, it's better to fix the script engine. At least please mark that hack as a hack.

Perhaps we should consider adding %X support to grub_printf(). I realize that it will increase the core slightly, but if it's just a few bytes, we could accept it. Other modules may use it. Or maybe we could have grub_toupper(), perhaps an inline function?

Another thing to consider is whether md5 support should be in a separate file. It would make it possible to reuse md5 for other commands.

Signature · 2 lines
Regards,
Pavel Roskin
#2 lore raw
Quoted 5 lines · Pavel Roskin
Quoted 3 lines · Vladimir 'phcoder' Serbinenko

This is a patch to support UUIDs on HFS+. MD5 code is copied from Michael Gorven's patch which is copied from libgcrypt nearly verbatim. Thanks for Cris for the info about how xnu expects UUID to be

Quoted 8 lines

I suggest that you run all new code through GNU indent. Spacing in "32-(n)" will probably need to be fixed manually, as it's a preprocessor directive.

Commented out call to to _gcry_burn_stack() should probably be removed. I would prefer that we don't use #undef. Instead, the preprocessor defines should use unique names that never need to be redefined.

This part is temporary copied here till Michael Gorven's patch is merged.

Quoted 4 lines

Setting two environment variables is undocumented. I think rd_string should not be needed. If you need it due to the script engine problems, it's better to fix the script engine.

I'm looking how to do it. The corresponding part to support foo=$bar is here but commented out.

Quoted 6 lines

At least please mark that hack as
a hack.

Perhaps we should consider adding %X support to grub_printf(). I realize that it will increase the core slightly, but if it's just a few bytes, we could accept it. Other modules may use it.

Let me think a bit about it. Unfortunately what seems to be few bytes in a
first glance may be up to 100 bytes once implemented

Quoted 3 lines

Or maybe we could
have grub_toupper(), perhaps an inline function?

If it's an inline then it's ok.

Quoted 4 lines

Another thing to consider is whether md5 support should be in a separate file. It would make it possible to reuse md5 for other commands.

Actually md5 is a part of Michael Gorven patch where it's exported nicely but since his patch is pending I temporary copied it to this file. So I think it's unnecessary to

Quoted 11 lines

--
Regards,
Pavel Roskin

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko
#3 lore raw
Quoted 7 lines · Vladimir 'phcoder' Serbinenko

Setting two environment variables is undocumented. I think rd_string
should not be needed. If you need it due to the script engine problems,
it's better to fix the script engine.
I'm looking how to do it. The corresponding part to support foo=$bar is here but commented out.

The changes to fs/hfsplus.c look rather uncontroversial. Maybe you could apply that part first? And then we could deal with the xnu related stuff separately.

Signature · 2 lines
Regards,
Pavel Roskin
#4 lore raw

commited

Quoted 24 lines · Pavel Roskin
Quoted 7 lines · Vladimir 'phcoder' Serbinenko

Setting two environment variables is undocumented. I think rd_string
should not be needed. If you need it due to the script engine problems,
it's better to fix the script engine.
I'm looking how to do it. The corresponding part to support foo=$bar is here but commented out.

The changes to fs/hfsplus.c look rather uncontroversial. Maybe you could apply that part first? And then we could deal with the xnu related stuff separately.

--
Regards,
Pavel Roskin

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko
#5 lore raw
In reply to Pavel Roskin
Quoted 18 lines · Pavel Roskin
Quoted 3 lines · Vladimir 'phcoder' Serbinenko

This is a patch to support UUIDs on HFS+. MD5 code is copied from Michael Gorven's patch which is copied from libgcrypt nearly verbatim. Thanks for Cris for the info about how xnu expects UUID to be

I suggest that you run all new code through GNU indent.  Spacing in "32-(n)" will probably need to be fixed manually, as it's a preprocessor directive.

Commented out call to to _gcry_burn_stack() should probably be removed. I would prefer that we don't use #undef.  Instead, the preprocessor defines should use unique names that never need to be redefined.

Setting two environment variables is undocumented.  I think rd_string should not be needed.  If you need it due to the script engine problems, it's better to fix the script engine.  At least please mark that hack as a hack.

Quoted 7 lines

Perhaps we should consider adding %X support to grub_printf().  I realize that it will increase the core slightly, but if it's just a few bytes, we could accept it.  Other modules may use it.  Or maybe we could have grub_toupper(), perhaps an inline function?

Another thing to consider is whether md5 support should be in a separate file.  It would make it possible to reuse md5 for other commands.

Here is the improved patch. I deliberately ignored md5 comments because this part will be gone anyway whel Michael Gorven signs his copyright assignment and we incorporate luks patches

Quoted 11 lines

--
Regards,
Pavel Roskin

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko
#6 lore raw

Attachement forgotten

Quoted 47 lines · Vladimir 'phcoder' Serbinenko
Quoted 18 lines · Pavel Roskin
Quoted 3 lines · Vladimir 'phcoder' Serbinenko

This is a patch to support UUIDs on HFS+. MD5 code is copied from Michael Gorven's patch which is copied from libgcrypt nearly verbatim. Thanks for Cris for the info about how xnu expects UUID to be

I suggest that you run all new code through GNU indent.  Spacing in "32-(n)" will probably need to be fixed manually, as it's a preprocessor directive.

Commented out call to to _gcry_burn_stack() should probably be removed. I would prefer that we don't use #undef.  Instead, the preprocessor defines should use unique names that never need to be redefined.

Setting two environment variables is undocumented.  I think rd_string should not be needed.  If you need it due to the script engine problems, it's better to fix the script engine.  At least please mark that hack as a hack.

Quoted 7 lines

Perhaps we should consider adding %X support to grub_printf().  I realize that it will increase the core slightly, but if it's just a few bytes, we could accept it.  Other modules may use it.  Or maybe we could have grub_toupper(), perhaps an inline function?

Another thing to consider is whether md5 support should be in a separate file.  It would make it possible to reuse md5 for other commands.

Here is the improved patch. I deliberately ignored md5 comments because this part will be gone anyway whel Michael Gorven signs his copyright assignment and we incorporate luks patches

Quoted 11 lines

--
Regards,
Pavel Roskin

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

--
Regards
Vladimir 'phcoder' Serbinenko

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko
commands/xnu_uuid.c new file +433 -0
new file mode 100644
index 0000000..51b7ca7
@@ -0,0 +1,433 @@
+/* xnu_uuid.c - transform 64-bit serial number 
+   to 128-bit uuid suitable for xnu. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1995,1996,1998,1999,2001,2002,
+ *                2003, 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/device.h>
+#include <grub/disk.h>
+#include <grub/fs.h>
+#include <grub/file.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/command.h>
+
+struct tohash
+{
+  grub_uint8_t prefix[16];
+  grub_uint64_t serial;
+} __attribute__ ((packed));
+
+/* This prefix is used by xnu and boot-132 to hash 
+   together with volume serial. */
+static grub_uint8_t hash_prefix[16] 
+  = {0xB3, 0xE2, 0x0F, 0x39, 0xF2, 0x92, 0x11, 0xD6, 
+     0x97, 0xA4, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC};
+
+#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+#define ror(x,n) ( ((x) >> (n)) | ((x) << (32-(n))) )
+
+typedef struct {
+  grub_uint32_t A,B,C,D;	  /* chaining variables */
+  grub_uint32_t  nblocks;
+  grub_uint8_t buf[64];
+  int  count;
+} MD5_CONTEXT;
+
+static void
+md5_init( void *context )
+{
+  MD5_CONTEXT *ctx = context;
+
+  ctx->A = 0x67452301;
+  ctx->B = 0xefcdab89;
+  ctx->C = 0x98badcfe;
+  ctx->D = 0x10325476;
+
+  ctx->nblocks = 0;
+  ctx->count = 0;
+}
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+   and defined in the RFC 1321.  The first function is a little bit optimized
+   (as found in Colin Plumbs public domain implementation).  */
+/* #define FF(b, c, d) ((b & c) | (~b & d)) */
+#define FF(b, c, d) (d ^ (b & (c ^ d)))
+#define FG(b, c, d) FF (d, b, c)
+#define FH(b, c, d) (b ^ c ^ d)
+#define FI(b, c, d) (c ^ (b | ~d))
+
+
+/****************
+ * transform n*64 grub_uint8_ts
+ */
+static void
+transform ( MD5_CONTEXT *ctx, const unsigned char *data )
+{
+  grub_uint32_t correct_words[16];
+  register grub_uint32_t A = ctx->A;
+  register grub_uint32_t B = ctx->B;
+  register grub_uint32_t C = ctx->C;
+  register grub_uint32_t D = ctx->D;
+  grub_uint32_t *cwp = correct_words;
+
+#ifdef WORDS_BIGENDIAN
+  { 
+    int i;
+    grub_uint8_t *p2, *p1;
+    for(i=0, p1=data, p2=(grub_uint8_t*)correct_words; i < 16; i++, p2 += 4 )
+    {
+      p2[3] = *p1++;
+      p2[2] = *p1++;
+      p2[1] = *p1++;
+      p2[0] = *p1++;
+    }
+  }
+#else
+  memcpy( correct_words, data, 64 );
+#endif
+
+#define OP(a, b, c, d, s, T) \
+  do			         	   \
+  {					   \
+    a += FF (b, c, d) + (*cwp++) + T;    \
+    a = rol(a, s);			   \
+    a += b;				   \
+  }					   \
+  while (0)
+
+  /* Before we start, one word about the strange constants.
+     They are defined in RFC 1321 as
+
+     T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
+     */
+
+  /* Round 1.  */
+  OP (A, B, C, D,  7, 0xd76aa478);
+  OP (D, A, B, C, 12, 0xe8c7b756);
+  OP (C, D, A, B, 17, 0x242070db);
+  OP (B, C, D, A, 22, 0xc1bdceee);
+  OP (A, B, C, D,  7, 0xf57c0faf);
+  OP (D, A, B, C, 12, 0x4787c62a);
+  OP (C, D, A, B, 17, 0xa8304613);
+  OP (B, C, D, A, 22, 0xfd469501);
+  OP (A, B, C, D,  7, 0x698098d8);
+  OP (D, A, B, C, 12, 0x8b44f7af);
+  OP (C, D, A, B, 17, 0xffff5bb1);
+  OP (B, C, D, A, 22, 0x895cd7be);
+  OP (A, B, C, D,  7, 0x6b901122);
+  OP (D, A, B, C, 12, 0xfd987193);
+  OP (C, D, A, B, 17, 0xa679438e);
+  OP (B, C, D, A, 22, 0x49b40821);
+
+#undef OP
+#define OP(f, a, b, c, d, k, s, T)  \
+  do								      \
+  { 							      \
+    a += f (b, c, d) + correct_words[k] + T;		      \
+    a = rol(a, s);						      \
+    a += b; 						      \
+  } 							      \
+  while (0)
+
+  /* Round 2.  */
+  OP (FG, A, B, C, D,  1,  5, 0xf61e2562);
+  OP (FG, D, A, B, C,  6,  9, 0xc040b340);
+  OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
+  OP (FG, B, C, D, A,  0, 20, 0xe9b6c7aa);
+  OP (FG, A, B, C, D,  5,  5, 0xd62f105d);
+  OP (FG, D, A, B, C, 10,  9, 0x02441453);
+  OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
+  OP (FG, B, C, D, A,  4, 20, 0xe7d3fbc8);
+  OP (FG, A, B, C, D,  9,  5, 0x21e1cde6);
+  OP (FG, D, A, B, C, 14,  9, 0xc33707d6);
+  OP (FG, C, D, A, B,  3, 14, 0xf4d50d87);
+  OP (FG, B, C, D, A,  8, 20, 0x455a14ed);
+  OP (FG, A, B, C, D, 13,  5, 0xa9e3e905);
+  OP (FG, D, A, B, C,  2,  9, 0xfcefa3f8);
+  OP (FG, C, D, A, B,  7, 14, 0x676f02d9);
+  OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
+
+  /* Round 3.  */
+  OP (FH, A, B, C, D,  5,  4, 0xfffa3942);
+  OP (FH, D, A, B, C,  8, 11, 0x8771f681);
+  OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
+  OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
+  OP (FH, A, B, C, D,  1,  4, 0xa4beea44);
+  OP (FH, D, A, B, C,  4, 11, 0x4bdecfa9);
+  OP (FH, C, D, A, B,  7, 16, 0xf6bb4b60);
+  OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
+  OP (FH, A, B, C, D, 13,  4, 0x289b7ec6);
+  OP (FH, D, A, B, C,  0, 11, 0xeaa127fa);
+  OP (FH, C, D, A, B,  3, 16, 0xd4ef3085);
+  OP (FH, B, C, D, A,  6, 23, 0x04881d05);
+  OP (FH, A, B, C, D,  9,  4, 0xd9d4d039);
+  OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
+  OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
+  OP (FH, B, C, D, A,  2, 23, 0xc4ac5665);
+
+  /* Round 4.  */
+  OP (FI, A, B, C, D,  0,  6, 0xf4292244);
+  OP (FI, D, A, B, C,  7, 10, 0x432aff97);
+  OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
+  OP (FI, B, C, D, A,  5, 21, 0xfc93a039);
+  OP (FI, A, B, C, D, 12,  6, 0x655b59c3);
+  OP (FI, D, A, B, C,  3, 10, 0x8f0ccc92);
+  OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
+  OP (FI, B, C, D, A,  1, 21, 0x85845dd1);
+  OP (FI, A, B, C, D,  8,  6, 0x6fa87e4f);
+  OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
+  OP (FI, C, D, A, B,  6, 15, 0xa3014314);
+  OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
+  OP (FI, A, B, C, D,  4,  6, 0xf7537e82);
+  OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
+  OP (FI, C, D, A, B,  2, 15, 0x2ad7d2bb);
+  OP (FI, B, C, D, A,  9, 21, 0xeb86d391);
+
+  /* Put checksum in context given as argument.  */
+  ctx->A += A;
+  ctx->B += B;
+  ctx->C += C;
+  ctx->D += D;
+}
+
+/* The routine updates the message-digest context to
+ * account for the presence of each of the characters inBuf[0..inLen-1]
+ * in the message whose digest is being computed.
+ */
+static void
+md5_write( void *context, const void *inbuf_arg , grub_size_t inlen)
+{
+  const unsigned char *inbuf = inbuf_arg;
+  MD5_CONTEXT *hd = context;
+
+  if( hd->count == 64 )  /* flush the buffer */
+  {
+    transform( hd, hd->buf );
+    //      _gcry_burn_stack (80+6*sizeof(void*));
+    hd->count = 0;
+    hd->nblocks++;
+  }
+  if( !inbuf )
+    return;
+
+  if( hd->count )
+  {
+    for( ; inlen && hd->count < 64; inlen-- )
+      hd->buf[hd->count++] = *inbuf++;
+    md5_write( hd, NULL, 0 );
+    if( !inlen )
+      return;
+  }
+  //  _gcry_burn_stack (80+6*sizeof(void*));
+
+  while( inlen >= 64 ) 
+  {
+    transform( hd, inbuf );
+    hd->count = 0;
+    hd->nblocks++;
+    inlen -= 64;
+    inbuf += 64;
+  }
+  for( ; inlen && hd->count < 64; inlen-- )
+    hd->buf[hd->count++] = *inbuf++;
+
+}
+
+
+
+/* The routine final terminates the message-digest computation and
+ * ends with the desired message digest in mdContext->digest[0...15].
+ * The handle is prepared for a new MD5 cycle.
+ * Returns 16 grub_uint8_ts representing the digest.
+ */
+static void
+md5_final( void *context)
+{
+  MD5_CONTEXT *hd = context;
+  grub_uint32_t t, msb, lsb;
+  grub_uint8_t *p;
+
+  md5_write(hd, NULL, 0); /* flush */;
+
+  t = hd->nblocks;
+  /* multiply by 64 to make a grub_uint8_t count */
+  lsb = t << 6;
+  msb = t >> 26;
+  /* add the count */
+  t = lsb;
+  if( (lsb += hd->count) < t )
+    msb++;
+  /* multiply by 8 to make a bit count */
+  t = lsb;
+  lsb <<= 3;
+  msb <<= 3;
+  msb |= t >> 29;
+
+  if( hd->count < 56 )  /* enough room */
+  {
+    hd->buf[hd->count++] = 0x80; /* pad */
+    while( hd->count < 56 )
+      hd->buf[hd->count++] = 0;  /* pad */
+  }
+  else  /* need one extra block */
+  {
+    hd->buf[hd->count++] = 0x80; /* pad character */
+    while( hd->count < 64 )
+      hd->buf[hd->count++] = 0;
+    md5_write(hd, NULL, 0);  /* flush */;
+    grub_memset(hd->buf, 0, 56 ); /* fill next block with zeroes */
+  }
+  /* append the 64 bit count */
+  hd->buf[56] = lsb	   ;
+  hd->buf[57] = lsb >>  8;
+  hd->buf[58] = lsb >> 16;
+  hd->buf[59] = lsb >> 24;
+  hd->buf[60] = msb	   ;
+  hd->buf[61] = msb >>  8;
+  hd->buf[62] = msb >> 16;
+  hd->buf[63] = msb >> 24;
+  transform( hd, hd->buf );
+  //  _gcry_burn_stack (80+6*sizeof(void*));
+
+  p = hd->buf;
+#ifdef WORDS_BIGENDIAN
+#define X(a) do { *p++ = hd->a      ; *p++ = hd->a >> 8;      \
+  *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0)
+#else /* little endian */
+#define X(a) do { *(grub_uint32_t*)p = (*hd).a ; p += 4; } while(0)
+#endif
+  X(A);
+  X(B);
+  X(C);
+  X(D);
+#undef X
+
+}
+
+/**
+ * GRUB2 Crypto Interface
+ * Written by Michael Gorven
+ */
+static grub_err_t
+md5 (const char *in, grub_size_t insize, char *out)
+{
+  MD5_CONTEXT hd;
+
+  md5_init (&hd);
+  md5_write (&hd, in, insize);
+  md5_final (&hd);
+  grub_memcpy (out, hd.buf, 16);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
+		   int argc, char **args)
+
+{  
+  grub_device_t dev;
+  char *uuid, *ptr, *buf;
+  grub_err_t err;
+  struct tohash hashme;
+  grub_uint8_t xnu_uuid[16];
+  grub_fs_t fs;
+  char uuid_string[sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
+
+  if (argc < 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
+
+  ptr = args[0] + grub_strlen (args[0]) - 1;
+  if (args[0][0] == '(' && *ptr == ')')
+    {
+      *ptr = 0;
+      dev = grub_device_open (args[0] + 1);
+      *ptr =')';
+    }
+  else
+    dev = grub_device_open (args[0]);
+  if (! dev)
+    return grub_error (GRUB_ERR_BAD_DEVICE, "couldn't open device");
+  fs = grub_fs_probe (dev);
+  if (! fs)
+    return grub_error (GRUB_ERR_UNKNOWN_FS, "unrecognised fs");
+  if (! fs->uuid)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, 
+		       "uuid for this FS isn't supported yet");
+  err = fs->uuid (dev, &uuid);
+  if (err)
+    return err;
+  if (! uuid)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, 
+		       "uuid for this FS isn't supported yet");
+  hashme.serial = grub_cpu_to_be64 (grub_strtoull (uuid, 0, 16));
+  grub_memcpy (hashme.prefix, hash_prefix, sizeof (hashme.prefix));
+  
+  md5 ((char *) &hashme, sizeof (hashme), (char *) xnu_uuid);
+  xnu_uuid[6] = (xnu_uuid[6] & 0xf) | 0x30;
+  xnu_uuid[8] = (xnu_uuid[8] & 0x3f) | 0x80;
+  grub_sprintf (uuid_string, 
+		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		(unsigned int) xnu_uuid[0], (unsigned int) xnu_uuid[1], 
+		(unsigned int) xnu_uuid[2], (unsigned int) xnu_uuid[3],
+		(unsigned int) xnu_uuid[4], (unsigned int) xnu_uuid[5], 
+		(unsigned int) ((xnu_uuid[6] & 0xf) | 0x30),
+		(unsigned int) xnu_uuid[7], 
+		(unsigned int) ((xnu_uuid[8] & 0x3f) | 0x80), 
+		(unsigned int) xnu_uuid[9], 
+		(unsigned int) xnu_uuid[10], (unsigned int) xnu_uuid[11], 
+		(unsigned int) xnu_uuid[12], (unsigned int) xnu_uuid[13], 
+		(unsigned int) xnu_uuid[14], (unsigned int) xnu_uuid[15]);
+  for (ptr = uuid_string; *ptr; ptr++)
+    if (*ptr >= 'a' && *ptr <= 'f')
+      *ptr = grub_toupper (*ptr);
+  if (argc == 1)
+    grub_printf ("The xnu-uuid of %s is %s\n"
+		 "To use it as a root pass 'rd=*uuid boot-uuid=%s' "
+		 "to the kernel\n",
+		 args[0], uuid_string, uuid_string);
+  if (argc > 1)
+    grub_env_set (args[1], uuid_string);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+
+GRUB_MOD_INIT(xnu_uuid)
+{
+  (void)mod;			/* To stop warning. */
+  cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid, 
+			       "xnu_uuid DEVICE [VARNAME]",
+			       "Fetch UUID of partition in format "
+			       "suitable for xnu.");
+}
+
+GRUB_MOD_FINI(xnu_uuid)
+{
+  grub_unregister_command (cmd);
+}
+
+
conf/common.rmk +8 -0
index 9780341..8e6d450 100644
@@ -585,3 +585,11 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
 bufio_mod_SOURCES = io/bufio.c
 bufio_mod_CFLAGS = $(COMMON_CFLAGS)
 bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# Misc.
+pkglib_MODULES += xnu_uuid.mod
+
+# For elf.mod.
+xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
+xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
+xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
include/grub/misc.h +9 -0
index 23e0ce6..e229062 100644
@@ -61,6 +61,15 @@ int EXPORT_FUNC(grub_isalpha) (int c);
 int EXPORT_FUNC(grub_isgraph) (int c);
 int EXPORT_FUNC(grub_isdigit) (int c);
 int EXPORT_FUNC(grub_tolower) (int c);
+static inline int
+grub_toupper (int c)
+{
+  if (c >= 'a' && c <= 'z')
+    return c - 'a' + 'A';
+
+  return c;
+}
+
 unsigned long EXPORT_FUNC(grub_strtoul) (const char *str, char **end, int base);
 unsigned long long EXPORT_FUNC(grub_strtoull) (const char *str, char **end, int base);
 char *EXPORT_FUNC(grub_strdup) (const char *s);
util/grub.d/30_os-prober.in +4 -5
index 7d4d17e..af936e8 100644
@@ -83,12 +83,10 @@ EOF
       done
     ;;
     macosx)
-      OSXROOT="`grub-probe --target=drive --device ${DEVICE} 2> /dev/null`"
-      # FIXME: use UUID
-      OSXDISK=disk"`echo ${OSXROOT} | awk -F , '{ print $1 ; }' | sed 's/(hd//;'`"s"`echo ${OSXROOT} | awk -F , '{ print $2 ; }' | sed 's/)//;'`"
+      OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
         cat << EOF
 menuentry "${LONGNAME} (on ${DEVICE})" {
-	set root=${OSXROOT}
+        search --fs-uuid --set ${OSXUUID}
         insmod vbe
         do_resume=0
         if [ /var/vm/sleepimage -nt10 / ]; then
@@ -97,10 +95,11 @@ menuentry "${LONGNAME} (on ${DEVICE})" {
            fi
         fi
         if [ \$do_resume == 0 ]; then
+           xnu_uuid \$root uuid
            if [ -f /Extra/DSDT.aml ]; then
               acpi -e /Extra/DSDT.aml
            fi
-           xnu_kernel /mach_kernel rd=$OSXDISK
+           xnu_kernel /mach_kernel boot-uuid=\${uuid} rd=*uuid
            if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
               xnu_mkext /System/Library/Extensions.mkext
            else
#7 lore raw
In reply to Vladimir 'phcoder' Serbinenko
Quoted 3 lines · Vladimir 'phcoder' Serbinenko

Here is the improved patch. I deliberately ignored md5 comments because this part will be gone anyway whel Michael Gorven signs his copyright assignment and we incorporate luks patches

Please consider if it would be better to supply the filesystem UUID on the command line rather than the device name. That would make xnu_uuid leaner and more flexible. I think we need the "uuid" command that would get the uuid and the "xnu_uuid" command that would convert it.

It would be great if you run xnu_uuid.c through indent. The coding style is quite different from that used elsewhere in GRUB. Or at least please strip trailing spaces.

"file name required" is a wrong error message. It should be "device file required". I think it would be better to expand "fs" and "FS" in error messages as "filesystem".

If the variable name is not specified, I think xnu_uuid should just output the UUID without any explanations. Explanations belong to the help, not to the normal output.

"(void)mod;" is not needed. The "buf" variable in grub_cmd_xnu_uuid() is unused.

Signature · 2 lines
Regards,
Pavel Roskin
#8 lore raw
Quoted 15 lines · Pavel Roskin
Quoted 3 lines · Vladimir 'phcoder' Serbinenko

Here is the improved patch. I deliberately ignored md5 comments because this part will be gone anyway whel Michael Gorven signs his copyright assignment and we incorporate luks patches

Please consider if it would be better to supply the filesystem UUID on the command line rather than the device name.  That would make xnu_uuid leaner and more flexible.  I think we need the "uuid" command that would get the uuid and the "xnu_uuid" command that would convert it.

It would be great if you run xnu_uuid.c through indent.  The coding style is quite different from that used elsewhere in GRUB.  Or at least please strip trailing spaces.

Quoted 7 lines

"file name required" is a wrong error message.  It should be "device file required".  I think it would be better to expand "fs" and "FS" in error messages as "filesystem".

If the variable name is not specified, I think xnu_uuid should just output the UUID without any explanations.  Explanations belong to the help, not to the normal output.

GRUB2 becomes increasingly more complex. We try to document it on grub.enbug.org but when user needs the info the most his only system is unbootable. Perhaps we should incorporate a more extensive help into grub2 itself. man format looks rather easy to parse

Quoted 14 lines

"(void)mod;" is not needed.  The "buf" variable in grub_cmd_xnu_uuid() is unused.

--
Regards,
Pavel Roskin

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko
ChangeLog +16 -0
index 556b17d..65a859d 100644
@@ -1,5 +1,21 @@
 2009-06-08  Vladimir Serbinenko  <[email protected]>
 
+	xnu_uuid command
+
+	* commands/xnu_uuid.c: new file
+	* conf/common.rmk (pkglib_MODULES): add xnu_uuid.mod
+	(xnu_uuid_mod_SOURCES): new variable
+	(xnu_uuid_mod_CFLAGS): likewise
+	(xnu_uuid_mod_LDFLAGS): likewise
+	* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
+	* conf/i386-ieee1275.rmk: likewise
+	* conf/i386-pc.rmk: likewise
+	* conf/powerpc-ieee1275.rmk: likewise
+	* conf/sparc64-ieee1275.rmk: likewise
+	* util/grub.d/30_os-prober.in: use UUID for Mac OS X/Darwin
+
+2009-06-08  Vladimir Serbinenko  <[email protected]>
+
 	probe command
 
 	* commands/probe.c: new file
commands/xnu_uuid.c new file +399 -0

399 lines not on this page · raw message

conf/common.rmk +7 -0
index b75f50e..584450f 100644
@@ -591,3 +591,10 @@ bufio_mod_SOURCES = io/bufio.c
 bufio_mod_CFLAGS = $(COMMON_CFLAGS)
 bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# Misc.
+pkglib_MODULES += xnu_uuid.mod
+
+# For elf.mod.
+xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
+xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
+xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
conf/i386-coreboot.rmk +1 -1
index f2e0dc6..e1fcc46 100644
@@ -61,7 +61,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	commands/configfile.c commands/echo.c commands/help.c		\
 	commands/handler.c commands/ls.c commands/test.c 		\
 	commands/search.c commands/blocklist.c commands/hexdump.c	\
-	commands/gptsync.c commands/probe.c				\
+	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
 	lib/hexdump.c commands/i386/cpuid.c				\
 	disk/host.c disk/loopback.c					\
 	\
conf/i386-ieee1275.rmk +2 -1
index 817a266..7231d28 100644
@@ -61,7 +61,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	commands/handler.c commands/ls.c commands/test.c 		\
 	commands/search.c commands/blocklist.c commands/hexdump.c	\
 	lib/hexdump.c commands/halt.c commands/reboot.c			\
-	commands/gptsync.c commands/probe.c commands/i386/cpuid.c	\
+	commands/gptsync.c commands/probe.c  commands/xnu_uuid.c	\
+	commands/i386/cpuid.c	\
 	disk/host.c disk/loopback.c					\
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
conf/i386-pc.rmk +2 -1
index e9496f6..80e8067 100644
@@ -127,7 +127,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	commands/handler.c commands/ls.c commands/test.c 		\
 	commands/search.c commands/blocklist.c commands/hexdump.c	\
 	lib/hexdump.c commands/i386/pc/halt.c commands/reboot.c		\
-	commands/gptsync.c commands/probe.c commands/i386/cpuid.c	\
+	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
+	commands/i386/cpuid.c	\
 	disk/host.c disk/loopback.c disk/scsi.c				\
 	fs/fshelp.c 	\
 	\
conf/powerpc-ieee1275.rmk +1 -1
index b8a0309..4cb8f04 100644
@@ -45,7 +45,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 	commands/search.c commands/handler.c commands/test.c 		\
 	commands/ls.c commands/blocklist.c commands/hexdump.c		\
 	lib/hexdump.c commands/halt.c commands/reboot.c 		\
-	commands/gptsync.c commands/probe.c 			\
+	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
 	disk/loopback.c							\
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
conf/sparc64-ieee1275.rmk +1 -1
index 5700937..82e9b73 100644
@@ -101,7 +101,7 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c 	\
 	commands/configfile.c commands/help.c				\
 	commands/search.c commands/handler.c commands/test.c 		\
 	commands/ls.c commands/blocklist.c commands/hexdump.c		\
-	commands/probe.c						\
+	commands/probe.c commands/xnu_uuid.c				\
 	lib/hexdump.c commands/halt.c commands/reboot.c			\
 	disk/loopback.c							\
 	\
include/grub/misc.h +9 -0
index 23e0ce6..e229062 100644
@@ -61,6 +61,15 @@ int EXPORT_FUNC(grub_isalpha) (int c);
 int EXPORT_FUNC(grub_isgraph) (int c);
 int EXPORT_FUNC(grub_isdigit) (int c);
 int EXPORT_FUNC(grub_tolower) (int c);
+static inline int
+grub_toupper (int c)
+{
+  if (c >= 'a' && c <= 'z')
+    return c - 'a' + 'A';
+
+  return c;
+}
+
 unsigned long EXPORT_FUNC(grub_strtoul) (const char *str, char **end, int base);
 unsigned long long EXPORT_FUNC(grub_strtoull) (const char *str, char **end, int base);
 char *EXPORT_FUNC(grub_strdup) (const char *s);
util/grub.d/30_os-prober.in +4 -5
index 7d4d17e..753a367 100644
@@ -83,12 +83,10 @@ EOF
       done
     ;;
     macosx)
-      OSXROOT="`grub-probe --target=drive --device ${DEVICE} 2> /dev/null`"
-      # FIXME: use UUID
-      OSXDISK=disk"`echo ${OSXROOT} | awk -F , '{ print $1 ; }' | sed 's/(hd//;'`"s"`echo ${OSXROOT} | awk -F , '{ print $2 ; }' | sed 's/)//;'`"
+      OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
         cat << EOF
 menuentry "${LONGNAME} (on ${DEVICE})" {
-	set root=${OSXROOT}
+        search --fs-uuid --set ${OSXUUID}
         insmod vbe
         do_resume=0
         if [ /var/vm/sleepimage -nt10 / ]; then
@@ -97,10 +95,11 @@ menuentry "${LONGNAME} (on ${DEVICE})" {
            fi
         fi
         if [ \$do_resume == 0 ]; then
+           xnu_uuid ${OSXUUID} uuid
            if [ -f /Extra/DSDT.aml ]; then
               acpi -e /Extra/DSDT.aml
            fi
-           xnu_kernel /mach_kernel rd=$OSXDISK
+           xnu_kernel /mach_kernel boot-uuid=\${uuid} rd=*uuid
            if [ /System/Library/Extensions.mkext -nt /System/Library/Extensions ]; then
               xnu_mkext /System/Library/Extensions.mkext
            else
#9 lore raw

Quoting Vladimir 'phcoder' Serbinenko <[email protected]>:

Quoted 7 lines
Quoted 3 lines

If the variable name is not specified, I think xnu_uuid should just output the UUID without any explanations.  Explanations belong to the help, not to the normal output.

GRUB2 becomes increasingly more complex. We try to document it on grub.enbug.org but when user needs the info the most his only system is unbootable. Perhaps we should incorporate a more extensive help into grub2 itself. man format looks rather easy to parse

My point is that commands shouldn't be outputting any help text unless the user requests it.

Signature · 2 lines
Regards,
Pavel Roskin
#10 lore raw

comitted

Quoted 24 lines · Pavel Roskin

Quoting Vladimir 'phcoder' Serbinenko <[email protected]>:

Quoted 8 lines
Quoted 3 lines

If the variable name is not specified, I think xnu_uuid should just output the UUID without any explanations.  Explanations belong to the help, not to the normal output.

GRUB2 becomes increasingly more complex. We try to document it on grub.enbug.org but when user needs the info the most his only system is unbootable. Perhaps we should incorporate a more extensive help into grub2 itself. man format looks rather easy to parse

My point is that commands shouldn't be outputting any help text unless the user requests it.

--
Regards,
Pavel Roskin

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

Signature · 2 lines
Regards
Vladimir 'phcoder' Serbinenko