177 lines
6.8 KiB
Diff
177 lines
6.8 KiB
Diff
--- dracut-026_git201303180829.orig/dracut.8.asc
|
|
+++ dracut-026_git201303180829/dracut.8.asc
|
|
@@ -18,7 +18,7 @@ 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.
|
|
+/boot/initrd-<kernel version> 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
|
|
@@ -47,7 +47,7 @@ To create a initramfs image, the most si
|
|
|
|
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
|
|
+system tools. The image is /boot/initrd-_++<kernel version>++_ and
|
|
contains the kernel modules of the currently active kernel with version
|
|
_++<kernel version>++_.
|
|
|
|
--- dracut-026_git201303180829.orig/dracut.asc
|
|
+++ dracut-026_git201303180829/dracut.asc
|
|
@@ -153,7 +153,7 @@ To create a initramfs image, the most si
|
|
|
|
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
|
|
+system tools. The image is /boot/initrd-_++<kernel version>++_ and
|
|
contains the kernel modules of the currently active kernel with version
|
|
_++<kernel version>++_.
|
|
|
|
@@ -193,12 +193,12 @@ kernel) as a fallback to rescue your sys
|
|
=== Inspecting the Contents
|
|
To see the contents of the image created by dracut, you can use the lsinitrd tool.
|
|
----
|
|
-# lsinitrd /boot/initramfs-$(uname -r).img | less
|
|
+# lsinitrd /boot/initrd-$(uname -r) | less
|
|
----
|
|
|
|
To display the contents of a file in the initramfs also use the lsinitrd tool:
|
|
----
|
|
-# lsinitrd /boot/initramfs-$(uname -r).img /etc/ld.so.conf
|
|
+# lsinitrd /boot/initrd-$(uname -r) /etc/ld.so.conf
|
|
include ld.so.conf.d/*.conf
|
|
----
|
|
|
|
@@ -209,7 +209,7 @@ _/etc/dracut.conf_ or _/etc/dracut.conf.
|
|
You can also add dracut modules on the command line
|
|
by using the -a or --add option:
|
|
----
|
|
-# dracut --add bootchart initramfs-bootchart.img
|
|
+# dracut --add bootchart initrd-bootchart
|
|
----
|
|
|
|
To see a list of available dracut modules, use the --list-modules option:
|
|
@@ -238,7 +238,7 @@ automatically picked up by dracut, you h
|
|
on the command line or the drivers vaiable in the _/etc/dracut.conf_
|
|
or _/etc/dracut.conf.d/myconf.conf_ configuration file (see <<dracutconf5>>):
|
|
----
|
|
-# dracut --add-drivers mymod initramfs-with-mymod.img
|
|
+# dracut --add-drivers mymod initrd-with-mymod
|
|
----
|
|
|
|
== Boot parameters
|
|
@@ -351,7 +351,7 @@ To add your own files to the initramfs i
|
|
|
|
The --include option let you specify a source path and a target path. For example
|
|
----
|
|
-# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img
|
|
+# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initrd-cmdline-pre.img
|
|
----
|
|
will create an initramfs image, where the file cmdline-preset will be copied
|
|
inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once.
|
|
@@ -373,7 +373,7 @@ rd.live.overlay/
|
|
└── conf.d
|
|
└── testvar.conf
|
|
|
|
-# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img
|
|
+# dracut --include rd.live.overlay / initrd-rd.live.overlay.img
|
|
----
|
|
|
|
This will put the contents of the rd.live.overlay directory into the root of the
|
|
@@ -385,7 +385,7 @@ creation time.
|
|
|
|
|
|
----
|
|
-# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img
|
|
+# dracut --install 'strace fsck.ext3 ssh' initrd-dbg
|
|
----
|
|
|
|
This will create an initramfs with the strace, fsck.ext3 and ssh executables,
|
|
@@ -437,7 +437,7 @@ For example for a NFS image, you would d
|
|
|
|
|
|
----
|
|
-# dracut -m "nfs network base" initramfs-nfs-only.img
|
|
+# dracut -m "nfs network base" initrd-nfs-only
|
|
----
|
|
|
|
Then you would boot from this image with your target machine and reduce the size
|
|
@@ -445,7 +445,7 @@ once more by creating it on the target m
|
|
|
|
|
|
----
|
|
-# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img
|
|
+# dracut -m "nfs network base" --host-only initrd-nfs-host-only
|
|
----
|
|
|
|
This will reduce the size of the initramfs image significantly.
|
|
--- dracut-026_git201303180829.orig/dracut-initramfs-restore.sh
|
|
+++ dracut-026_git201303180829/dracut-initramfs-restore.sh
|
|
@@ -11,7 +11,7 @@ KERNEL_VERSION="$(uname -r)"
|
|
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
|
|
IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
|
|
fi
|
|
-[[ -f $IMG ]] || IMG="/boot/initramfs-${KERNEL_VERSION}.img"
|
|
+[[ -f $IMG ]] || IMG="/boot/initrd-$(uname -r)"
|
|
|
|
cd /run/initramfs
|
|
|
|
--- dracut-026_git201303180829.orig/dracut.sh
|
|
+++ dracut-026_git201303180829/dracut.sh
|
|
@@ -478,7 +478,7 @@ if ! [[ $outfile ]]; then
|
|
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
|
|
outfile="/boot/${MACHINE_ID}/$kernel/initrd"
|
|
else
|
|
- outfile="/boot/initramfs-$kernel.img"
|
|
+ outfile="/boot/initrd-$kernel"
|
|
fi
|
|
fi
|
|
|
|
--- dracut-026_git201303180829.orig/mkinitrd-dracut.sh
|
|
+++ dracut-026_git201303180829/mkinitrd-dracut.sh
|
|
@@ -11,7 +11,7 @@ usage () {
|
|
$cmd " [--nocompress]"
|
|
$cmd " <initrd-image> <kernel-version>"
|
|
$cmd ""
|
|
- $cmd " (ex: ${0##*/} /boot/initramfs-$kver.img $kver)"
|
|
+ $cmd " (ex: ${0##*/} /boot/initrd-$kver $kver)"
|
|
|
|
[[ $1 = '-n' ]] && exit 0
|
|
exit 1
|
|
--- dracut-026_git201303180829.orig/lsinitrd.1.asc
|
|
+++ dracut-026_git201303180829/lsinitrd.1.asc
|
|
@@ -16,7 +16,7 @@ DESCRIPTION
|
|
-----------
|
|
lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
|
|
lsinitrd uses the default image _/boot/<machine-id>/<kernel-version>/initrd_ or
|
|
-_/boot/initramfs-<kernel-version>.img_.
|
|
+_/boot/initrd-<kernel-version>.img_.
|
|
|
|
OPTIONS
|
|
-------
|
|
--- dracut-026_git201303180829.orig/lsinitrd.sh
|
|
+++ dracut-026_git201303180829/lsinitrd.sh
|
|
@@ -60,7 +60,7 @@ else
|
|
if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
|
|
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
|
|
else
|
|
- image="/boot/initramfs-${KERNEL_VERSION}.img"
|
|
+ image="/boot/initrd-${KERNEL_VERSION}"
|
|
fi
|
|
fi
|
|
|
|
--- dracut-026_git201303180829.orig/51-dracut-rescue-postinst.sh
|
|
+++ dracut-026_git201303180829/51-dracut-rescue-postinst.sh
|
|
@@ -15,7 +15,7 @@ KERNEL_IMAGE="$2"
|
|
[[ $MACHINE_ID ]] || exit 1
|
|
[[ -f $KERNEL_IMAGE ]] || exit 1
|
|
|
|
-INITRDFILE="/boot/initramfs-0-rescue-${MACHINE_ID}.img"
|
|
+INITRDFILE="/boot/initrd-0-rescue-${MACHINE_ID}"
|
|
NEW_KERNEL_IMAGE="${KERNEL_IMAGE%/*}/vmlinuz-0-rescue-${MACHINE_ID}"
|
|
|
|
[[ -f $INITRDFILE ]] && [[ -f $NEW_KERNEL_IMAGE ]] && exit 0
|
|
|