Switch to single btrfs data device

[distgen] / lib / mkfs.sh

diff --git a/lib/mkfs.sh b/lib/mkfs.sh
index 1ccc67106595010b6a243ed67cef6515df06daf0..34bfe2ed705572548d34beac5a0bb4d0b068a6ab 100644 (file)
--- a/lib/mkfs.sh
+++ b/lib/mkfs.sh
@@ -5,11 +5,26 @@
 mkfs.ext3 -L 'boot' -U ${BOOTUUID} /dev/md/${MDBOOT}
 
 # Create swap on it
-mkswap -U ${SWAPAUUID} ${LOOPA}p3
-mkswap -U ${SWAPBUUID} ${LOOPB}p3
-
-# Create filesystem
-mkfs.btrfs -L 'slash' -U ${SLASHUUID} /dev/mapper/${SLASHNAME}
+mkswap -L 'swapa' -U ${SWAPAUUID} ${LOOPA}p3
+mkswap -L 'swapb' -U ${SWAPBUUID} ${LOOPB}p3
 
 # Create filesystem
 mkfs.btrfs -L 'data' -U ${DATAUUID} /dev/mapper/${DATANAME}
+
+# Make mount point
+mkdir -p ${MOUNTPOINT}
+
+# Mount base filesystem
+mount /dev/mapper/${DATANAME} ${MOUNTPOINT}
+
+# Create slash subvolume
+btrfs subvolume create ${MOUNTPOINT}/slash
+
+# Create home subvolume
+btrfs subvolume create ${MOUNTPOINT}/home
+
+# Set slash as default
+btrfs subvolume set-default $(btrfs subvolume list ${MOUNTPOINT} | grep slash | perl -pne 's/^ID\s([0-9]+)\s.*$/\1/') ${MOUNTPOINT}
+
+# Unmount slash filesystem
+umount ${MOUNTPOINT}