[dracut] dracut-022-5.git20120723

Harald Hoyer harald at fedoraproject.org
Mon Jul 23 06:31:48 UTC 2012 

commit 762076093e01e6ad7e321421c88544deb5eda499
Author: Harald Hoyer <harald at redhat.com>
Date:   Mon Jul 23 08:30:53 2012 +0200

    dracut-022-5.git20120723
    
    - dracut.8: added more documentation about executing dracut

 ...add-more-description-about-calling-dracut.patch |   83 ++++++++++++++++
 0003-AUTHORS-update.patch                          |  100 ++++++++++++++++++++
 0004-dracut.sh-add-N-option-for-no-hostonly.patch  |   54 +++++++++++
 dracut.spec                                        |    8 ++-
 4 files changed, 244 insertions(+), 1 deletions(-)
---
diff --git a/0002-dracut.8-add-more-description-about-calling-dracut.patch b/0002-dracut.8-add-more-description-about-calling-dracut.patch
new file mode 100644
index 0000000..f05d297
--- /dev/null
+++ b/0002-dracut.8-add-more-description-about-calling-dracut.patch
@@ -0,0 +1,83 @@
+From 4c3be42cdf4c49785298ddb6b34beed1c8cc9d40 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Sat, 21 Jul 2012 12:52:01 +0200
+Subject: [PATCH] dracut.8: add more description about calling dracut
+
+---
+ dracut.8.asc | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 55 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.8.asc b/dracut.8.asc
+index 0cd1663..24af936 100644
+--- a/dracut.8.asc
++++ b/dracut.8.asc
+@@ -14,6 +14,12 @@ SYNOPSIS
+ 
+ DESCRIPTION
+ -----------
++
++Create an initramfs <image> for the kernel with the version <kernel version>.
++If <kernel version> is omitted, then the version of the actual running
++kernel is used. If <image> is omitted or empty, then the default location
++/boot/initramfs-<kernel version>.img is used.
++
+ dracut creates an initial image used by the kernel for preloading the block
+ device modules (such as IDE, SCSI or RAID) which are needed to access the root
+ filesystem, mounting the root filesystem and booting into the real system.
+@@ -22,7 +28,55 @@ At boot time, the kernel unpacks that archive into RAM disk, mounts and uses it
+ as initial root file system. All finding of the root device happens in this
+ early userspace.
+ 
+-For a complete list of kernel command line options see *dracut.cmdline*(7)
++For a complete list of kernel command line options see *dracut.cmdline*(7).
++
++EXAMPLE
++-------
++
++To create a initramfs image, the most simple command is:
++----
++# dracut
++----
++
++This will generate a general purpose initramfs image, with all possible
++functionality resulting of the combination of the installed dracut modules and
++system tools. The image is /boot/initramfs-_++<kernel version>++_.img and
++contains the kernel modules of the currently active kernel with version
++_++<kernel version>++_.
++
++If the initramfs image already exists, dracut will display an error message, and
++to overwrite the existing image, you have to use the --force option.
++----
++# dracut --force
++----
++
++If you want to specify another filename for the resulting image you would issue
++a command like:
++----
++# dracut foobar.img
++----
++
++To generate an image for a specific kernel version, the command would be:
++----
++# dracut foobar.img 2.6.40-1.rc5.f20
++----
++
++A shortcut to generate the image at the default location for a specific kernel
++version is:
++----
++# dracut --kver 2.6.40-1.rc5.f20
++----
++
++If you want to create lighter, smaller initramfs images, you may want to specify
++the --host-only or -H option. Using this option, the resulting image will
++contain only those dracut modules, kernel modules and filesystems, which are
++needed to boot this specific machine. This has the drawback, that you can't put
++the disk on another controller or machine, and that you can't switch to another
++root filesystem, without recreating the initramfs image. The usage of the
++--host-only option is only for experts and you will have to keep the broken
++pieces. At least keep a copy of a general purpose image (and corresponding
++kernel) as a fallback to rescue your system.
++
+ 
+ OPTIONS
+ -------
diff --git a/0003-AUTHORS-update.patch b/0003-AUTHORS-update.patch
new file mode 100644
index 0000000..0f91086
--- /dev/null
+++ b/0003-AUTHORS-update.patch
@@ -0,0 +1,100 @@
+From e5ec81a3543332ff31441647c99e202c25a59664 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Sat, 21 Jul 2012 12:55:23 +0200
+Subject: [PATCH] AUTHORS: update
+
+---
+ AUTHORS | 26 ++++++++++++++++++--------
+ 1 file changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index f7a1007..c4ed2e8 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -1,16 +1,16 @@
+ Harald Hoyer <harald at redhat.com>
+ Victor Lowther <victor.lowther at gmail.com>
++Amadeusz Żołnowski <aidecoe at aidecoe.name>
+ Philippe Seewer <philippe.seewer at bfh.ch>
+ Warren Togami <wtogami at redhat.com>
+-Amadeusz Żołnowski <aidecoe at aidecoe.name>
++Will Woods <wwoods at redhat.com>
+ Jeremy Katz <katzj at redhat.com>
+ David Dillow <dave at thedillows.org>
+-Will Woods <wwoods at redhat.com>
+ Michal Soltys <soltys at ziu.info>
+-Dave Young <dyoung at redhat.com>
+ Amerigo Wang <amwang at redhat.com>
+-Andrey Borzenkov <arvidjaar at gmail.com>
++Dave Young <dyoung at redhat.com>
+ Colin Guthrie <colin at mageia.org>
++Andrey Borzenkov <arvidjaar at gmail.com>
+ Andreas Thienemann <andreas at bawue.net>
+ Hans de Goede <hdegoede at redhat.com>
+ Peter Jones <pjones at redhat.com>
+@@ -18,30 +18,34 @@ John Reiser <jreiser at bitwagon.com>
+ Luca Berra <bluca at vodka.it>
+ Daniel Drake <dsd at laptop.org>
+ Marc Grimme <grimme at atix.de>
++Brian C. Lane <bcl at redhat.com>
+ Dan Horák <dhorak at redhat.com>
++Jesse Keating <jkeating at redhat.com>
+ Roberto Sassu <roberto.sassu at polito.it>
+ Anton Blanchard <anton at samba.org>
+ Bill Nottingham <notting at redhat.com>
+-Brian C. Lane <bcl at redhat.com>
+ David Cantrell <dcantrell at redhat.com>
++Jon Ander Hernandez <jonan.h at gmail.com>
++Juan RP <xtraeme at gmail.com>
+ Lance Albertson <lance at osuosl.org>
+ Marian Ganisin <mganisin at redhat.com>
+ Michael Ploujnikov <plouj at somanetworks.com>
++Peter Rajnoha <prajnoha at redhat.com>
+ Alan Jenkins <alan-jenkins at tuffmail.co.uk>
+ Alan Pevec <apevec at redhat.com>
+ Ian Dall <ian at beware.dropbear.id.au>
+ James Buren <ryuo at frugalware.org>
+ Joey Boggs <jboggs at redhat.com>
+-Jon Ander Hernandez <jonan.h at gmail.com>
+ Mike Snitzer <snitzer at redhat.com>
+-Peter Rajnoha <prajnoha at redhat.com>
+ Przemysław Rudy <prudy1 at o2.pl>
++Thomas Lange <lange at informatik.uni-koeln.de>
+ Vladislav Bogdanov <bubble at hoster-ok.com>
+ Alexander Todorov <atodorov at redhat.com>
+ Andy Lutomirski <luto at mit.edu>
+ Anssi Hannula <anssi at mageia.org>
+ Christian Heinz <christian.ch.heinz at gmail.com>
+ Dave Jones <davej at redhat.com>
++Dennis Gilmore <dennis at ausil.us>
+ Duane Griffin <duaneg at dghda.com>
+ Frederic Crozat <fcrozat at mandriva.com>
+ Glen Gray <slaine at slaine.org>
+@@ -50,20 +54,26 @@ James Laska <jlaska at redhat.com>
+ Jan Stodola <jstodola at redhat.com>
+ Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
+ Leho Kraav <leho at kraav.com>
++Lennert Buytenhek <buytenh at wantstofly.org>
+ Lubomir Rintel <lkundrak at v3.sk>
+ Matt <smoothsailing72 at hotmail.com>
+ Matt Smith <shadowfax at gmx.com>
+ Michal Schmidt <mschmidt at redhat.com>
++Milan Broz <mbroz at redhat.com>
+ Munehiro Matsuda <haro at kgt.co.jp>
++Nikoli <nikoli at lavabit.com>
++Olivier Blin <dev at blino.org>
+ Paolo Bonzini <pbonzini at redhat.com>
+ Peter Robinson <pbrobinson at fedoraproject.org>
+ Pádraig Brady <P at draigBrady.com>
+ Quentin Armitage <quentin at armitage.org.uk>
+ Sergey Fionov <fionov at gmail.com>
++Srinivasa T N <seenutn at linux.vnet.ibm.com>
+ Thilo Bangert <thilo.bangert at gmx.net>
+-Thomas Lange <lange at informatik.uni-koeln.de>
+ Tomasz Torcz <tomek at pipebreaker.pl>
+ Vadim Kuznetsov <vadimk at gentoo.org>
+ Ville Skyttä <ville.skytta at iki.fi>
++Vivek Goyal <vgoyal at redhat.com>
++Wim Muskee <wimmuskee at gmail.com>
+ Yanko Kaneti <yaneti at declera.com>
+ maximilian attems <max at stro.at>
diff --git a/0004-dracut.sh-add-N-option-for-no-hostonly.patch b/0004-dracut.sh-add-N-option-for-no-hostonly.patch
new file mode 100644
index 0000000..4440d0b
--- /dev/null
+++ b/0004-dracut.sh-add-N-option-for-no-hostonly.patch
@@ -0,0 +1,54 @@
+From 472189da152be23b8a7d0dabc0a3e80ea61e866b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald at redhat.com>
+Date: Sat, 21 Jul 2012 13:03:56 +0200
+Subject: [PATCH] dracut.sh: add -N option for --no-hostonly
+
+---
+ dracut.8.asc | 2 +-
+ dracut.sh    | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dracut.8.asc b/dracut.8.asc
+index 24af936..0902b3b 100644
+--- a/dracut.8.asc
++++ b/dracut.8.asc
+@@ -308,7 +308,7 @@ If chrooted to another root other than the real root device, use "--fstab" and
+ provide a valid _/etc/fstab_.
+ ====
+ 
+-**--no-hostonly**::
++**-N, --no-hostonly**::
+     Disable Host-Only mode
+ 
+ **--fstab**::
+diff --git a/dracut.sh b/dracut.sh
+index ffdcbcc..d8b3354 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -126,7 +126,7 @@ Creates initial ramdisk images for preloading modules
+                          Useful when running dracut from a git checkout.
+   -H, --hostonly        Host-Only mode: Install only what is needed for
+                          booting the local host instead of a generic host.
+-  --no-hostonly         Disables Host-Only mode
++  -N, --no-hostonly     Disables Host-Only mode
+   --fstab               Use /etc/fstab to determine the root device.
+   --add-fstab [FILE]    Add file to the initramfs fstab
+   --mount "[DEV] [MP] [FSTYPE] [FSOPTS]"
+@@ -244,7 +244,7 @@ set -- "${@/--include/++include}"
+ set -- "${@/%-i/++include}"
+ 
+ TEMP=$(unset POSIXLY_CORRECT; getopt \
+-    -o "a:m:o:d:I:k:c:L:fvqlHhM" \
++    -o "a:m:o:d:I:k:c:L:fvqlHhMN" \
+     --long kver: \
+     --long add: \
+     --long force-add: \
+@@ -356,7 +356,7 @@ while :; do
+                            && dracutbasedir="$(readlink -f ${0%/*})"
+                        ;;
+         -H|--hostonly) hostonly_l="yes" ;;
+-        --no-hostonly) hostonly_l="no" ;;
++        -N|--no-hostonly) hostonly_l="no" ;;
+         --fstab)       use_fstab_l="yes" ;;
+         -h|--help)     long_usage; exit 1 ;;
+         -i|--include)  push include_src "$2"
diff --git a/dracut.spec b/dracut.spec
index 47dea65..5a6ad69 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 022
-Release: 2.git20120720%{?dist}
+Release: 5.git20120723%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -30,6 +30,9 @@ URL: https://dracut.wiki.kernel.org/
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
 Patch1: 0001-resume-move-resume-in-the-initqueue-finished-hook.patch
+Patch2: 0002-dracut.8-add-more-description-about-calling-dracut.patch
+Patch3: 0003-AUTHORS-update.patch
+Patch4: 0004-dracut.sh-add-N-option-for-no-hostonly.patch
 
 
 BuildRequires: dash bash git
@@ -358,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/dracut/overlay
 
 %changelog
+* Mon Jul 23 2012 Harald Hoyer <harald at redhat.com> 022-5.git20120723
+- dracut.8: added more documentation about executing dracut
+
 * Fri Jul 20 2012 Harald Hoyer <harald at redhat.com> 022-2.git20120720
 - fixed some race condition for resume from hibernation

More information about the scm-commits mailing list