From 0639a1196afbf3df9c8779b7b26a4bf981e20e86 Mon Sep 17 00:00:00 2001
From: Mike Hibler <hibler@cs.utah.edu>
Date: Fri, 9 May 2014 14:03:47 -0600
Subject: [PATCH] Change to use only geom and GPTs for FBSD 10 and above.

As of FreeBSD 10, I am tired of fighting the old MBR tools.
So for whole disks (slice == 0) we are going to use GPT so that we
can get good (1M) alignment and potentially big-ass partitions with
a minimum of fuss.

This means that you cannot image those partitions since imagezip
does not yet (as of 05/2014) understand GPT. But we have no mechanism
for capturing an image from anything but the system disk anyway, so
we can live with this until GPT support is added.
---
 clientside/tmcc/freebsd/mkextrafs.pl | 57 ++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/clientside/tmcc/freebsd/mkextrafs.pl b/clientside/tmcc/freebsd/mkextrafs.pl
index 9c02acaf5..46cb1141b 100755
--- a/clientside/tmcc/freebsd/mkextrafs.pl
+++ b/clientside/tmcc/freebsd/mkextrafs.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (c) 2000-2012 University of Utah and the Flux Group.
+# Copyright (c) 2000-2014 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -85,12 +85,17 @@ $ENV{'PATH'} = "/tmp:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:".
     "/usr/local/bin:/usr/site/bin:/usr/site/sbin:/usr/local/etc/emulab";
 delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
 
+my $FBSDVERS;
+if (`uname -r` =~ /^(\d+)\./) {
+    $FBSDVERS = $1;
+}
+
 #
 # Determine if we should use the "geom" tools to make everything happen.
 # Empirically, this seems to only be needed for FreeBSD 8 and above.
 #
 my $usegeom = 0;
-if (`uname -r` =~ /^(\d+)\./ && $1 > 7) {
+if ($FBSDVERS > 7) {
     $usegeom = $1;
 }
 
@@ -164,8 +169,13 @@ my $fsdevice   = "/dev/${slicedev}${partition}";
 # Note: we will create the BSD 'e' partition later.
 #
 if ($slice == 0) {
-    $slicedev = "${disk}s1";
-    $fsdevice = "/dev/${slicedev}e";
+    if ($FBSDVERS >= 10) {
+	$slicedev = "${disk}p1";
+	$fsdevice = "/dev/$slicedev";
+    } else {
+	$slicedev = "${disk}s1";
+	$fsdevice = "/dev/${slicedev}e";
+    }
 }
 
 #
@@ -192,6 +202,45 @@ if ($mounted =~ /^${fsdevice} on (\S*)/) {
 	"    $fsdevice is already mounted on $1\n");
 }
 
+#
+# As of FreeBSD 10, I am tired of fighting the old MBR tools.
+# So for whole disks (slice == 0) we are going to use GPT so that we
+# can get good (1M) alignment and potentially big-ass partitions with
+# a minimum of fuss.
+#
+# This means that you cannot image those partitions since imagezip
+# does not yet (as of 05/2014) understand GPT. But we have no mechanism
+# for capturing an image from anything but the system disk anyway.
+#
+if ($FBSDVERS >= 10 && $slice == 0) {
+    my @out = `gpart show $disk 2>/dev/null`;
+    if ($? == 0) {
+	# first line should tell us how the drive is partitioned
+	my $format = "UNKNOWN";
+	if ($out[0] =~ /^=>\s*\d+\s+\d+\s+$disk\s+(\S+)\s+/) {
+	    $format = $1;
+	}
+	if ($forceit) {
+	    mysystem("gpart destroy -F $disk");
+	} else {
+	    die("*** $0:\n".
+		"    $disk is already partitioned (type $format), ".
+		"use -f to override\n");
+	}
+    }
+    mysystem("gpart create -s gpt $disk");
+    mysystem("gpart add -i 1 -t freebsd-ufs -a 1m $disk");
+
+    mysystem("newfs -U $fsdevice");
+    mysystem("echo \"$fsdevice $mountpoint ufs rw 0 2\" >> /etc/fstab");
+
+    if (!$nomount) {
+	mysystem("mount $mountpoint");
+	mysystem("mkdir $mountpoint/local");
+    }
+    exit(0);
+}
+
 #
 # See what the current type is for the partition
 #
-- 
GitLab