Re: Remaining ZFS Changes for 2.00 (Was: Re: Freeze on 27 February)

["Vladimir 'φ-coder/phcoder' Serbinenko" <phcoder@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]

On 08.03.2012 23:51, Richard Laager wrote:
> I've rebased my patch sets against BZR revision 4144 and tested. Aside
>
> Index: grub/util/grub.d/10_linux.in
> ===================================================================
> --- grub.orig/util/grub.d/10_linux.in	2012-03-08 14:06:00.641410243 -0600
> +++ grub/util/grub.d/10_linux.in	2012-03-08 15:30:53.557993000 -0600
> @@ -61,9 +61,9 @@ case x"$GRUBFS" in
>  	    GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
>  	fi;;
>      xzfs)
> +	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
>  	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
> -	LINUX_ROOT_DEVICE="ZFS=${RPOOL}${bootfs}"
> -	GRUB_CMDLINE_LINUX="boot=zfs rpool=${RPOOL} bootfs=${RPOOL}${bootfs} ${cmdline} ${GRUB_CMDLINE_LINUX}";;
> +	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}"
>  esac
>  
>  title_correction_code=
>
Please, don't forget xen counterpart in the future. It's not the first
time I have to fix your patches for them

-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]