Accepting request 222198 from home:sfalken:branches:Base:System

Added suse_grub_manpage.patch for bug#858448

OBS-URL: https://build.opensuse.org/request/show/222198
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=96
This commit is contained in:
Shawn Dunn 2014-02-13 14:01:22 +00:00 committed by Git OBS Bridge
parent dcfca12b4b
commit bf4fe69d15
3 changed files with 50 additions and 0 deletions

View File

@ -1,4 +1,21 @@
-------------------------------------------------------------------
Thu Feb 13 05:40:32 UTC 2014 - sfalken@opensuse.org
-Updated suse_grub_manpage.patch to further correct for incorrect grub configuration paths
-------------------------------------------------------------------
Wed Feb 12 21:42:55 UTC 2014 - sfalken@opensuse.org
-Updated suse_grub_manpage.patch for dracut-036
-------------------------------------------------------------------
Wed Feb 12 12:48:16 UTC 2014 - sfalken@opensuse.org
-Added patch to fix manpage to reflect openSUSE GRUB Legacy and GRUB2
- removed patches:
* dracut_git_v034_to_head.patch
-------------------------------------------------------------------
Sun Feb 9 12:41:01 UTC 2014 - tchvatal@suse.com
- Cleanup with spec-cleaner.

View File

@ -36,6 +36,7 @@ Patch10: 0006-Install-bin-mount.patch
Patch11: 0013-Correct-paths-for-openSUSE.patch
Patch12: 0014-Check-for-plymouth-lib-directories.patch
Patch13: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
Patch14: suse_grub_manpage.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@ -107,6 +108,7 @@ This package contains tools to assemble the local initrd and host configuration.
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%build
%configure\

31
suse_grub_manpage.patch Normal file
View File

@ -0,0 +1,31 @@
diff -rupN dracut-036.old/dracut.8 dracut-036/dracut.8
--- dracut-036.old/dracut.8 2014-01-29 07:36:45.000000000 +0000
+++ dracut-036/dracut.8 2014-02-13 05:39:56.965246846 +0000
@@ -189,7 +189,7 @@ If you need a special kernel module in t
.sp
An initramfs generated without the "hostonly" mode, does not contain any system configuration files (except for some special exceptions), so the configuration has to be done on the kernel command line\&. With this flexibility, you can easily boot from a changed root partition, without the need to recompile the initramfs image\&. So, you could completly change your root partition (move it inside a md raid with encryption and LVM on top), as long as you specify the correct filesystem LABEL or UUID on the kernel command line for your root device, dracut will find it and boot from it\&.
.sp
-The kernel command line usually can be configured in \fI/boot/grub/grub\&.conf\fR, if grub is your bootloader and it also can be edited in the real boot process in the grub menu\&.
+The kernel command line usually can be configured in \fI/boot/grub/menu\&.lst\fR, for GRUB Legacy, and \fI/boot/grub2/grub\&.cfg\fR, for GRUB2 if grub is your bootloader and it also can be edited in the real boot process in the grub menu\&.
.sp
The kernel command line can also be provided by the dhcp server with the root\-path option\&. See the section called \(lqNetwork Boot\(rq\&.
.sp
diff -rupN dracut-036.old/dracut.html dracut-036/dracut.html
--- dracut-036.old/dracut.html 2014-01-29 07:36:45.000000000 +0000
+++ dracut-036/dracut.html 2014-02-12 21:41:37.988588041 +0000
@@ -1277,7 +1277,7 @@ boot from a changed root partition, with
image. So, you could completly change your root partition (move it inside a md
raid with encryption and LVM on top), as long as you specify the correct
filesystem LABEL or UUID on the kernel command line for your root device, dracut
-will find it and boot from it.</p><p>The kernel command line usually can be configured in <span class="emphasis"><em>/boot/grub/grub.conf</em></span>, if
+will find it and boot from it.</p><p>The kernel command line usually can be configured in <span class="emphasis"><em>/boot/grub/menu.lst</em></span>, for GRUB Legacy, or <span class="emphasis"><em>/boot/grub2/grub.cfg</em></span>, for GRUB2 if
grub is your bootloader and it also can be edited in the real boot process in
the grub menu.</p><p>The kernel command line can also be provided by the dhcp server with the
root-path option. See <a class="xref" href="#NetworkBoot" title="Network Boot">the section called “Network Boot”</a>.</p><p>For a full reference of all kernel command line parameters,
@@ -3228,4 +3228,4 @@ local-fs-pre.target dracu
switch-root</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_author_4"></a>AUTHOR</h2></div></div></div><p>Harald Hoyer</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_see_also_7"></a>SEE ALSO</h2></div></div></div><p><span class="strong"><strong>dracut</strong></span>(8) <span class="strong"><strong>bootup</strong></span>(7)</p></div></div><div class="appendix"><div class="titlepage"><div><div><h2 class="title"><a id="_license"></a>Appendix A. License</h2></div></div></div><p>This work is licensed under the Creative Commons Attribution/Share-Alike
License. To view a copy of this license, visit
<a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/" target="_top">http://creativecommons.org/licenses/by-sa/3.0/</a> or send a letter to Creative
-Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.</p></div></div></div></body></html>
\ No newline at end of file
+Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.</p></div></div></div></body></html>