summaryrefslogtreecommitdiff
path: root/user/lilo/initramfs.patch
diff options
context:
space:
mode:
authorMax Rees <maxcrees@me.com>2020-07-11 00:49:43 -0500
committerMax Rees <maxcrees@me.com>2020-07-11 11:40:08 -0500
commita444a46387483758bb8d75cf16d48db6b7876cff (patch)
tree3b703f6100d566159b68695dad44adde0ee0748e /user/lilo/initramfs.patch
parent16126faa2815b13859fc878b387286b01a3bb85a (diff)
downloadpackages-a444a46387483758bb8d75cf16d48db6b7876cff.tar.gz
packages-a444a46387483758bb8d75cf16d48db6b7876cff.tar.bz2
packages-a444a46387483758bb8d75cf16d48db6b7876cff.tar.xz
packages-a444a46387483758bb8d75cf16d48db6b7876cff.zip
user/lilo: move trigger to easy-boot.d; adjust initramfs name
Diffstat (limited to 'user/lilo/initramfs.patch')
-rw-r--r--user/lilo/initramfs.patch81
1 files changed, 81 insertions, 0 deletions
diff --git a/user/lilo/initramfs.patch b/user/lilo/initramfs.patch
new file mode 100644
index 000000000..f6aca7f75
--- /dev/null
+++ b/user/lilo/initramfs.patch
@@ -0,0 +1,81 @@
+Adjust expected initrd name to match what dracut produces.
+
+--- lilo-24.2/scripts/liloconfig 2015-11-21 18:00:21.000000000 -0600
++++ lilo-24.2/scripts/liloconfig 2020-07-11 00:35:13.400130230 -0500
+@@ -618,8 +618,8 @@ sub write_image_config {
+ foreach $image (@vmlinuz) {
+ # search for kernel initrd file
+ chomp $image;
+- $initrd = $image;
+- $initrd =~ s/vmlinuz/initrd\.img/;
++ $initrd = $image . ".img";
++ $initrd =~ s/vmlinuz/initramfs/;
+ $initrd2 = $initrd;
+ $initrd2 =~ s/\.img//;
+ $nr2 = $nr + 1;
+@@ -694,8 +694,8 @@ sub write_imagelinks_config {
+ foreach $image (@vmlinuz) {
+ # search for kernel initrd file
+ chomp $image;
+- $initrd = $image;
+- $initrd =~ s/vmlinuz/initrd\.img/;
++ $initrd = $image . ".img";
++ $initrd =~ s/vmlinuz/initramfs/;
+ $nr2 = $nr + 1;
+
+ print MYFH_NEW 'image = ' . $image . "\n";
+@@ -837,7 +837,7 @@ Lines in the configuration file /etc/lil
+ # restricted
+ # alias = 1
+ # optional
+- initrd = /boot/initrd.img-3.17-trunk-686
++ initrd = /boot/initramfs-3.17-trunk-686.img
+
+ image = /boot/vmlinuz-3.14-trunk-686
+ label = "Linux Old"
+@@ -847,7 +847,7 @@ Lines in the configuration file /etc/lil
+ # restricted
+ # alias = 2
+ # optional
+- initrd = /boot/initrd.img-3.14-trunk-686
++ initrd = /boot/initramfs-3.14-trunk-686.img
+
+ =head1 COPYRIGHT and LICENSE
+
+--- lilo-24.2/man/liloconfig.8 2015-11-21 17:25:48.000000000 -0600
++++ lilo-24.2/man/liloconfig.8 2020-07-11 00:45:57.850132663 -0500
+@@ -140,7 +140,7 @@ Lines in the configuration file /etc/lil
+ \& # restricted
+ \& # alias = 1
+ \& # optional
+-\& initrd = /boot/initrd.img\-3.17\-trunk\-686
++\& initrd = /boot/initramfs\-3.17\-trunk\-686.img
+ \&
+ \& image = /boot/vmlinuz\-3.14\-trunk\-686
+ \& label = "Linux Old"
+@@ -150,7 +150,7 @@ Lines in the configuration file /etc/lil
+ \& # restricted
+ \& # alias = 2
+ \& # optional
+-\& initrd = /boot/initrd.img\-3.14\-trunk\-686
++\& initrd = /boot/initramfs\-3.14\-trunk\-686.img
+ .Ve
+ .SH "COPYRIGHT and LICENSE"
+ .IX Header "COPYRIGHT and LICENSE"
+--- lilo-24.2/man/lilo.conf.5 2013-06-07 14:17:39.000000000 -0500
++++ lilo-24.2/man/lilo.conf.5 2020-07-11 00:44:59.650132443 -0500
+@@ -47,12 +47,12 @@ menu-title=" John's Computer "
+ ### bootable kernel images ###
+ image=/boot/vmlinuz-2.6.29-1-i386
+ label=try
+- initrd=/boot/initrd.img-2.6.29-1-i386
++ initrd=/boot/initramfs-2.6.29-1-i386.img
+ image=/boot/vmlinuz-2.4.33-1-i386
+ label=2.4.33
+ image=/tamu/vmlinuz
+ label=tamu
+- initrd=/tamu/initrd.img
++ initrd=/tamu/initramfs.img
+ root=/dev/hdb2
+ vga=ask
+ #