From aa9a188f783becc9b8e224f17ca100b1d0f8aa82 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 17 May 2020 15:20:43 +0200
Subject: [PATCH 231/325] release/rc.local: Adjust /tmp/reproduce-from-image.sh
 to deal with slices

Obtained from: ElectroBSD
---
 release/rc.local | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/release/rc.local b/release/rc.local
index a5977c3a8f84..877d3f4ac617 100755
--- a/release/rc.local
+++ b/release/rc.local
@@ -17,14 +17,14 @@ set -x -e
 # Fingers crossed that the first disk is the boot disk ...
 DISK=$(geom disk status -s | head -n 1 | cut -f 1 -w)
 JAILROOT="$(mktemp -d /tmp/ElectroBSD-jail-XXXXXX)"
-SWAP_PARTITION_INDEX=3
-BUILD_PARTITION_INDEX=4
+SWAP_SLICE_INDEX=3
+BUILD_SLICE_INDEX=4
 
 gpart recover "${DISK}"
-gpart add -t freebsd-swap -s 1500M "${DISK}"
-swapon "/dev/${DISK}p${SWAP_PARTITION_INDEX}"
-dumpon "/dev/${DISK}p${SWAP_PARTITION_INDEX}"
-gpart add -t freebsd-ufs "${DISK}"
+gpart add -t freebsd -s 1500M "${DISK}"
+swapon "/dev/${DISK}s${SWAP_SLICE_INDEX}"
+dumpon "/dev/${DISK}s${SWAP_SLICE_INDEX}"
+gpart add -t freebsd "${DISK}"
 # gpart partition changes made in bhyve are currently
 # lost. The cause hasn't been diagnosed yet.
 # Explicitly include the partition layout in the
@@ -32,8 +32,8 @@ gpart add -t freebsd-ufs "${DISK}"
 # afterwards.
 gpart show "${DISK}"   # More convenient format for humans
 gpart backup "${DISK}" # Same data in format understood by "gpart restore"
-newfs "/dev/${DISK}p${BUILD_PARTITION_INDEX}"
-mount -o async,noatime "/dev/${DISK}p${BUILD_PARTITION_INDEX}" "${JAILROOT}"
+newfs "/dev/${DISK}s${BUILD_SLICE_INDEX}"
+mount -o async,noatime "/dev/${DISK}s${BUILD_SLICE_INDEX}" "${JAILROOT}"
 tar xf /usr/electrobsd-dist/base.txz -C "${JAILROOT}"
 tar xf /usr/electrobsd-dist/src.txz -C "${JAILROOT}"
 time jail -c path="${JAILROOT}" mount.devfs host.hostname=ElectroBSD command=sh /usr/src/reproduce.sh
-- 
2.32.0