From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 24 Sep 2013 11:22:08 +0000 (+0400)
Subject: 	* docs/grub.texi (File name syntax): Document ZFS filenames
X-Git-Tag: grub-2.02-beta1~812
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3328b68ed43a60b2e80b54fc38382de5dcaaf24;p=thirdparty%2Fgrub.git

	* docs/grub.texi (File name syntax): Document ZFS filenames
	(/volume@snapshot/...).
---

diff --git a/ChangeLog b/ChangeLog
index d0f1c5535..a8903f0f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-24  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* docs/grub.texi (File name syntax): Document ZFS filenames
+	(/volume@snapshot/...).
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk_windows.c (grub_util_get_windows_path):
diff --git a/docs/grub.texi b/docs/grub.texi
index 574f60292..575cae02e 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2564,6 +2564,13 @@ GRUB's @dfn{root device} implicitly. So if you set the root device to,
 say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
 then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
 
+On ZFS filesystem the first path component must be
+@var{volume}@samp{@@}[@var{snapshot}].
+So @samp{/rootvol@@snap-129/boot/grub/grub.cfg} refers to file
+@samp{/boot/grub/grub.cfg} in snapshot of volume @samp{rootvol} with name
+@samp{snap-129}.  Trailing @samp{@@} after volume name is mandatory even if
+snapshot name is omitted.
+
 
 @node Block list syntax
 @section How to specify block lists