Skip to contentSkip to conversation

BUGS: btrfs multi-device support fixes

PATCH In review Gene Czarcinski 5 participants 16 messages Oct 26, 2013 – Oct 27, 2013

lore
Share & tools
lore
#0 lore raw

There are two patches needed in grub2 to support multi-device btrfs volumes.

This first patch (previously submitted) involves the parameters passed to grub2-probe. If not correctly passed, grub2-probe issues an error message. The related problem report is:
https://bugzilla.redhat.com/show_bug.cgi?id=890955

The second problem involves having a multi-device btrfs volume with /boot being on the btrfs volume either as part of the root subvolume or as a separate subvolume. The result is an error messare at boot time:
error: no such device: root.
hit any key to continue

The solution is to modify grub-probe.c so that " " is issued rather than "\n" for a hint. The related problem report is:
https://bugzilla.redhat.com/show_bug.cgi?id=1023161

To minimize problems, the two patches have been attached rather than provided inline.

Peter, I cc'ed you so you would be aware of these bug reports. It would be nice if this was applied to both Fedora 20 and 19.

Gene

From b9ed3e49354f5159d962c083b68cf06723a4aff5 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <[email protected]>
Date: Mon, 14 Oct 2013 16:11:00 -0400
Subject: [PATCH] support for multi-device btrfs volume

The current code produces error messages if passed a device list with multiple devices for a btrfs volume. It worked OK for single device btrfs volume.

This has been regression tested with root/boot on a regular partition, single device VG logical volume, and single device btrfs volume.

The name was change from device to devices to indicate that it could be a device list plus the comments were added.

---
 util/grub-mkconfig_lib.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
util/grub-mkconfig_lib.in +5 -2
index b48e2af..d4d6ba0 100644
@@ -270,10 +270,13 @@ gettext_printf () {
   printf "$(gettext "$gettext_printf_format")" "$@"
 }
 
+# $1 may be a list of devices separated by blanks.  grub_probe accepts
+# multiple arguments after --device but each device must be in a separate
+# argument.  Hence ${devices} rather than "${devices}".
 uses_abstraction () {
-  device="$1"
+  devices="$1"
 
-  abstraction="`"${grub_probe}" --device "${device}" --target=abstraction`"
+  abstraction="`"${grub_probe}" --device ${devices} --target=abstraction`"
   for module in ${abstraction}; do
     if test "x${module}" = "x$2"; then
       return 0
Signature · 1 line
1.8.3.1

From 4be122b0d3a8f961eaba08d67656b0afbd77f5a5 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <[email protected]>
Date: Sat, 26 Oct 2013 06:37:28 -0400
Subject: [PATCH] fix for hint problem with multi device btrfs
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

A btrfs volume can consist of more than one device. Having the output on different lines screws up the scripts which, for the most part, expect only a single device.

---
 util/grub-probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
util/grub-probe.c +1 -1
index a46f0b1..dd5de00 100644
@@ -543,7 +543,7 @@ probe (const char *path, char **device_names, char delim)
 	      print_full_name (map, dev);
 	      printf ("' ");
 	    }
-	  printf ("\n");
+	  printf (" "); /* new-line causes problems for multi-device btrfs volumes */
 
 	  grub_device_close (dev);
 	  continue;
Signature · 1 line
1.8.3.1
#1 lore raw

Rejected, similar patches is in trunk since some time.

Quoted 33 lines · Gene Czarcinski

There are two patches needed in grub2 to support multi-device btrfs volumes.

This first patch (previously submitted) involves the parameters passed to grub2-probe. If not correctly passed, grub2-probe issues an error message. The related problem report is:
https://bugzilla.redhat.com/show_bug.cgi?id=890955

The second problem involves having a multi-device btrfs volume with /boot being on the btrfs volume either as part of the root subvolume or as a separate subvolume. The result is an error messare at boot time:
error: no such device: root.
hit any key to continue

The solution is to modify grub-probe.c so that " " is issued rather than
"\n" for a hint. The related problem report is:
https://bugzilla.redhat.com/show_bug.cgi?id=1023161

To minimize problems, the two patches have been attached rather than provided inline.

Peter, I cc'ed you so you would be aware of these bug reports. It would be nice if this was applied to both Fedora 20 and 19.

Gene

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#2 lore raw
Quoted 1 line · Vladimir 'φ-coder/phcoder' Serbinenko

Rejected, similar patches is in trunk since some time.

Thanks. I was not aware that the problem had been addressed. Can you point me where to look to see what has been addressed?

Gene

Quoted 35 lines · Gene Czarcinski
Quoted 33 lines

There are two patches needed in grub2 to support multi-device btrfs volumes.

This first patch (previously submitted) involves the parameters passed to grub2-probe. If not correctly passed, grub2-probe issues an error message. The related problem report is:

   https://bugzilla.redhat.com/show_bug.cgi?id=890955

The second problem involves having a multi-device btrfs volume with /boot being on the btrfs volume either as part of the root subvolume or as a separate subvolume. The result is an error messare at boot time:
error: no such device: root.
hit any key to continue

The solution is to modify grub-probe.c so that " " is issued rather than
"\n" for a hint. The related problem report is:

   https://bugzilla.redhat.com/show_bug.cgi?id=1023161

To minimize problems, the two patches have been attached rather than provided inline.

Peter, I cc'ed you so you would be aware of these bug reports. It would be nice if this was applied to both Fedora 20 and 19.

Gene

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#3 lore raw

В Sat, 26 Oct 2013 16:16:19 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 5 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 1 line

Rejected, similar patches is in trunk since some time.

Thanks. I was not aware that the problem had been addressed. Can you point me where to look to see what has been addressed?

This is commit 588744d0dc655177d5883bdcb8f72ff5160109ed.

Quoted 42 lines

Gene

Quoted 29 lines · Gene Czarcinski
Quoted 28 lines

There are two patches needed in grub2 to support multi-device btrfs volumes.

This first patch (previously submitted) involves the parameters passed to grub2-probe. If not correctly passed, grub2-probe issues an error message. The related problem report is:

   https://bugzilla.redhat.com/show_bug.cgi?id=890955

The second problem involves having a multi-device btrfs volume with /boot being on the btrfs volume either as part of the root subvolume or as a separate subvolume. The result is an error messare at boot time:
error: no such device: root.
hit any key to continue

The solution is to modify grub-probe.c so that " " is issued rather than
"\n" for a hint. The related problem report is:

   https://bugzilla.redhat.com/show_bug.cgi?id=1023161

To minimize problems, the two patches have been attached rather than provided inline.

Peter, I cc'ed you so you would be aware of these bug reports. It would be nice if this was applied to both Fedora 20 and 19.

Gene

Quoted 6 lines
Quoted 5 lines

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#4 lore raw
Quoted 9 lines · Andrey Borzenkov

В Sat, 26 Oct 2013 16:16:19 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 5 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 1 line

Rejected, similar patches is in trunk since some time.

Thanks. I was not aware that the problem had been addressed. Can you point me where to look to see what has been addressed?

This is commit 588744d0dc655177d5883bdcb8f72ff5160109ed.

And that sure looks like something I would expect to see from a git repository!

Look, I am not stupid but I sure am confused! The grub2 website (http://www.gnu.org/software/grub/) says that all grub2 development done through bazaar repository and that you get a copy of the latest grub2 source with: |
bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub|
Well, I tried doing that and all I get is an error saying: "bzr: ERROR: Not a branch:"

Now fedora has a local git repository for grub2 located here: git://pkgs.fedoraproject.org/grub2.git and when I look at what is there I see that the updates (when they come in) appear to be in git format.

On other little thing. I I sent this current message there were TWO bug fixes (TWO patch files). I well believe that the first one was already in trunk since I had originally reported that problem in January 2013. The reason I reported it again is because it had not been pick up by fedora.

However, there is that second bug fix which I only recently found and fixed. This problem occurs when you have /boot on BTRFS either as a separate subvolume or simply as directory under the root subvolume. In 10_linux, when grub2-probe is call for hint, it returns multi-device hints separated by "\n" which completely screws things up. The patch is:

util/grub-probe.c +1 -1
index a46f0b1..dd5de00 100644
@@ -543,7 +543,7 @@ probe (const char *path, char **device_names, char delim)
           print_full_name (map, dev);
           printf ("' ");
         }
-      printf ("\n");
+      printf (" "); /* new-line causes problems for multi-device btrfs volumes */
 
       grub_device_close (dev);
       continue;
Quoted 42 lines
Quoted 41 lines

Gene

Quoted 29 lines · Gene Czarcinski
Quoted 28 lines

There are two patches needed in grub2 to support multi-device btrfs volumes.

This first patch (previously submitted) involves the parameters passed to grub2-probe. If not correctly passed, grub2-probe issues an error message. The related problem report is:

    https://bugzilla.redhat.com/show_bug.cgi?id=890955

The second problem involves having a multi-device btrfs volume with /boot being on the btrfs volume either as part of the root subvolume or as a separate subvolume. The result is an error messare at boot time:
error: no such device: root.
hit any key to continue

The solution is to modify grub-probe.c so that " " is issued rather than
"\n" for a hint. The related problem report is:

    https://bugzilla.redhat.com/show_bug.cgi?id=1023161

To minimize problems, the two patches have been attached rather than provided inline.

Peter, I cc'ed you so you would be aware of these bug reports. It would be nice if this was applied to both Fedora 20 and 19.

Gene

Quoted 5 lines
Quoted 5 lines

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#5 lore raw

В Sun, 27 Oct 2013 10:47:45 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 13 lines · Andrey Borzenkov
Quoted 9 lines

В Sat, 26 Oct 2013 16:16:19 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 5 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 1 line

Rejected, similar patches is in trunk since some time.

Thanks. I was not aware that the problem had been addressed. Can you point me where to look to see what has been addressed?

This is commit 588744d0dc655177d5883bdcb8f72ff5160109ed.

And that sure looks like something I would expect to see from a git repository!

Quoted 8 lines

Look, I am not stupid but I sure am confused! The grub2 website
(http://www.gnu.org/software/grub/) says that all grub2 development done through bazaar repository and that you get a copy of the latest grub2 source with: |
bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub|
Well, I tried doing that and all I get is an error saying: "bzr: ERROR:
Not a branch:"

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

Quoted 29 lines

Now fedora has a local git repository for grub2 located here:
git://pkgs.fedoraproject.org/grub2.git and when I look at what is there I see that the updates (when they come in) appear to be in git format.

On other little thing. I I sent this current message there were TWO bug fixes (TWO patch files). I well believe that the first one was already in trunk since I had originally reported that problem in January 2013. The reason I reported it again is because it had not been pick up by fedora.

However, there is that second bug fix which I only recently found and fixed. This problem occurs when you have /boot on BTRFS either as a separate subvolume or simply as directory under the root subvolume. In 10_linux, when grub2-probe is call for hint, it returns multi-device hints separated by "\n" which completely screws things up. The patch is:

util/grub-probe.c +1 -1
index a46f0b1..dd5de00 100644
@@ -543,7 +543,7 @@ probe (const char *path, char **device_names, char 
 delim)
            print_full_name (map, dev);
            printf ("' ");
          }
-      printf ("\n");
+      printf (" "); /* new-line causes problems for multi-device btrfs 

volumes */

        grub_device_close (dev);
        continue;
#6 lore raw

PATCH 1/1 update grub web page with reference to GIT instead of bzr.

В Sun, 27 Oct 2013 19:24:28 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 7 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

Not sure if I can commit, but - does below look sane? I'm, not sure whether other branches in GIT need to be mentioned; I guess they are more or less on "as needed" basis.

Index: grub-download.html
===================================================================
RCS file: /web/grub/grub/grub-download.html,v
retrieving revision 1.4

grub-download.html +5 -18
diff -u -p -r1.4 grub-download.html
@@ -44,32 +44,19 @@ site <a href="ftp://ftp.gnu.org/gnu/grub
 </p>
 
 <p> All the development is done through a <a
-href="http://bazaar.canonical.com/" >Bazaar</a> repository.  If you are
+href="http://git-scm.com/" >GIT</a> repository.  If you are
 interested in the cutting-edge version of GNU GRUB, for example, to test a
 newer version or to add new features, we strongly recommend giving the latest
 repository version a try.  You can obtain the latest GRUB source from the
-Bazaar:</p>
+GIT:</p>
 
-<pre><code>bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub</code></pre>
+<pre><code>git clone git://git.savannah.gnu.org/grub.git</code></pre>
 
 <p>For developers with write access via ssh, use:</p>
 
-<pre><code>bzr branch bzr+ssh://&lt;membername&gt;@bzr.savannah.gnu.org/grub/trunk/grub</code></pre>
-
-<p>You can also use scp and rsync if needed.</p>
-
-<p>In the Bazaar repository, a number of other development trees may be found.
-Notably the experimental branch of GRUB is a staging area where less tested (or
-more intrusive) changes are put before they are merged into trunk. 
-</p>
-
-<p>Other branches are listed at the GRUB <a
-href="http://bzr.savannah.gnu.org/r/grub/branches/">branch index</a> and <a
-href="http://bzr.savannah.gnu.org/r/grub/people/">individual developer
-repositories</a>.  These branches are not browsable, but can be checked
-out with Bazaar.</p>
-
+<pre><code>git clone &lt;membername&gt;@git.sv.gnu.org:/srv/git/grub.git</code></pre>
 
+<p>You can also use HTTP if needed.</p>
 
 <!-- begin footer -->
 
#13 lore raw
In reply to Andrey Borzenkov
Quoted 25 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 10:47:45 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 13 lines · Andrey Borzenkov
Quoted 9 lines

В Sat, 26 Oct 2013 16:16:19 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 5 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 1 line

Rejected, similar patches is in trunk since some time.

Thanks. I was not aware that the problem had been addressed. Can you point me where to look to see what has been addressed?

This is commit 588744d0dc655177d5883bdcb8f72ff5160109ed.

And that sure looks like something I would expect to see from a git repository!

Quoted 8 lines

Look, I am not stupid but I sure am confused! The grub2 website
(http://www.gnu.org/software/grub/) says that all grub2 development done through bazaar repository and that you get a copy of the latest grub2 source with: |
bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub|
Well, I tried doing that and all I get is an error saying: "bzr: ERROR:
Not a branch:"

Quoted 5 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

I can edit it, but I thought the git site was still under development/testing. Is the url above the best current value?

-- Bruce

Quoted 36 lines
Quoted 27 lines

Now fedora has a local git repository for grub2 located here:
git://pkgs.fedoraproject.org/grub2.git and when I look at what is there I see that the updates (when they come in) appear to be in git format.

On other little thing. I I sent this current message there were TWO bug fixes (TWO patch files). I well believe that the first one was already in trunk since I had originally reported that problem in January 2013. The reason I reported it again is because it had not been pick up by fedora.

However, there is that second bug fix which I only recently found and fixed. This problem occurs when you have /boot on BTRFS either as a separate subvolume or simply as directory under the root subvolume. In 10_linux, when grub2-probe is call for hint, it returns multi-device hints separated by "\n" which completely screws things up. The patch is:

util/grub-probe.c +1 -1
index a46f0b1..dd5de00 100644
@@ -543,7 +543,7 @@ probe (const char *path, char **device_names, char
 delim)
             print_full_name (map, dev);
             printf ("' ");
           }
-      printf ("\n");
+      printf (" "); /* new-line causes problems for multi-device btrfs

volumes */

Quoted 2 lines
         grub_device_close (dev);
         continue;

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#14 lore raw

В Sun, 27 Oct 2013 10:51:13 -0500
Bruce Dubbs <[email protected]> пишет:

Quoted 9 lines
Quoted 6 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

I can edit it, but I thought the git site was still under development/testing.

As far as I understood, it is not GIT. BZR repo is simply not there anymore.

Quoted 2 lines

Is the url above the best current value?

See patch I just sent - is it OK for you?

#7 lore raw

Re: [PATCH] update grub web page with reference to GIT instead of bzr.

In reply to Andrey Borzenkov
Quoted 4 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 19:24:28 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 1 line
Quoted 8 lines
Quoted 6 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

Not sure if I can commit, but - does below look sane?

The files are actually maintained via templates and a Makefile to attach headers and footers that can be updated easily. The file that you want to change is templates/grub-download.body.

If you do have commit privs, please do not update the html directly.

-- Bruce

#8 lore raw

Re: [PATCH] update grub web page with reference to GIT instead of bzr.

В Sun, 27 Oct 2013 11:02:09 -0500
Bruce Dubbs <[email protected]> пишет:

Quoted 9 lines
Quoted 8 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 19:24:28 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 5 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

Quoted 9 lines
Quoted 4 lines
Quoted 2 lines

As for web site - I do not know; Vladimir, who can edit this?

Not sure if I can commit, but - does below look sane?

The files are actually maintained via templates and a Makefile to attach headers and footers that can be updated easily. The file that you want to change is templates/grub-download.body.

Usually generated files are not placed under SCM control ... thank you for the hint.

Quoted 2 lines

If you do have commit privs, please do not update the html directly.

I do not know until I try :) Feel free to commit.

Index: templates/grub-download.body
===================================================================
RCS file: /web/grub/grub/templates/grub-download.body,v retrieving revision 1.1

grub-download.body +5 -16
diff -u -p -r1.1 grub-download.body
@@ -8,29 +8,18 @@ site <a href="ftp://ftp.gnu.org/gnu/grub
 </p>
 
 <p> All the development is done through a <a
-href="http://bazaar.canonical.com/" >Bazaar</a> repository.  If you are
+href="http://git-scm.com/" >GIT</a> repository.  If you are
 interested in the cutting-edge version of GNU GRUB, for example, to test a
 newer version or to add new features, we strongly recommend giving the latest
 repository version a try.  You can obtain the latest GRUB source from the
-Bazaar:</p>
+GIT:</p>
 
-<pre><code>bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub</code></pre>
+<pre><code>git clone git://git.savannah.gnu.org/grub.git</code></pre>
 
 <p>For developers with write access via ssh, use:</p>
 
-<pre><code>bzr branch bzr+ssh://&lt;membername&gt;@bzr.savannah.gnu.org/grub/trunk/grub</code></pre>
+<pre><code>git clone &lt;membername&gt;@git.sv.gnu.org:/srv/git/grub.git</code></pre>
 
-<p>You can also use scp and rsync if needed.</p>
-
-<p>In the Bazaar repository, a number of other development trees may be found.
-Notably the experimental branch of GRUB is a staging area where less tested (or
-more intrusive) changes are put before they are merged into trunk. 
-</p>
-
-<p>Other branches are listed at the GRUB <a
-href="http://bzr.savannah.gnu.org/r/grub/branches/">branch index</a> and <a
-href="http://bzr.savannah.gnu.org/r/grub/people/">individual developer
-repositories</a>.  These branches are not browsable, but can be checked
-out with Bazaar.</p>
+<p>You can also use HTTP if needed.</p>
 
 [% INCLUDE footer %]
#9 lore raw

Re: [PATCH] update grub web page with reference to GIT instead of bzr.

Quoted 17 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 11:02:09 -0500
Bruce Dubbs <[email protected]> пишет:

Quoted 14 lines
Quoted 12 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 19:24:28 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 7 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

Not sure if I can commit, but - does below look sane?

Quoted 7 lines
Quoted 4 lines

The files are actually maintained via templates and a Makefile to attach headers and footers that can be updated easily. The file that you want to change is templates/grub-download.body.

Usually generated files are not placed under SCM control ... thank you for the hint.

That's what I inherited, but the web site works directly off the commits so I think it's needed.

Quoted 4 lines
Quoted 2 lines

If you do have commit privs, please do not update the html directly.

I do not know until I try :) Feel free to commit.

I'll do that, but would like confirmation. Vladimir, does this look OK to you?

-- Bruce

Quoted 48 lines

Index: templates/grub-download.body
===================================================================
RCS file: /web/grub/grub/templates/grub-download.body,v retrieving revision 1.1
diff -u -p -r1.1 grub-download.body

grub-download.body +5 -16
@@ -8,29 +8,18 @@ site <a href="ftp://ftp.gnu.org/gnu/grub
  </p>
 
  <p> All the development is done through a <a
-href="http://bazaar.canonical.com/" >Bazaar</a> repository.  If you are
+href="http://git-scm.com/" >GIT</a> repository.  If you are
  interested in the cutting-edge version of GNU GRUB, for example, to test a
  newer version or to add new features, we strongly recommend giving the latest
  repository version a try.  You can obtain the latest GRUB source from the
-Bazaar:</p>
+GIT:</p>
 
-<pre><code>bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub</code></pre>
+<pre><code>git clone git://git.savannah.gnu.org/grub.git</code></pre>
 
  <p>For developers with write access via ssh, use:</p>
 
-<pre><code>bzr branch bzr+ssh://&lt;membername&gt;@bzr.savannah.gnu.org/grub/trunk/grub</code></pre>
+<pre><code>git clone &lt;membername&gt;@git.sv.gnu.org:/srv/git/grub.git</code></pre>
 
-<p>You can also use scp and rsync if needed.</p>
-
-<p>In the Bazaar repository, a number of other development trees may be found.
-Notably the experimental branch of GRUB is a staging area where less tested (or
-more intrusive) changes are put before they are merged into trunk.
-</p>
-
-<p>Other branches are listed at the GRUB <a
-href="http://bzr.savannah.gnu.org/r/grub/branches/">branch index</a> and <a
-href="http://bzr.savannah.gnu.org/r/grub/people/">individual developer
-repositories</a>.  These branches are not browsable, but can be checked
-out with Bazaar.</p>
+<p>You can also use HTTP if needed.</p>
 
  [% INCLUDE footer %]

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#12 lore raw

Re: [PATCH] update grub web page with reference to GIT instead of bzr.

In reply to Andrey Borzenkov
Quoted 11 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 19:24:28 +0400
Andrey Borzenkov <[email protected]> пишет:

Quoted 7 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

As for web site - I do not know; Vladimir, who can edit this?

AFAIR everyone who is allowed to commit but remember 2 things:
1) it's in CVS
2) it take a little while to update after upload.

Quoted 3 lines

Not sure if I can commit, but - does below look sane? I'm, not sure whether other branches in GIT need to be mentioned; I guess they are more or less on "as needed" basis.

The branches multiboot, multiboot2 and grub-legacy are permanent, others are on the need basis. We keep grub-legacy for copyright tracking reasons, users are not supposed to use it at all.

Quoted 47 lines

Index: grub-download.html
===================================================================
RCS file: /web/grub/grub/grub-download.html,v
retrieving revision 1.4
diff -u -p -r1.4 grub-download.html

grub-download.html +5 -18
@@ -44,32 +44,19 @@ site <a href="ftp://ftp.gnu.org/gnu/grub
 </p>
 
 <p> All the development is done through a <a
-href="http://bazaar.canonical.com/" >Bazaar</a> repository.  If you are
+href="http://git-scm.com/" >GIT</a> repository.  If you are
 interested in the cutting-edge version of GNU GRUB, for example, to test a
 newer version or to add new features, we strongly recommend giving the latest
 repository version a try.  You can obtain the latest GRUB source from the
-Bazaar:</p>
+GIT:</p>
 
-<pre><code>bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub</code></pre>
+<pre><code>git clone git://git.savannah.gnu.org/grub.git</code></pre>
 
 <p>For developers with write access via ssh, use:</p>
 
-<pre><code>bzr branch bzr+ssh://&lt;membername&gt;@bzr.savannah.gnu.org/grub/trunk/grub</code></pre>
-
-<p>You can also use scp and rsync if needed.</p>
-
-<p>In the Bazaar repository, a number of other development trees may be found.
-Notably the experimental branch of GRUB is a staging area where less tested (or
-more intrusive) changes are put before they are merged into trunk. 
-</p>
-
-<p>Other branches are listed at the GRUB <a
-href="http://bzr.savannah.gnu.org/r/grub/branches/">branch index</a> and <a
-href="http://bzr.savannah.gnu.org/r/grub/people/">individual developer
-repositories</a>.  These branches are not browsable, but can be checked
-out with Bazaar.</p>
-
+<pre><code>git clone &lt;membername&gt;@git.sv.gnu.org:/srv/git/grub.git</code></pre>
 
+<p>You can also use HTTP if needed.</p>
 
 <!-- begin footer -->
 
#10 lore raw

Re: [PATCH] update grub web page with reference to GIT instead of bzr.

In reply to Bruce Dubbs
Quoted 8 lines · Bruce Dubbs
Quoted 5 lines
Quoted 3 lines

If you do have commit privs, please do not update the html directly.

I do not know until I try :) Feel free to commit.

I'll do that, but would like confirmation. Vladimir, does this look OK to you?

Yes, it does. Thanks for taking care of this.

#11 lore raw

Re: [PATCH] update grub web page with reference to GIT instead of bzr.

Quoted 10 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 8 lines · Bruce Dubbs
Quoted 5 lines
Quoted 3 lines

If you do have commit privs, please do not update the html directly.

I do not know until I try :) Feel free to commit.

I'll do that, but would like confirmation. Vladimir, does this look OK to you?

Yes, it does. Thanks for taking care of this.

OK, updated.

-- Bruce

#15 lore raw
In reply to Andrey Borzenkov
Quoted 24 lines · Andrey Borzenkov

В Sun, 27 Oct 2013 10:47:45 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 13 lines · Andrey Borzenkov
Quoted 9 lines

В Sat, 26 Oct 2013 16:16:19 -0400
Gene Czarcinski <[email protected]> пишет:

Quoted 5 lines · Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 1 line

Rejected, similar patches is in trunk since some time.

Thanks. I was not aware that the problem had been addressed. Can you point me where to look to see what has been addressed?

This is commit 588744d0dc655177d5883bdcb8f72ff5160109ed.

And that sure looks like something I would expect to see from a git repository!

Quoted 8 lines

Look, I am not stupid but I sure am confused! The grub2 website
(http://www.gnu.org/software/grub/) says that all grub2 development done through bazaar repository and that you get a copy of the latest grub2 source with: |
bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub|
Well, I tried doing that and all I get is an error saying: "bzr: ERROR:
Not a branch:"

Quoted 3 lines

That's where website lags behind. GRUB switched to GIT a while ago. See

https://savannah.gnu.org/git/?group=grub

Thank you, thank you. This helps a great deal. In a way, I am not surprised that you switched to git as I find that most projects I contribute to are using git repositories and, personally, I find them easy to use.

Concerning the patches I submitted, if I had access to the repository before I submitted them, I never would have submitted them. I would also have saved myself a lot of time and effort because right about the time this patch was added is about the time I was troubleshooting multi-device BTRFS.

Gene

Quoted 33 lines

As for web site - I do not know; Vladimir, who can edit this?

Quoted 29 lines

Now fedora has a local git repository for grub2 located here:
git://pkgs.fedoraproject.org/grub2.git and when I look at what is there I see that the updates (when they come in) appear to be in git format.

On other little thing. I I sent this current message there were TWO bug fixes (TWO patch files). I well believe that the first one was already in trunk since I had originally reported that problem in January 2013. The reason I reported it again is because it had not been pick up by fedora.

However, there is that second bug fix which I only recently found and fixed. This problem occurs when you have /boot on BTRFS either as a separate subvolume or simply as directory under the root subvolume. In 10_linux, when grub2-probe is call for hint, it returns multi-device hints separated by "\n" which completely screws things up. The patch is:

util/grub-probe.c +1 -1
index a46f0b1..dd5de00 100644
@@ -543,7 +543,7 @@ probe (const char *path, char **device_names, char
 delim)
             print_full_name (map, dev);
             printf ("' ");
           }
-      printf ("\n");
+      printf (" "); /* new-line causes problems for multi-device btrfs

volumes */

         grub_device_close (dev);
         continue;