[PATCH] cdrom: Rename ISO file

[PATCH] cdrom: Rename ISO file

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1208 bytes --]

This is cosmetic change to have the name of the ISO file similar to the
flash image and also have all parts of it in a reasonable order.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/cdrom | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lfs/cdrom b/lfs/cdrom
index ff4821fb5..a47faa49e 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -123,6 +123,8 @@ GRUB_EFI_MODULES = \
 	true \
 	usb_keyboard
 
+ISO_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -246,9 +248,8 @@ endif
 						xargs md5sum > md5sum.txt
 
 	mkdir -p /install/images
-	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
-		-o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
+	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) .
 
 ifeq "$(HAS_ISOLINUX)" "1"
-	isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
+	isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE)
 endif
-- 
2.30.2

Re: [PATCH] cdrom: Rename ISO file

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]

Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

> This is cosmetic change to have the name of the ISO file similar to the
> flash image and also have all parts of it in a reasonable order.
> 
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>  lfs/cdrom | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/lfs/cdrom b/lfs/cdrom
> index ff4821fb5..a47faa49e 100644
> --- a/lfs/cdrom
> +++ b/lfs/cdrom
> @@ -123,6 +123,8 @@ GRUB_EFI_MODULES = \
>  	true \
>  	usb_keyboard
>  
> +ISO_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso
> +
>  ###############################################################################
>  # Top-level Rules
>  ###############################################################################
> @@ -246,9 +248,8 @@ endif
>  						xargs md5sum > md5sum.txt
>  
>  	mkdir -p /install/images
> -	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
> -		-o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
> +	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) .
>  
>  ifeq "$(HAS_ISOLINUX)" "1"
> -	isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
> +	isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE)
>  endif