OrdinaryMagician/stuff
1
Fork 0
Code Activity

I guess I can just put this up. Most of these have been sitting here forever.

Browse source
This commit is contained in:
Marisa the Magician 2017-09-04 11:24:40 +02:00
commit d2777092d1
26 changed files with 5347 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
zfs-rootfs.patch Normal file
View file

@ -0,0 +1,21 @@
diff --git a/src/zfs-utils/zfs-utils.initcpio.hook b/src/zfs-utils/zfs-utils.initcpio.hook
index 09d081f..4337e23 100644
--- a/src/zfs-utils/zfs-utils.initcpio.hook
+++ b/src/zfs-utils/zfs-utils.initcpio.hook
@@ -53,6 +53,7 @@ zfs_mount_handler () {
fi
local node="$1"
+ local rootmnt=$(zfs get -H -o value mountpoint "${ZFS_DATASET}")
local tab_file="${node}/etc/fstab"
local zfs_datasets="$(zfs list -H -o name -t filesystem -r ${ZFS_DATASET})"
@@ -73,7 +74,7 @@ zfs_mount_handler () {
fi
;;
*)
- mount -t zfs -o "zfsutil,${rwopt_exp}" "${dataset}" "${node}${mountpoint}"
+ mount -t zfs -o "zfsutil,${rwopt_exp}" "${dataset}" "${node}/${mountpoint##${rootmnt}}"
;;
esac
done