From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Vovc4-0004Gj-AC for mharc-grub-devel@gnu.org; Fri, 06 Dec 2013 08:38:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vovbx-0004Fa-PW for grub-devel@gnu.org; Fri, 06 Dec 2013 08:38:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vovbs-00007d-JL for grub-devel@gnu.org; Fri, 06 Dec 2013 08:38:29 -0500 Received: from mail-ea0-x22d.google.com ([2a00:1450:4013:c01::22d]:58476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vovbs-00007M-Af for grub-devel@gnu.org; Fri, 06 Dec 2013 08:38:24 -0500 Received: by mail-ea0-f173.google.com with SMTP id o10so313011eaj.32 for ; Fri, 06 Dec 2013 05:38:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; bh=TNuwm1YDu/r+xLXLsWcI7UO3E2G7vzKmTjpuw4jJzUI=; b=bJxCk7PWiniJs0Z5nNHSmbOAXfUY1yNuTTVevlQ10NyqC2MkAelUZ2MOnBjvyLSO6+ R7Xty4u/pkoddHr0EX7j8rJy34Ll0l1ZFO82NvCC1GXEk9s66LKMNyurJUGQlSq7Dh4z YYHInIhsrK662EkRcjJrUl4y/AqJqkl21wfRSfz+INZWT4x9TT27ekdi8Xq2hZTVKmLW XcJBepCGJ+OCGntf3MTdsfHkRUtfjUFMqxWnCKPkbzwBwLA8gRSKUNEutzzWBmC6n9Na IUOriWc57HXXwbqr+GZSYZcgCRdB8U1x/BkfGHTsHkAktpPT+1OhkGKPJDU6Zq2TUeNL JNUA== X-Received: by 10.14.174.129 with SMTP id x1mr2690262eel.19.1386337103453; Fri, 06 Dec 2013 05:38:23 -0800 (PST) Received: from [192.168.1.16] (85-188.196-178.cust.bluewin.ch. [178.196.188.85]) by mx.google.com with ESMTPSA id l4sm81947910een.13.2013.12.06.05.38.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 06 Dec 2013 05:38:22 -0800 (PST) Message-ID: <52A1D34D.3020005@gmail.com> Date: Fri, 06 Dec 2013 14:38:21 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131005 Icedove/17.0.9 MIME-Version: 1.0 To: The development of GRUB 2 Subject: [PATCH] Remove GRUBFS X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="----enig2DUQMDAPGNWDSCPQVFCNA" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22d X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2013 13:38:35 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2DUQMDAPGNWDSCPQVFCNA Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable It seems that in our codebase we have both GRUBFS and GRUB_FS both referr= ing to the same thing: FS of /. Merge them diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 016ee82..7b85c88 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -139,6 +139,10 @@ GRUB_DEVICE_BOOT_UUID=3D"`${grub_probe} --device ${G= RUB_DEVICE_BOOT} --target=3Dfs_u # choosing Hurd filesystem module. GRUB_FS=3D"`${grub_probe} --device ${GRUB_DEVICE} --target=3Dfs 2> /dev/= null || echo unknown`" =20 +if [ x"$GRUB_FS" =3D xunknown ]; then + GRUB_FS=3D"$(stat -f --printf=3D%T / || echo unknown)" +fi + if test -f ${sysconfdir}/default/grub ; then . ${sysconfdir}/default/grub fi diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index e27d6f7..00d1931 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -51,13 +51,7 @@ else LINUX_ROOT_DEVICE=3DUUID=3D${GRUB_DEVICE_UUID} fi =20 -GRUBFS=3D"`${grub_probe} --device ${GRUB_DEVICE} --target=3Dfs 2>/dev/nu= ll || true`" - -if [ x"$GRUBFS" =3D x ]; then - GRUBFS=3D"$(stat -f --printf=3D%T / || true)" -fi - -case x"$GRUBFS" in +case x"$GRUB_FS" in xbtrfs) rootsubvol=3D"`make_system_path_relative_to_its_root /`" rootsubvol=3D"${rootsubvol#/}" diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index f12f059..a608435 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -59,13 +59,7 @@ if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; th= en GRUB_CMDLINE_LINUX_DEFAULT=3D"${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT= }" fi =20 -GRUBFS=3D"`${grub_probe} --device ${GRUB_DEVICE} --target=3Dfs 2>/dev/nu= ll || true`" - -if [ x"$GRUBFS" =3D x ]; then - GRUBFS=3D"$(stat -f --printf=3D%T /)" -fi - -case x"$GRUBFS" in +case x"$GRUB_FS" in xbtrfs) rootsubvol=3D"`make_system_path_relative_to_its_root /`" rootsubvol=3D"${rootsubvol#/}" ------enig2DUQMDAPGNWDSCPQVFCNA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlKh000ACgkQmBXlbbo5nOvMCAD/UxNNdMIxCvjAUGFGfkINqNlu TvMZ0sdOZBCUykM97+sBAIov/AP/Bd54TQ+liO+nLWDiYqqDfqghMmN7x7eQyiQk =oniR -----END PGP SIGNATURE----- ------enig2DUQMDAPGNWDSCPQVFCNA--