Revision: 2645
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2645
Author: robertmh
Date: 2009-10-24 23:15:48 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
2009-10-25 Robert Millan <[email protected]>
* fs/cpio.c [MODE_USTAR]: Finish `tar' module instead of
`cpio'.
[! MODE_USTAR]: Finish `cpio' module instead of `tar'.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/fs/cpio.c
Property Changed:
----------------
trunk/grub2/
Property changes on: trunk/grub2
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-10-25 00:58:14.723000050 +0200
committer: Robert Millan <[email protected]>
properties:
branch-nick: tmp
+ timestamp: 2009-10-25 01:13:27.684999943 +0200
committer: Robert Millan <[email protected]>
properties:
branch-nick: tmp
Modified: bzr:revision-id:v3-single1-dHJ1bmsvZ3J1YjI.
- 1769 [email protected]
+ 1769 [email protected]
1770 [email protected]
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-10-24 23:03:02 UTC (rev 2644)
+++ trunk/grub2/ChangeLog 2009-10-24 23:15:48 UTC (rev 2645)
@@ -1,5 +1,11 @@
2009-10-25 Robert Millan <[email protected]>
+ * fs/cpio.c [MODE_USTAR]: Finish `tar' module instead of
+ `cpio'.
+ [! MODE_USTAR]: Finish `cpio' module instead of `tar'.
+
+2009-10-25 Robert Millan <[email protected]>
+
Patch from Samuel Thibault <[email protected]>
* docs/grub.cfg: Compensate for recent change in multiboot
loader (since 2009-08-14 it won't pass filename to payload).
Modified: trunk/grub2/fs/cpio.c
===================================================================
--- trunk/grub2/fs/cpio.c 2009-10-24 23:03:02 UTC (rev 2644)
+++ trunk/grub2/fs/cpio.c 2009-10-24 23:15:48 UTC (rev 2645)
@@ -362,9 +362,9 @@
}
#ifdef MODE_USTAR
+GRUB_MOD_FINI (tar)
+#else
GRUB_MOD_FINI (cpio)
-#else
-GRUB_MOD_FINI (tar)
#endif
{
grub_fs_unregister (&grub_cpio_fs);
