Bug#605029: account for ZFS in warning
partman-ufs complains when the root filesystem is not UFS. Given that
ZFS as root is now supported, I think it should only complain if it's
neither UFS nor ZFS.
Also, the warning requires that the user select UFS as root filesystem,
I think it should be adjusted to require either UFS or ZFS.
This patch does both things. I'm aware that the second one requires
translations to be reviewed. If that's not desireable at this point,
then please at least include the first part of my patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- check.d/ufs_root (revision 65781)
+++ check.d/ufs_root (working copy)
@@ -31,8 +31,8 @@
-# We need a root UFS filesystem
-if [ "$root_fs" != ufs ]; then
+# We need a root UFS or ZFS filesystem
+if [ "$root_fs" != ufs ] && [ "$root_fs" != zfs ]; then
db_set partman-ufs/root_not_ufs true
db_input critical partman-ufs/root_not_ufs || true
db_go || true
--- debian/partman-ufs.templates (revision 65781)
+++ debian/partman-ufs.templates (working copy)
@@ -32,9 +32,9 @@
_Description: Go back to the menu and correct this problem?
- Your root partition has not been configured with the UFS file
+ Your root partition has not been configured with a bootable file
system. This is needed by your machine in order to boot. Please go
- back and use UFS file system.
+ back and use either the UFS or the ZFS file system.
If you do not go back to the partitioning menu and correct this error,
the partition will be used as is. This means that you may not be able