From 8248347a4982dc25d43c8159294465de2eb7d16a Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 1 Dec 2011 20:31:59 +0000
Subject: [PATCH 501/511] Use the Mageia naming for initrd files.

---
 dracut-initramfs-restore.sh |  2 +-
 dracut.8.asc                |  4 ++--
 dracut.asc                  | 22 +++++++++++-----------
 dracut.sh                   |  2 +-
 lsinitrd.1.asc              |  2 +-
 lsinitrd.sh                 |  2 +-
 mkinitrd-dracut.sh          |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 06e2939..a86ae79 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -4,7 +4,7 @@
 
 set -e
 cd /run/initramfs
-IMG="/boot/initramfs-$(uname -r).img"
+IMG="/boot/initrd-$(uname -r).img"
 [ -f .need_shutdown -a -f "$IMG" ] || exit 1
 if zcat "$IMG"  | cpio -id >/dev/null 2>&1; then
     rm .need_shutdown
diff --git a/dracut.8.asc b/dracut.8.asc
index da7f327..77d2175 100644
--- a/dracut.8.asc
+++ b/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>.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
@@ -47,7 +47,7 @@ To create a initramfs image, the most simple command is:
 
 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>++_.img and
 contains the kernel modules of the currently active kernel with version
 _++<kernel version>++_.
 
diff --git a/dracut.asc b/dracut.asc
index d11e95c..89d8bfb 100644
--- a/dracut.asc
+++ b/dracut.asc
@@ -150,7 +150,7 @@ To create a initramfs image, the most simple command is:
 
 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>++_.img and
 contains the kernel modules of the currently active kernel with version
 _++<kernel version>++_.
 
@@ -190,12 +190,12 @@ kernel) as a fallback to rescue your system.
 === 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).img | 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).img  /etc/ld.so.conf
 include ld.so.conf.d/*.conf
 ----
 
@@ -206,7 +206,7 @@ _/etc/dracut.conf_ or _/etc/dracut.conf.d/myconf.conf_. See <<dracutconf5>>.
 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.img
 ----
 
 To see a list of available dracut modules, use the --list-modules option:
@@ -235,11 +235,11 @@ automatically picked up by dracut, you have the use the --add-drivers option
 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.img
 ----
 
 == Boot parameters
-The generated initramfs.img file normally does not contain any system
+The generated initrd.img file normally 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
@@ -348,7 +348,7 @@ To add your own files to the initramfs image, you have several possibilities.
 
 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.
@@ -370,7 +370,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
@@ -382,7 +382,7 @@ creation time.
 
 
 ----
-# dracut --install 'strace fsck.ext3 ssh' initramfs-dbg.img
+# dracut --install 'strace fsck.ext3 ssh' initrd-dbg.img
 ----
 
 This will create an initramfs with the strace, fsck.ext3 and ssh executables,
@@ -434,7 +434,7 @@ For example for a NFS image, you would do:
 
 
 ----
-# dracut -m "nfs network  base" initramfs-nfs-only.img
+# dracut -m "nfs network  base" initrd-nfs-only.img
 ----
 
 Then you would boot from this image with your target machine and reduce the size
@@ -442,7 +442,7 @@ once more by creating it on the target machine with the --host-only option:
 
 
 ----
-# dracut -m "nfs network base" --host-only initramfs-nfs-host-only.img
+# dracut -m "nfs network base" --host-only initrd-nfs-host-only.img
 ----
 
 This will reduce the size of the initramfs image significantly.
diff --git a/dracut.sh b/dracut.sh
index cfd10a1..dfd6228 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -418,7 +418,7 @@ if ! [[ $kernel ]]; then
 fi
 
 if ! [[ $outfile ]]; then
-    outfile="/boot/initramfs-$kernel.img"
+    outfile="/boot/initrd-$kernel.img"
 fi
 
 for i in /usr/sbin /sbin /usr/bin /bin; do
diff --git a/lsinitrd.1.asc b/lsinitrd.1.asc
index 5b0c62e..1e88f35 100644
--- a/lsinitrd.1.asc
+++ b/lsinitrd.1.asc
@@ -15,7 +15,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 lsinitrd shows the contents of an initramfs image. if <image> is omitted, then
-lsinitrd uses the default image /boot/initramfs-<kernel version>.img.
+lsinitrd uses the default image /boot/initrd-<kernel version>.img.
 
 OPTIONS
 -------
diff --git a/lsinitrd.sh b/lsinitrd.sh
index 77a15c5..159eb76 100755
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -36,7 +36,7 @@ while getopts "s" opt; do
 done
 shift $((OPTIND-1))
 
-image="${1:-/boot/initramfs-$(uname -r).img}"
+image="${1:-/boot/initrd-$(uname -r).img}"
 [[ -f "$image" ]]    || { echo "$image does not exist" ; exit 1 ; }
 
 CAT=zcat
diff --git a/mkinitrd-dracut.sh b/mkinitrd-dracut.sh
index ffea2d1..c25843f 100644
--- a/mkinitrd-dracut.sh
+++ b/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.img $kver)"
 
     [[ $1 = '-n' ]] && exit 0
     exit 1
-- 
1.8.1