Merge pull request #1182 from jsmeix/create_ReaR_initrd_preferably_wi…

…th_lzma_but_use_gzip_as_fallback_issue1142 New REAR_INITRD_COMPRESSION config variable to specify the compression of the recovery system initrd, see #1142
rear · Jan 27, 2017 · c4754a3 · c4754a3
2 parents cf1ed55 + 700e76b
commit c4754a3
Show file tree

Hide file tree

Showing 19 changed files with 148 additions and 73 deletions.
diff --git a/usr/share/rear/backup/NETFS/default/500_make_backup.sh b/usr/share/rear/backup/NETFS/default/500_make_backup.sh
@@ -54,7 +54,7 @@ if [[ -n "$ISO_MAX_SIZE" ]]; then
     # Computation of the real backup maximum size by excluding bootable files size on the first ISO (EFI, kernel, ramdisk)
     # Don't use that on max size less than 200MB which would result in too many backups
     if [[ $ISO_MAX_SIZE -gt 200 ]]; then
-        INITRD_SIZE=$(stat -c '%s' $TMP_DIR/initrd.cgz)
+        INITRD_SIZE=$(stat -c '%s' $TMP_DIR/$REAR_INITRD_FILENAME)
         KERNEL_SIZE=$(stat -c '%s' $KERNEL_FILE)
         # We add 15MB which is the average size of all isolinux binaries
         BASE_ISO_SIZE=$(((${INITRD_SIZE}+${KERNEL_SIZE})/1024/1024+15))

diff --git a/usr/share/rear/conf/default.conf b/usr/share/rear/conf/default.conf
@@ -1357,6 +1357,32 @@ GRUB_RESCUE_USER=""
 # instead of '1' also any value that is recognized as 'yes' by the is_true function can be used
 USING_UEFI_BOOTLOADER=
 
+##
+# REAR_INITRD_COMPRESSION
+#
+# What compression to use when creating the initramfs/initrd for the ReaR rescue/recovery system.
+# By default and also as fallback an initrd.cgz with gzip default compression is created.
+# The default is known to work well in practice.
+# The ReaR rescue/recovery system initrd is loaded by various bootloaders (normally syslinux).
+# Usually any bootloader should be able to load any initrd file but then
+# the initrd must be usable by the kernel which means a specially compressed initrd
+# may not always work, in particular not with older kernels.
+# When booting on ppc64 with the yaboot bootloader the initrd must be less than 32MB
+# so that in this case the lzma compression could be even required
+# see https://github.com/rear/rear/issues/1142
+# In genaral a smaller initrd is loaded faster by the ReaR rescue/recovery system bootloader
+# so that a small initrd could make the whole system recovery a bit faster.
+# With REAR_INITRD_COMPRESSION="fast"
+# an initrd.cgz with gzip --fast compression is created (fast creating but less compression).
+# With REAR_INITRD_COMPRESSION="best"
+# an initrd.cgz with gzip --best compression is created (best gzip compression but slower creating).
+# With REAR_INITRD_COMPRESSION="lzma"
+# an initrd.xz with xz using the lzma compression is created (very best compression but very slow).
+# An initrd.xz with lzma compression may not work in this or that case.
+# An initrd.xz with lzma compression is known not to work together with DRLM,
+# see https://github.com/rear/rear/pull/1182#issuecomment-275423441
+REAR_INITRD_COMPRESSION=""
+
 ##
 # advanced handling of Relax-and-Recover result (boot image)
 ##

diff --git a/usr/share/rear/lib/bootloader-functions.sh b/usr/share/rear/lib/bootloader-functions.sh
@@ -259,7 +259,7 @@ function make_syslinux_config {
 	syslinux_menu_help "Rescue image kernel $KERNEL_VERSION ${IPADDR:+on $IPADDR} $(date -R)" \
 			"${BACKUP:+BACKUP=$BACKUP} ${OUTPUT:+OUTPUT=$OUTPUT} ${BACKUP_URL:+BACKUP_URL=$BACKUP_URL}"
 	echo "kernel kernel"
-	echo "append initrd=initrd.cgz root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE"
+	echo "append initrd=$REAR_INITRD_FILENAME root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE"
 	if [ "$ISO_DEFAULT" == "manual" ] ; then
                echo "default rear"
                syslinux_menu "default"
@@ -272,7 +272,7 @@ function make_syslinux_config {
 	syslinux_menu_help "Rescue image kernel $KERNEL_VERSION ${IPADDR:+on $IPADDR} $(date -R)" \
 			"${BACKUP:+BACKUP=$BACKUP} ${OUTPUT:+OUTPUT=$OUTPUT} ${BACKUP_URL:+BACKUP_URL=$BACKUP_URL}"
 	echo "kernel kernel"
-	echo "append initrd=initrd.cgz root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE auto_recover"
+	echo "append initrd=$REAR_INITRD_FILENAME root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE auto_recover"
 
 	if [ "$ISO_DEFAULT" == "automatic" ] ; then
                echo "default rear-automatic"
@@ -451,7 +451,7 @@ default = "Relax-and-Recover (no Secure Boot)"
 
 image = kernel
     label = "Relax-and-Recover (no Secure Boot)"
-    initrd = initrd.cgz
+    initrd = $REAR_INITRD_FILENAME
 EOF
     [[ -n $KERNEL_CMDLINE ]] && cat << EOF
     append = "$KERNEL_CMDLINE"
@@ -486,14 +486,14 @@ menuentry "Relax-and-Recover (no Secure Boot)"  --class gnu-linux --class gnu --
      echo 'Loading kernel ...'
      linux /isolinux/kernel root=UUID=$root_uuid $KERNEL_CMDLINE
      echo 'Loading initial ramdisk ...'
-     initrd /isolinux/initrd.cgz
+     initrd /isolinux/$REAR_INITRD_FILENAME
 }
 
 menuentry "Relax-and-Recover (Secure Boot)"  --class gnu-linux --class gnu --class os {
      echo 'Loading kernel ...'
      linuxefi /isolinux/kernel root=UUID=$root_uuid $KERNEL_CMDLINE
      echo 'Loading initial ramdisk ...'
-     initrdefi /isolinux/initrd.cgz
+     initrdefi /isolinux/$REAR_INITRD_FILENAME
 }
 
 menuentry "Reboot" {

diff --git a/usr/share/rear/output/ISO/Linux-i386/250_populate_efibootimg.sh b/usr/share/rear/output/ISO/Linux-i386/250_populate_efibootimg.sh
@@ -38,8 +38,8 @@ if [[ $(basename $ISO_MKISOFS_BIN) = "ebiso" ]]; then
         # copy initrd and kernel inside efi_boot image as
         cp -pL $v $KERNEL_FILE $TMP_DIR/mnt/EFI/BOOT/kernel >&2
         StopIfError "Could not copy kernel to UEFI"
-        cp $v $TMP_DIR/initrd.cgz $TMP_DIR/mnt/EFI/BOOT/initrd.cgz >&2
-        StopIfError "Could not copy initrd to UEFI"
+        cp $v $TMP_DIR/$REAR_INITRD_FILENAME $TMP_DIR/mnt/EFI/BOOT/$REAR_INITRD_FILENAME >&2
+        StopIfError "Could not copy $REAR_INITRD_FILENAME to UEFI"
         create_ebiso_elilo_conf > $TMP_DIR/mnt/EFI/BOOT/elilo.conf
         create_grub2_cfg > $TMP_DIR/mnt/EFI/BOOT/grub.cfg
     fi
@@ -52,7 +52,7 @@ timeout 5
 splashimage=/EFI/BOOT/splash.xpm.gz
 title Relax-and-Recover (no Secure Boot)
     kernel /isolinux/kernel
-    initrd /isolinux/initrd.cgz
+    initrd /isolinux/$REAR_INITRD_FILENAME
 
 EOF
 else

diff --git a/usr/share/rear/output/ISO/Linux-i386/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-i386/800_create_isofs.sh
@@ -13,13 +13,12 @@ StopIfError "ISO_MKISOFS_BIN [$ISO_MKISOFS_BIN] not an executable !"
 if [[ $(basename $ISO_MKISOFS_BIN) = "ebiso" && $(basename ${UEFI_BOOTLOADER}) = "elilo.efi" ]]; then
    Log "Kernel is already present in virtual image, skipping"
 else
-   Log "Copying kernel"
-   #cp -pL $v $KERNEL_FILE $TMP_DIR/kernel >&2
+   Log "Copying kernel and initrd"
    cp -pL $v $KERNEL_FILE $TMP_DIR/isofs/isolinux/kernel >&2
-   cp $v $TMP_DIR/initrd.cgz $TMP_DIR/isofs/isolinux/initrd.cgz >&2
+   cp $v $TMP_DIR/$REAR_INITRD_FILENAME $TMP_DIR/isofs/isolinux/$REAR_INITRD_FILENAME >&2
 fi
 
-#ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel $TMP_DIR/initrd.cgz )
+#ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel $TMP_DIR/$REAR_INITRD_FILENAME )
 # in case the user populates this array manually we must not forget to copy
 # these files to our temporary isofs
 if test "${#ISO_FILES[@]}" -gt 0 ; then

diff --git a/usr/share/rear/output/ISO/Linux-ia64/300_create_bootimg.sh b/usr/share/rear/output/ISO/Linux-ia64/300_create_bootimg.sh
@@ -12,7 +12,7 @@ mkdir $v -p $TMP_DIR/mnt/boot >&2
 cp -L $v "$ELILO_BIN" $TMP_DIR/mnt/boot >&2
 StopIfError "Could not find $ELILO_BIN"
 
-cp $v $TMP_DIR/initrd.cgz $TMP_DIR/mnt/boot
+cp $v $TMP_DIR/$REAR_INITRD_FILENAME $TMP_DIR/mnt/boot
 
 #VMLINUX_KERNEL=`find / -xdev -name "vmlinu*-${KERNEL_VERSION}"`
 #cp "${VMLINUX_KERNEL}" $TMP_DIR/mnt/boot/kernel
@@ -29,7 +29,7 @@ timeout=50
 
 image=kernel
 	label=rear
-	initrd=initrd.cgz
+	initrd=$REAR_INITRD_FILENAME
 	read-only
 	append="ramdisk=512000 $CONSOLE  rhgb selinux=0"
 EOF

diff --git a/usr/share/rear/output/ISO/Linux-ppc64/300_create_yaboot.sh b/usr/share/rear/output/ISO/Linux-ppc64/300_create_yaboot.sh
@@ -57,7 +57,7 @@ default=Relax-and-Recover
 
 image=kernel
 	label=Relax-and-Recover
-	initrd=initrd.cgz
+	initrd=$REAR_INITRD_FILENAME
 	append=" root=/dev/ram0 $KERNEL_CMDLINE"
 
 EOF

diff --git a/usr/share/rear/output/ISO/Linux-ppc64/310_create_grub2.sh b/usr/share/rear/output/ISO/Linux-ppc64/310_create_grub2.sh
@@ -26,7 +26,7 @@ set timeout=100
 
 menuentry "Relax-and-Recover" {
 	linux   /kernel root=/dev/ram0 $KERNEL_CMDLINE
-	initrd  /initrd.cgz
+	initrd  /$REAR_INITRD_FILENAME
 }
 EOF
 

diff --git a/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64/800_create_isofs.sh
@@ -13,9 +13,9 @@ Log "Copying kernel"
 cp -pL $v $KERNEL_FILE $TMP_DIR/kernel >&2
 
 if [[ "$SUSE_STYLE" ]]; then
-  ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz yaboot)
+  ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel $REAR_INITRD_FILENAME yaboot)
 else
-  ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz)
+  ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel $REAR_INITRD_FILENAME)
 fi
 Log "Starting '$ISO_MKISOFS_BIN'"
 LogPrint "Making ISO image"

diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/300_create_grub2.sh b/usr/share/rear/output/ISO/Linux-ppc64le/300_create_grub2.sh
@@ -21,7 +21,7 @@ set timeout=100
 
 menuentry "Relax-and-Recover" {
 	linux   /kernel root=/dev/ram0 $KERNEL_CMDLINE
-	initrd  /initrd.cgz
+	initrd  /$REAR_INITRD_FILENAME
 }
 EOF
 

diff --git a/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh b/usr/share/rear/output/ISO/Linux-ppc64le/800_create_isofs.sh
@@ -12,7 +12,7 @@ StopIfError "ISO_MKISOFS_BIN [$ISO_MKISOFS_BIN] not an executable !"
 Log "Copying kernel"
 cp -pL $v $KERNEL_FILE $TMP_DIR/kernel >&2
 
-ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel initrd.cgz )
+ISO_FILES=( ${ISO_FILES[@]} $TMP_DIR/kernel $REAR_INITRD_FILENAME )
 Log "Starting '$ISO_MKISOFS_BIN'"
 LogPrint "Making ISO image"
 

diff --git a/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh b/usr/share/rear/output/PXE/default/800_copy_to_tftp.sh
@@ -1,4 +1,4 @@
-# 80_copy_to_tftp.sh
+# 800_copy_to_tftp.sh
 #
 # copy kernel and initrd to TFTP server for Relax-and-Recover
 #
@@ -19,20 +19,20 @@ if [[ ! -z "$PXE_TFTP_URL" ]] ; then
     mkdir -m 755 -p $v "$BUILD_DIR/tftpbootfs/$OUTPUT_PREFIX_PXE" >&2
     StopIfError "Could not mkdir '$BUILD_DIR/tftpbootfs/$OUTPUT_PREFIX_PXE'"
     PXE_KERNEL="$OUTPUT_PREFIX_PXE/${PXE_TFTP_PREFIX}kernel"
-    PXE_INITRD="$OUTPUT_PREFIX_PXE/${PXE_TFTP_PREFIX}initrd.cgz"
+    PXE_INITRD="$OUTPUT_PREFIX_PXE/$PXE_TFTP_PREFIX$REAR_INITRD_FILENAME"
     PXE_MESSAGE="$OUTPUT_PREFIX_PXE/${PXE_TFTP_PREFIX}message"
 else
     PXE_TFTP_LOCAL_PATH="$PXE_TFTP_PATH"
     # By default PXE_TFTP_PREFIX=$HOSTNAME. (see conf/default.conf)
     PXE_KERNEL="${PXE_TFTP_PREFIX}kernel"
-    PXE_INITRD="${PXE_TFTP_PREFIX}initrd.cgz"
+    PXE_INITRD="$PXE_TFTP_PREFIX$REAR_INITRD_FILENAME"
     PXE_MESSAGE="${PXE_TFTP_PREFIX}message"
     [[ ! -d "$PXE_TFTP_LOCAL_PATH" ]] && mkdir $v -m 750 "$PXE_TFTP_LOCAL_PATH" >&2
 fi
 
 
 cp -pL $v "$KERNEL_FILE" "$PXE_TFTP_LOCAL_PATH/$PXE_KERNEL" >&2
-cp -a $v "$TMP_DIR"/initrd.cgz "$PXE_TFTP_LOCAL_PATH/$PXE_INITRD" >&2
+cp -a $v "$TMP_DIR/$REAR_INITRD_FILENAME" "$PXE_TFTP_LOCAL_PATH/$PXE_INITRD" >&2
 echo "$VERSION_INFO" >"$PXE_TFTP_LOCAL_PATH/$PXE_MESSAGE"
 # files must be readable for others for PXE
 chmod 444 "$PXE_TFTP_LOCAL_PATH/$PXE_KERNEL"
@@ -65,16 +65,16 @@ fi
 
 
 if [[ ! -z "$PXE_TFTP_URL" ]] ; then
-    LogPrint "Copied kernel+initrd ($(du -shc $KERNEL_FILE "$TMP_DIR/initrd.cgz" | tail -n 1 | tr -s "\t " " " | cut -d " " -f 1 )) to $PXE_TFTP_URL"
+    LogPrint "Copied kernel+initrd $( du -shc $KERNEL_FILE "$TMP_DIR/$REAR_INITRD_FILENAME" | tail -n 1 | tr -s "\t " " " | cut -d " " -f 1 ) to $PXE_TFTP_URL"
     umount_url $PXE_TFTP_URL $BUILD_DIR/tftpbootfs
     rmdir $BUILD_DIR/tftpbootfs >&2
     if [[ $? -eq 0 ]] ; then
         RemoveExitTask "rm -Rf $v $BUILD_DIR/tftpbootfs >&2"
     fi
-    RESULT_FILES=( "${RESULT_FILES[@]}" )
 else
     # legacy way PXE_TFTP_PATH
-    LogPrint "Copied kernel+initrd ($(du -shc $KERNEL_FILE "$TMP_DIR/initrd.cgz" | tail -n 1 | tr -s "\t " " " | cut -d " " -f 1 )) to $PXE_TFTP_PATH"
+    LogPrint "Copied kernel+initrd $( du -shc $KERNEL_FILE "$TMP_DIR/$REAR_INITRD_FILENAME" | tail -n 1 | tr -s "\t " " " | cut -d " " -f 1 ) to $PXE_TFTP_PATH"
     # Add to result files
     RESULT_FILES=( "${RESULT_FILES[@]}" "$PXE_TFTP_LOCAL_PATH/$PXE_KERNEL" "$PXE_TFTP_LOCAL_PATH/$PXE_INITRD" "$PXE_TFTP_LOCAL_PATH/$PXE_MESSAGE" )
 fi
+
diff --git a/usr/share/rear/output/RAMDISK/Linux-i386/900_copy_ramdisk.sh b/usr/share/rear/output/RAMDISK/Linux-i386/900_copy_ramdisk.sh
@@ -10,7 +10,7 @@ local path=$( url_path $OUTPUT_URL )
 
 if [[ "$BACKUP" == "NETFS" ]] ; then
     cp $v -pLf $KERNEL_FILE $TMP_DIR/kernel-$RAMDISK_SUFFIX >&2
-    cp $v -pLf $TMP_DIR/initrd.cgz $TMP_DIR/initramfs-$RAMDISK_SUFFIX.img >&2
+    cp $v -pLf $TMP_DIR/$REAR_INITRD_FILENAME $TMP_DIR/initramfs-$RAMDISK_SUFFIX.img >&2
     # NETFS will copy things for us
     RESULT_FILES=( "${RESULT_FILES[@]}" $TMP_DIR/kernel-$RAMDISK_SUFFIX $TMP_DIR/initramfs-$RAMDISK_SUFFIX.img )
     return
@@ -25,23 +25,23 @@ case "$scheme" in
         LogPrint "Transferring kernel and initramfs to $path"
         mkdir -p $v $path >&2
         cp $v -pLf $KERNEL_FILE $path/kernel-$RAMDISK_SUFFIX >&2
-        cp $v -pLf $TMP_DIR/initrd.cgz $path/initramfs-$RAMDISK_SUFFIX.img >&2
+        cp $v -pLf $TMP_DIR/$REAR_INITRD_FILENAME $path/initramfs-$RAMDISK_SUFFIX.img >&2
         ;;
     (nfs|cifs|usb|davfs)
         LogPrint "Transferring kernel and initramfs to $OUTPUT_URL"
         mkdir -p $v $BUILD_DIR/outputfs/$NETFS_PREFIX/ >&2
         cp $v -pLf $KERNEL_FILE $BUILD_DIR/outputfs/$NETFS_PREFIX/kernel-$RAMDISK_SUFFIX >&2
-        cp $v -pLf $TMP_DIR/initrd.cgz $BUILD_DIR/outputfs/$NETFS_PREFIX/initramfs-$RAMDISK_SUFFIX.img >&2
+        cp $v -pLf $TMP_DIR/$REAR_INITRD_FILENAME $BUILD_DIR/outputfs/$NETFS_PREFIX/initramfs-$RAMDISK_SUFFIX.img >&2
         ;;
     (fish|ftp|ftps|hftp|http|https|sftp)
         LogPrint "Transferring kernel and initramfs to $OUTPUT_URL"
         lftp -c "open $OUTPUT_URL; mkdir $path; mput -O $path $KERNEL_FILE" || Error "Problem transferring kernel '$KERNEL_FILE' to $OUTPUT_URL"
-        lftp -c "open $OUTPUT_URL; mkdir $path; mput -O $path $TMP_DIR/initrd.cgz" || Error "Problem transferring ramdisk '$TMP_DIR/initrd.cgz' to $OUTPUT_URL"
+        lftp -c "open $OUTPUT_URL; mkdir $path; mput -O $path $TMP_DIR/$REAR_INITRD_FILENAME" || Error "Problem transferring ramdisk '$TMP_DIR/$REAR_INITRD_FILENAME' to $OUTPUT_URL"
         ;;
     (rsync)
         LogPrint "Transferring kernel and initramfs to $OUTPUT_URL"
         rsync -a $v "$KERNEL_FILE" "$OUTPUT_URL" || Error "Problem transferring kernel '$KERNEL_FILE' to $OUTPUT_URL"
-        rsync -a $v "$TMP_DIR/initrd.cgz" "$OUTPUT_URL" || Error "Problem transferring ramdisk '$TMP_DIR/initrd.cgz' to $OUTPUT_URL"
+        rsync -a $v "$TMP_DIR/$REAR_INITRD_FILENAME" "$OUTPUT_URL" || Error "Problem transferring ramdisk '$TMP_DIR/$REAR_INITRD_FILENAME' to $OUTPUT_URL"
         ;;
     (*) Error "Invalid scheme '$scheme' in '$OUTPUT_URL'."
         ;;

diff --git a/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh b/usr/share/rear/output/USB/Linux-i386/100_create_efiboot.sh
@@ -36,15 +36,15 @@ cp -pL $v "${KERNEL_FILE}" "${EFI_DST}/kernel" >&2
 StopIfError "Could not copy ${KERNEL_FILE} to ${EFI_DST}/kernel"
 
 # Copy initrd
-cp -p $v "${TMP_DIR}/initrd.cgz" "${EFI_DST}/initrd.cgz" >&2
-StopIfError "Could not copy ${TMP_DIR}/initrd.cgz to ${EFI_DST}/initrd.cgz"
+cp -p $v "${TMP_DIR}/$REAR_INITRD_FILENAME" "${EFI_DST}/$REAR_INITRD_FILENAME" >&2
+StopIfError "Could not copy ${TMP_DIR}/$REAR_INITRD_FILENAME to ${EFI_DST}/$REAR_INITRD_FILENAME"
 
-Log "Copied kernel and initrd.cgz to ${EFI_DST}"
+Log "Copied kernel and $REAR_INITRD_FILENAME to ${EFI_DST}"
 
 # Configure elilo for EFI boot
 if test "$uefi_bootloader_basename" = "elilo.efi" ; then
     Log "Configuring elilo for EFI boot"
-    
+
     # Create config for elilo
     Log "Creating ${EFI_DST}/elilo.conf"
 
@@ -54,58 +54,58 @@ timeout = 5
 
 image = kernel
     label = rear
-    initrd = initrd.cgz
+    initrd = $REAR_INITRD_FILENAME
 EOF
 
 # Configure grub for EFI boot or die
 else
     # Hope this assumption is not wrong ...
     if has_binary grub-install grub2-install; then
-    
+
         # Choose right grub binary
         # Issue #849
         if has_binary grub2-install; then
             NUM=2
         fi
-        
+
         GRUB_MKIMAGE=grub${NUM}-mkimage
         GRUB_INSTALL=grub${NUM}-install
-        
+
         # What version of grub are we using
         # substr() for awk did not work as expected for this reason cut was used
         # First charecter should be enough to identify grub version
         grub_version=$($GRUB_INSTALL --version | awk '{print $NF}' | cut -c1-1)
-        
+
         case ${grub_version} in
             0)
                 Log "Configuring grub 0.97 for EFI boot"
-                
+
                 # Create config for grub 0.97
                 cat > ${EFI_DST}/BOOTX64.conf << EOF
 default=0
 timeout=5
 
 title Relax-and-Recover (no Secure Boot)
     kernel ${EFI_DIR}/kernel
-    initrd ${EFI_DIR}/initrd.cgz
+    initrd ${EFI_DIR}/$REAR_INITRD_FILENAME
 EOF
             ;;
             2)
                 Log "Configuring grub 2.0 for EFI boot"
-                
+
                 # Create bootloader, this overwrite BOOTX64.efi copied in previous step ...
                 # Fail if BOOTX64.efi can't be created
                 ${GRUB_MKIMAGE} -o ${EFI_DST}/BOOTX64.efi -p ${EFI_DIR} -O x86_64-efi linux part_gpt ext2 normal gfxterm gfxterm_background gfxterm_menu test all_video loadenv fat
                 StopIfError "Failed to create BOOTX64.efi"
-                
+
                 # Create config for grub 2.0
                 cat > ${EFI_DST}/grub.cfg << EOF
 set timeout=5
-set default=0 
+set default=0
 
 menuentry "Relax-and-Recover (no Secure Boot)" {
     linux ${EFI_DIR}/kernel
-    initrd ${EFI_DIR}/initrd.cgz
+    initrd ${EFI_DIR}/$REAR_INITRD_FILENAME
 }
 EOF
             ;;

diff --git a/usr/share/rear/output/USB/Linux-i386/300_create_extlinux.sh b/usr/share/rear/output/USB/Linux-i386/300_create_extlinux.sh
@@ -125,7 +125,7 @@ Relax-and-Recover v$VERSION - $usb_label_workflow using kernel $(uname -r) ${IPA
 ${BACKUP:+BACKUP=$BACKUP} ${OUTPUT:+OUTPUT=$OUTPUT} ${BACKUP_URL:+BACKUP_URL=$BACKUP_URL}
     endtext
     kernel /$USB_PREFIX/kernel
-    append initrd=/$USB_PREFIX/initrd.cgz root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE
+    append initrd=/$USB_PREFIX/$REAR_INITRD_FILENAME root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE
 
 label $HOSTNAME-$time
     menu label $menu_label $usb_label_workflow - AUTOMATIC RECOVER
@@ -135,7 +135,7 @@ Relax-and-Recover v$VERSION - $usb_label_workflow using kernel $(uname -r) ${IPA
 ${BACKUP:+BACKUP=$BACKUP} ${OUTPUT:+OUTPUT=$OUTPUT} ${BACKUP_URL:+BACKUP_URL=$BACKUP_URL}
     endtext
     kernel /$USB_PREFIX/kernel
-    append initrd=/$USB_PREFIX/initrd.cgz root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE auto_recover
+    append initrd=/$USB_PREFIX/$REAR_INITRD_FILENAME root=/dev/ram0 vga=normal rw $KERNEL_CMDLINE auto_recover
 
 EOF