From a52f7c5a6642ad90716aa07a2ce0c1aed269b76c 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/515] Use the Mageia naming for initrd files.

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

diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
index 0dd1938..8e67e4c 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -15,7 +15,7 @@ SKIP="$dracutbasedir/skipcpio"
 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-${KERNEL_VERSION}.img"
 
 cd /run/initramfs
 
diff --git a/dracut.8.asc b/dracut.8.asc
index 51a4e9f..94ff956 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
diff --git a/dracut.sh b/dracut.sh
index 1844336..37709f2 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -622,7 +622,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.img"
     fi
 fi
 
diff --git a/dracut.usage.asc b/dracut.usage.asc
index 6979af6..be4c608 100644
--- a/dracut.usage.asc
+++ b/dracut.usage.asc
@@ -5,7 +5,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/lsinitrd.1.asc b/lsinitrd.1.asc
index 4293910..9497de2 100644
--- a/lsinitrd.1.asc
+++ b/lsinitrd.1.asc
@@ -18,7 +18,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
 -------
diff --git a/lsinitrd.sh b/lsinitrd.sh
index 76d9f3e..54f93bd 100755
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -91,7 +91,7 @@ else
         && [[ -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}.img"
     fi
 fi
 
diff --git a/mkinitrd-dracut.sh b/mkinitrd-dracut.sh
index da34e34..84f8175 100755
--- a/mkinitrd-dracut.sh
+++ b/mkinitrd-dracut.sh
@@ -16,7 +16,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.9.2