From 871298e0b0eacb19a148b36390f885a30eacf23a Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 1 Dec 2011 20:31:59 +0000
Subject: [PATCH 502/514] 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 68ea387..412262f 100644
--- a/dracut-initramfs-restore.sh
+++ b/dracut-initramfs-restore.sh
@@ -38,8 +38,8 @@ elif [[ -d /boot/efi/loader/entries ]] || [[ -L /boot/efi/loader/entries ]] \
     IMG="/boot/efi/$MACHINE_ID/$KERNEL_VERSION/initrd"
 elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
     IMG="/lib/modules/${KERNEL_VERSION}/initrd"
-elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
-    IMG="/boot/initramfs-${KERNEL_VERSION}.img"
+elif [[ -f /boot/initrd-${KERNEL_VERSION}.img ]]; then
+    IMG="/boot/initrd-${KERNEL_VERSION}.img"
 elif mountpoint -q /efi; then
     IMG="/efi/$MACHINE_ID/$KERNEL_VERSION/initrd"
 elif mountpoint -q /boot/efi; then
diff --git a/man/dracut.8.asc b/man/dracut.8.asc
index bfb86f5..d75f580 100644
--- a/man/dracut.8.asc
+++ b/man/dracut.8.asc
@@ -24,7 +24,7 @@ _/efi/<machine-id>/<kernel-version>/initrd_,
 _/boot/<machine-id>/<kernel-version>/initrd_,
 _/boot/efi/<machine-id>/<kernel-version>/initrd_,
 _/lib/modules/<kernel-version>/initrd_ or
-_/boot/initramfs-<kernel-version>.img_.
+_/boot/initrd-<kernel-version>.img_.
 
 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 a1ea1bc..80b9924 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1140,7 +1140,7 @@ if ! [[ $outfile ]]; then
         elif [[ -f "$dracutsysrootdir"/lib/modules/${kernel}/initrd ]]; then
             outfile="$dracutsysrootdir/lib/modules/${kernel}/initrd"
         elif [[ -e $dracutsysrootdir/boot/vmlinuz-${kernel} ]]; then
-            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
+            outfile="$dracutsysrootdir/boot/initrd-${kernel}.img"
         elif [[ -z $dracutsysrootdir ]] \
             && [[ $MACHINE_ID ]] \
             && mountpoint -q /efi; then
@@ -1150,7 +1150,7 @@ if ! [[ $outfile ]]; then
             && mountpoint -q /boot/efi; then
             outfile="/boot/efi/${MACHINE_ID}/${kernel}/initrd"
         else
-            outfile="$dracutsysrootdir/boot/initramfs-${kernel}.img"
+            outfile="$dracutsysrootdir/boot/initrd-${kernel}.img"
         fi
     fi
 fi
diff --git a/man/dracut.usage.asc b/man/dracut.usage.asc
index b061aea..265be73 100644
--- a/man/dracut.usage.asc
+++ b/man/dracut.usage.asc
@@ -10,7 +10,7 @@ _/efi/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
 _/boot/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
 _/boot/efi/_++<machine-id>++_/_++<kernel-version>++_/initrd_,
 _/lib/modules/_++<kernel-version>++_/initrd_ or
-_/boot/initramfs-_++<kernel-version>++_.img_ and contains the kernel modules of
+_/boot/initrd-_++<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
diff --git a/man/lsinitrd.1.asc b/man/lsinitrd.1.asc
index b89c5fc..4e4e60a 100644
--- a/man/lsinitrd.1.asc
+++ b/man/lsinitrd.1.asc
@@ -22,7 +22,7 @@ lsinitrd uses the default image _/efi/<machine-id>/<kernel-version>/initrd_,
 _/boot/<machine-id>/<kernel-version>/initrd_,
 _/boot/efi/<machine-id>/<kernel-version>/initrd_,
 _/lib/modules/<kernel-version>/initrd_ or
-_/boot/initramfs-<kernel-version>.img_.
+_/boot/initrd-<kernel-version>.img_.
 
 OPTIONS
 -------
diff --git a/lsinitrd.sh b/lsinitrd.sh
index 39be169..24ab2f6 100755
--- a/lsinitrd.sh
+++ b/lsinitrd.sh
@@ -131,8 +131,8 @@ else
         image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
     elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then
         image="/lib/modules/${KERNEL_VERSION}/initrd"
-    elif [[ -f /boot/initramfs-${KERNEL_VERSION}.img ]]; then
-        image="/boot/initramfs-${KERNEL_VERSION}.img"
+    elif [[ -f /boot/initrd-${KERNEL_VERSION}.img ]]; then
+        image="/boot/initrd-${KERNEL_VERSION}.img"
     elif [[ $MACHINE_ID ]] \
         && mountpoint -q /efi; then
         image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-- 
2.13.5