Rename ipfirerd to initramfs so that it will be found by grub.

diff --git a/config/rootfiles/common/i586/dracut b/config/rootfiles/common/i586/dracut
index 24516f090c9838629f2217b23e435c8c6f00f36f..53818d26b0314533ad73d2a54915b160a83bbe81 100644 (file)
--- a/config/rootfiles/common/i586/dracut
+++ b/config/rootfiles/common/i586/dracut
@@ -1,4 +1,4 @@
-#boot/ipfirerd-KVER.img
+#boot/initramfs-KVER-ipfire.img
 etc/dracut.conf
 etc/dracut.conf.d
 #etc/dracut.conf.d/dracut.conf

diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux
index 3f364aed55e54ad1ee68f0f475c1291b7bb1abc2..99dd4202d46a994cf6b7b7d4791ab5af5531af40 100644 (file)
--- a/config/rootfiles/common/i586/linux
+++ b/config/rootfiles/common/i586/linux
@@ -2954,4 +2954,4 @@ lib/modules/KVER-ipfire
 #lib/modules/KVER-ipfire/modules.symbols.bin
 #lib/modules/KVER-ipfire/source
 sbin/gen_init_cpio
-boot/ipfirerd-KVER.img
+boot/initramfs-KVER-ipfire.img

diff --git a/lfs/dracut b/lfs/dracut
index 22da76dbc630b2460f1991e847753b170209abdb..73b67bb74f5a70ae630a115d73995713efcfeda6 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -102,7 +102,7 @@ ifeq "$(MACHINE_TYPE)" "arm"
        cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-multi.img uInit-ipfire-multi
 #      cd /boot && cp -f ipfirerd-$(KVER)-multi.img zInit-ipfire-multi
 else
-       /sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
+       /sbin/dracut --force --verbose --strip /boot/initramfs-$(KVER)-ipfire.img $(KVER)-ipfire
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/initrd b/lfs/initrd
index 42da9bc7b3067b61cc73a37e5d287b660bb57c53..ce7f7943a1d363b52e0c0d8cc611c9d0a91040e4 100644 (file)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -54,7 +54,7 @@ $(TARGET) :
 
        # Finish up initrd directory
        -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys}
-       cd /install/initrd && lzma -d -c /boot/ipfirerd-$(KVER).img | cpio -i
+       cd /install/initrd && lzma -d -c /boot/initramfs-$(KVER)-ipfire.img | cpio -i
 
        # Copy Files packages for installer
        find $(DIR_SRC)/config/rootfiles/installer/* -maxdepth 1 | xargs cat | grep -v "^#" > /tmp/ROOTFILES