[Libosinfo] [PATCH] fedora: Adjust initrd/kernel paths to real file

[Lasse Schuirmann]

Did I ever mentioned that I hate writing commit messages? (I don't
remember me getting one right ;))

The rationale was never in the commit message, that is the sad truth.
It was only in my explanation above.

>From 5d4d60aa9d1981ac9b1896228df7fe
57cd54559f Mon Sep 17 00:00:00 2001
From: Lasse Schuirmann <lasse.schuirmann at gmail.com>
Date: Thu, 29 May 2014 17:31:48 +0200
Subject: [PATCH] fedora: Adjust initrd/kernel paths to real file

In the 32 bit iso:
- isolinux/vmlinuz is a hardlink to images/pxeboot/vmlinux
- isolinux/initrd.img is a hardlink to images/pxeboot/initrd.img

In the 64 bit iso:
- /images/pxeboot/vmlinux is a hardlink to isolinux/vmlinuz
- isolinux/initrd.img is a hardlink to images/pxeboot/initrd.img

This patch adjusts the path so that they point to the real files in
the archive instead of the hardlinks to them. This makes archive
handling lots easier because handling hardlinks in archives is
usually difficult.

---
 data/oses/fedora.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
index 27cdd4a..f33fdb0 100644
--- a/data/oses/fedora.xml.in
+++ b/data/oses/fedora.xml.in
@@ -1469,8 +1469,8 @@
         <volume-id>Fedora 20.* i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
-      <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
+      <kernel>images/pxeboot/vmlinuz</kernel>
+      <initrd>images/pxeboot/initrd.img</initrd>
     </media>
     <media arch="x86_64">
       <url>http://download.fedoraproject.org/pub/fedora/linux/releases/20/Fedora/x86_64/iso/Fedora-20-x86_64-DVD.iso</url>
@@ -1479,7 +1479,7 @@
         <system-id>LINUX</system-id>
       </iso>
       <kernel>isolinux/vmlinuz</kernel>
-      <initrd>isolinux/initrd.img</initrd>
+      <initrd>images/pxeboot/initrd.img</initrd>
     </media>

     <media arch="i686" live="true">
--
1.9.3

2014-05-29 20:38 GMT+02:00 Zeeshan Ali (Khattak) <zeeshanak at gnome.org>:
> On Thu, May 29, 2014 at 7:08 PM, Lasse Schuirmann
> <lasse.schuirmann at gmail.com> wrote:
>> Sorry for being not clearer the first time. How about this?
>>
>> From 5d4d60aa9d1981ac9b1896228df7fe57cd54559f Mon Sep 17 00:00:00 2001
>> From: Lasse Schuirmann <lasse.schuirmann at gmail.com>
>> Date: Thu, 29 May 2014 17:31:48 +0200
>> Subject: [PATCH] fedora: Adjust initrd/kernel paths to real file
>>
>> In the 32 bit iso:
>> - isolinux/vmlinuz is a hardlink to images/pxeboot/vmlinux
>> - isolinux/initrd.img is a hardlink to images/pxeboot/initrd.img
>>
>> In the 64 bit iso:
>> - /images/pxeboot/vmlinux is a hardlink to isolinux/vmlinuz
>> - isolinux/initrd.img is a hardlink to images/pxeboot/initrd.img
>>
>> This patch adjusts the path so that they point to the real files in
>> the archive instead of the hardlinks to them.
>
> Looks good but where did the rationale for this change disappear? :)
>
> --
> Regards,
>
> Zeeshan Ali (Khattak)
> ________________________________________
> Befriend GNOME: http://www.gnome.org/friends/