* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: grub2-migration.xml
@ 2012-07-27 16:52 Sven Vermeulen (swift)
0 siblings, 0 replies; 4+ messages in thread
From: Sven Vermeulen (swift) @ 2012-07-27 16:52 UTC (permalink / raw
To: gentoo-commits
swift 12/07/27 16:52:33
Modified: grub2-migration.xml
Log:
Kernel name can also use vmlinuz - patch by floppym
Revision Changes Path
1.2 xml/htdocs/doc/en/grub2-migration.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?r1=1.1&r2=1.2
Index: grub2-migration.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub2-migration.xml 13 Jul 2012 18:06:52 -0000 1.1
+++ grub2-migration.xml 27 Jul 2012 16:52:33 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.1 2012/07/13 18:06:52 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.2 2012/07/27 16:52:33 swift Exp $ -->
<guide>
<title>GRUB2 migration from GRUB Legacy</title>
@@ -18,8 +18,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
<license/>
-<version>1</version>
-<date>2012-07-13</date>
+<version>2</version>
+<date>2012-07-27</date>
<chapter>
<title>Background</title>
@@ -140,8 +140,8 @@
<note>
GRUB2 has strict naming requirements for kernels and initramfs images. A
-kernel must be named <c>kernel-${version}</c> while an initramfs
-must be named <c>initramfs-${version}</c>,
+kernel must be named <c>kernel-${version}</c> or <c>vmlinuz-${version}</c>
+while an initramfs must be named <c>initramfs-${version}</c>,
<c>initramfs-genkernel-${version}</c>,
<c>initramfs-genkernel-${arch}-${version}</c>,
<c>initrd-${version}.img</c>, <c>initrd.img-${version}</c>,
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: grub2-migration.xml
@ 2012-10-31 6:22 Joshua Saddler (nightmorph)
0 siblings, 0 replies; 4+ messages in thread
From: Joshua Saddler (nightmorph) @ 2012-10-31 6:22 UTC (permalink / raw
To: gentoo-commits
nightmorph 12/10/31 06:22:47
Modified: grub2-migration.xml
Log:
minor typo + punctuation fixes. also updated license to cc-by-sa 3.0. no content changes, so no revbump.
Revision Changes Path
1.3 xml/htdocs/doc/en/grub2-migration.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?r1=1.2&r2=1.3
Index: grub2-migration.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub2-migration.xml 27 Jul 2012 16:52:33 -0000 1.2
+++ grub2-migration.xml 31 Oct 2012 06:22:47 -0000 1.3
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.2 2012/07/27 16:52:33 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.3 2012/10/31 06:22:47 nightmorph Exp $ -->
<guide>
<title>GRUB2 migration from GRUB Legacy</title>
@@ -15,7 +15,7 @@
</abstract>
<!-- The content of this document is licensed under the CC-BY-SA license -->
-<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
+<!-- See http://creativecommons.org/licenses/by-sa/3.0 -->
<license/>
<version>2</version>
@@ -158,15 +158,15 @@
<p>
Because a broken GRUB configuration could mean an unbootable
-system, we want to test our GRUB2 configuration before making it permenant.
+system, we want to test our GRUB2 configuration before making it permanent.
To do this we will chainload GRUB2 from GRUB Legacy. This is done by adding
a new section into <path>/boot/grub/grub.conf</path>. An example is shown
below.
</p>
<note>
-Beaware that your root maybe different from <c>(hd0,0)</c> used in the
-example and make sure you reuse the same root value from your
+Be aware that your root may be different from <c>(hd0,0)</c> used in the
+example, and make sure you reuse the same root value from your
<path>/boot/grub/grub.conf</path>.
</note>
@@ -187,12 +187,12 @@
</pre>
<p>
-At this point you should reboot your machine and select the
-<c>GRUB2 Chainload</c> from the GRUB menu when your machine begins to boot.
-You will be presented with another GRUB menu which should advertise itself
-as GRUB 2.0.0 or higher at the top and show your available kernel(s) to boot.
-Should this not work, simply reboot your system and pick your normal boot
-option instead of <c>GRUB2 Chainload</c>.
+At this point you should reboot your machine and select <c>GRUB2 Chainload</c>
+from the GRUB menu when your machine begins to boot. You will be presented with
+another GRUB menu which should advertise itself as GRUB 2.0.0 or higher at the
+top and show your available kernel(s) to boot. Should this not work, simply
+reboot your system and pick your normal boot option instead of <c>GRUB2
+Chainload</c>.
</p>
</body>
@@ -202,13 +202,13 @@
<body>
<p>
-At this point if everything worked successfully you can replace GRUB Legacy
+At this point, if everything worked successfully, you can replace GRUB Legacy
and remove it from your system.
</p>
<note>
Since you've rebooted your system, you may need to mount <path>/boot</path>
-again. You should also take note to use your boot drive path instead of
+again. Make sure to use your own boot drive path instead of
<path>/dev/sda</path>.
</note>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: grub2-migration.xml
@ 2013-08-15 7:53 Sven Vermeulen (swift)
0 siblings, 0 replies; 4+ messages in thread
From: Sven Vermeulen (swift) @ 2013-08-15 7:53 UTC (permalink / raw
To: gentoo-commits
swift 13/08/15 07:53:27
Modified: grub2-migration.xml
Log:
Fix bug #480768 - grub2-mkconfig uses initramfs-version.img, not initramfs-version, unless its initramfs-genkernel-version, in which case it doesnt use .img
Revision Changes Path
1.4 xml/htdocs/doc/en/grub2-migration.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?r1=1.3&r2=1.4
Index: grub2-migration.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub2-migration.xml 31 Oct 2012 06:22:47 -0000 1.3
+++ grub2-migration.xml 15 Aug 2013 07:53:26 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.3 2012/10/31 06:22:47 nightmorph Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.4 2013/08/15 07:53:26 swift Exp $ -->
<guide>
<title>GRUB2 migration from GRUB Legacy</title>
@@ -18,8 +18,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/3.0 -->
<license/>
-<version>2</version>
-<date>2012-07-27</date>
+<version>3</version>
+<date>2013-08-15</date>
<chapter>
<title>Background</title>
@@ -139,9 +139,9 @@
</pre>
<note>
-GRUB2 has strict naming requirements for kernels and initramfs images. A
+<c>grub2-mkconfig</c> has strict naming requirements for kernels and initramfs images. A
kernel must be named <c>kernel-${version}</c> or <c>vmlinuz-${version}</c>
-while an initramfs must be named <c>initramfs-${version}</c>,
+while an initramfs must be named <c>initramfs-${version}.img</c>,
<c>initramfs-genkernel-${version}</c>,
<c>initramfs-genkernel-${arch}-${version}</c>,
<c>initrd-${version}.img</c>, <c>initrd.img-${version}</c>,
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo commit in xml/htdocs/doc/en: grub2-migration.xml
@ 2013-09-20 6:47 Sven Vermeulen (swift)
0 siblings, 0 replies; 4+ messages in thread
From: Sven Vermeulen (swift) @ 2013-09-20 6:47 UTC (permalink / raw
To: gentoo-commits
swift 13/09/20 06:47:50
Modified: grub2-migration.xml
Log:
Fix bug #484144 - Use /boot/grub as grub2 location
Revision Changes Path
1.5 xml/htdocs/doc/en/grub2-migration.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/grub2-migration.xml?r1=1.4&r2=1.5
Index: grub2-migration.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub2-migration.xml 15 Aug 2013 07:53:26 -0000 1.4
+++ grub2-migration.xml 20 Sep 2013 06:47:49 -0000 1.5
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.4 2013/08/15 07:53:26 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/grub2-migration.xml,v 1.5 2013/09/20 06:47:49 swift Exp $ -->
<guide>
<title>GRUB2 migration from GRUB Legacy</title>
@@ -18,8 +18,8 @@
<!-- See http://creativecommons.org/licenses/by-sa/3.0 -->
<license/>
-<version>3</version>
-<date>2013-08-15</date>
+<version>4</version>
+<date>2013-09-19</date>
<chapter>
<title>Background</title>
@@ -123,15 +123,15 @@
The next step is to install and configure GRUB2 on your <path>/boot</path>
partition without removing GRUB Legacy from your MBR. The example below
uses <path>/dev/sda</path> but you must replace it with your boot drive path.
-The first step installs the necessary GRUB2 files to <path>/boot/grub2</path>,
+The first step installs the necessary GRUB2 files to <path>/boot/grub</path>,
while the second step scans your available kernels and generates a suitable
-config file to <path>/boot/grub2/grub.cfg</path>.
+config file to <path>/boot/grub/grub.cfg</path>.
</p>
<pre caption="Installing and configuring GRUB2">
# <i>grub2-install --grub-setup=/bin/true /dev/sda</i>
Installation finished. No error reported.
-# <i>grub2-mkconfig -o /boot/grub2/grub.cfg</i>
+# <i>grub2-mkconfig -o /boot/grub/grub.cfg</i>
Generating grub.cfg ...
Found linux image: /boot/kernel-3.2.12-gentoo
Found initrd image: /boot/initramfs-genkernel-x86_64-3.2.12-gentoo
@@ -177,7 +177,7 @@
<i>title GRUB2 Chainload
root (hd0,0)
-kernel /boot/grub2/i386-pc/core.img
+kernel /boot/grub/i386-pc/core.img
boot</i>
title Gentoo Linux 3.2.12
@@ -215,7 +215,6 @@
<pre caption="Replacing GRUB Legacy">
# <i>grub2-install /dev/sda</i>
Installation finished. No error reported.
-# <i>rm -rf /boot/grub/</i>
</pre>
<p>
@@ -242,7 +241,7 @@
</note>
<pre caption="Installing a new kernel">
-# <i>grub2-mkconfig -o /boot/grub2/grub.cfg</i>
+# <i>grub2-mkconfig -o /boot/grub/grub.cfg</i>
Generating grub.cfg ...
Found linux image: /boot/kernel-3.3.8-gentoo
Found initrd image: /boot/initramfs-genkernel-x86_64-3.3.8-gentoo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-20 6:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-27 16:52 [gentoo-commits] gentoo commit in xml/htdocs/doc/en: grub2-migration.xml Sven Vermeulen (swift)
-- strict thread matches above, loose matches on Subject: below --
2012-10-31 6:22 Joshua Saddler (nightmorph)
2013-08-15 7:53 Sven Vermeulen (swift)
2013-09-20 6:47 Sven Vermeulen (swift)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox