Updating iso.efi configurations

7 files changed, 43 insertions, 18 deletions

diff --git a/src/distros/archboot/cfg.label.iso.efi b/src/distros/archboot/cfg.label.iso.efi
index 3126dc0..11481e3 100644
--- a/src/distros/archboot/cfg.label.iso.efi
+++ b/src/distros/archboot/cfg.label.iso.efi
@@ -5,4 +5,5 @@
             archboot_repo=/boot/archboot/@VERSION@/apks/
      echo   "Loading /boot/archboot/@VERSION@/@ARCH@/initrd ..."
      initrd /boot/archboot/@VERSION@/@ARCH@/initrd
+     echo   "Booting ..."
    }
diff --git a/src/distros/centos/cfg.label.iso.efi b/src/distros/centos/cfg.label.iso.efi
index 4312a94..a554c5c 100644
--- a/src/distros/centos/cfg.label.iso.efi
+++ b/src/distros/centos/cfg.label.iso.efi
@@ -4,12 +4,14 @@
          linux  /boot/centos/@VERSION@/vmlinuz
          echo   "Loading /boot/centos/@VERSION@/initrd ..."
          initrd /boot/centos/@VERSION@/initrd
+         echo   "Booting ..."
       }
       menuentry --hotkey=b "Install system with basic video driver" {
          echo   "Loading /boot/centos/@VERSION@/vmlinuz ..."
          linux  /boot/centos/@VERSION@/vmlinuz nomodeset
          echo   "Loading /boot/centos/@VERSION@/initrd ..."
          initrd /boot/centos/@VERSION@/initrd
+         echo   "Booting ..."
       }
       menuentry --hotkey=n "Install system from network" {
          echo   "Loading /boot/centos/@VERSION@/vmlinuz ..."
@@ -18,11 +20,13 @@
                 repo=https://mirrors.kernel.org/centos/@VERSION@/os/x86_64/ 
          echo   "Loading /boot/centos/@VERSION@/initrd ..."
          initrd /boot/centos/@VERSION@/initrd
+         echo   "Booting ..."
       }
       menuentry --hotkey=r "Rescue installed system" {
          echo   "Loading /boot/centos/@VERSION@/vmlinuz ..."
          linux  /boot/centos/@VERSION@/vmlinuz rescue
          echo   "Loading /boot/centos/@VERSION@/initrd ..."
          initrd /boot/centos/@VERSION@/initrd
+         echo   "Booting ..."
       }
    }
diff --git a/src/distros/debian/cfg.label.iso.efi b/src/distros/debian/cfg.label.iso.efi
index 527ae74..fe3b2ec 100644
--- a/src/distros/debian/cfg.label.iso.efi
+++ b/src/distros/debian/cfg.label.iso.efi
@@ -3,4 +3,5 @@
       linux  /boot/debian/@VERSION@/@ARCH@/vmlinuz append -- quiet
       echo   "Loading /boot/debian/@VERSION@/@ARCH@/initrd ..."
       initrd /boot/debian/@VERSION@/@ARCH@/initrd
+      echo   "Booting ..."
    }
diff --git a/src/distros/slackware/cfg.label.iso.efi b/src/distros/slackware/cfg.label.iso.efi
index a6163a9..1bd6126 100644
--- a/src/distros/slackware/cfg.label.iso.efi
+++ b/src/distros/slackware/cfg.label.iso.efi
@@ -4,4 +4,5 @@
              load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0  nomodeset
       echo   "Loading /boot/slack@ARCH@/@VERSION@/initrd ..."
       initrd /boot/slack@ARCH@/@VERSION@/initrd
+      echo   "Booting ..."
    }
diff --git a/src/distros/sysrescd/cfg.label.iso.efi b/src/distros/sysrescd/cfg.label.iso.efi
index 6743cc1..a9997f7 100644
--- a/src/distros/sysrescd/cfg.label.iso.efi
+++ b/src/distros/sysrescd/cfg.label.iso.efi
@@ -1,31 +1,36 @@
 submenu "SystemRescueCD (@VERSION@)" {
    menuentry "SystemRescueCd with default options (32bit)" {
-      echo   "Loading /boot/sysrescd/vmlinuz.32 ..."
-      linux  /boot/sysrescd/vmlinuz.32 subdir=/boot/sysrescd/
-      echo   "Loading /boot/sysrescd/initram.igz ..."
-      initrd /boot/sysrescd/initram.igz
+      echo   "Loading /boot/sysrescd/@VERSION@/vmlinuz.32 ..."
+      linux  /boot/sysrescd/@VERSION@/vmlinuz.32 subdir=/boot/sysrescd/@VERSION@/
+      echo   "Loading /boot/sysrescd/@VERSION@/initram.igz ..."
+      initrd /boot/sysrescd/@VERSION@/initram.igz
+      echo   "Booting ..."
    }
    menuentry "SystemRescueCd with all files cached to memory (32bit)" {
-      echo   "Loading /boot/sysrescd/vmlinuz.32 ..."
-      linux  /boot/sysrescd/vmlinuz.32 docache subdir=/boot/sysrescd/
-      echo   "Loading /boot/sysrescd/initram.igz ..."
-      initrd /boot/sysrescd/initram.igz
+      echo   "Loading /boot/sysrescd/@VERSION@/vmlinuz.32 ..."
+      linux  /boot/sysrescd/@VERSION@/vmlinuz.32 docache subdir=/boot/sysrescd/@VERSION@/
+      echo   "Loading /boot/sysrescd/@VERSION@/initram.igz ..."
+      initrd /boot/sysrescd/@VERSION@/initram.igz
+      echo   "Booting ..."
    }
    menuentry "SystemRescueCd with default options (64bit)" {
-      echo   "Loading /boot/sysrescd/vmlinuz.64 ..."
-      linux  /boot/sysrescd/vmlinuz.64 docache subdir=/boot/sysrescd/
-      echo   "Loading /boot/sysrescd/initram.igz ..."
-      initrd /boot/sysrescd/initram.igz
+      echo   "Loading /boot/sysrescd/@VERSION@/vmlinuz.64 ..."
+      linux  /boot/sysrescd/@VERSION@/vmlinuz.64 docache subdir=/boot/sysrescd/@VERSION@/
+      echo   "Loading /boot/sysrescd/@VERSION@/initram.igz ..."
+      initrd /boot/sysrescd/@VERSION@/initram.igz
+      echo   "Booting ..."
    }
    menuentry "SystemRescueCd with all files cached to memory (64bit)" {
-      echo   "Loading /boot/sysrescd/vmlinuz.64 ..."
-      linux  /boot/sysrescd/vmlinuz.64 docache subdir=/boot/sysrescd/
-      echo   "Loading /boot/sysrescd/initram.igz ..."
-      initrd /boot/sysrescd/initram.igz
+      echo   "Loading /boot/sysrescd/@VERSION@/vmlinuz.64 ..."
+      linux  /boot/sysrescd/@VERSION@/vmlinuz.64 docache subdir=/boot/sysrescd/@VERSION@/
+      echo   "Loading /boot/sysrescd/@VERSION@/initram.igz ..."
+      initrd /boot/sysrescd/@VERSION@/initram.igz
+      echo   "Booting ..."
    }
    menuentry "NTPASSWD: Reset or edit Windows passwords" {
-      linux  /boot/sysrescd/vmlinuz.nt \
+      linux  /boot/sysrescd/@VERSION@/vmlinuz.nt \
              rw vga=1 \
-      initrd /boot/sysrescd/initrd.cgz /boot/sysrescd/scsi.cgz
+      initrd /boot/sysrescd/@VERSION@/initrd.cgz /boot/sysrescd/@VERSION@/scsi.cgz
+      echo   "Booting ..."
    }
 }
diff --git a/src/distros/tinycore/cfg.label.iso.efi b/src/distros/tinycore/cfg.label.iso.efi
index cd3e428..92958f6 100644
--- a/src/distros/tinycore/cfg.label.iso.efi
+++ b/src/distros/tinycore/cfg.label.iso.efi
@@ -1,20 +1,32 @@
 
 submenu "TinyCore Linux (@VERSION@)" {
    menuentry "Boot TinyCore" {
+      echo   "Loading /boot/tinycore/@VERSION@/vmlinuz ..."
       linux  /boot/tinycore/@VERSION@/vmlinuz loglevel=3 cde
+      echo   "Loading /boot/tinycore/@VERSION@/core.gz ..."
       initrd /boot/tinycore/@VERSION@/core.gz
+      echo   "Booting ..."
    }
    menuentry "Boot TinyCore (on slow devices, waitusb=5)" {
+      echo   "Loading /boot/tinycore/@VERSION@/vmlinuz ..."
       linux  /boot/tinycore/@VERSION@/vmlinuz loglevel=3 cde waitusb=5
+      echo   "Loading /boot/tinycore/@VERSION@/core.gz ..."
       initrd /boot/tinycore/@VERSION@/core.gz
+      echo   "Booting ..."
    }
    menuentry "Boot Core (command line only)." {
+      echo   "Loading /boot/tinycore/@VERSION@/vmlinuz ..."
       linux  /boot/tinycore/@VERSION@/vmlinuz loglevel=3
+      echo   "Loading /boot/tinycore/@VERSION@/core.gz ..."
       initrd /boot/tinycore/@VERSION@/core.gz
+      echo   "Booting ..."
    }
    menuentry "Boot Core (command line only on slow devices, waitusb=5)" {
+      echo   "Loading /boot/tinycore/@VERSION@/vmlinuz ..."
       linux  /boot/tinycore/@VERSION@/vmlinuz loglevel=3 waitusb=5
+      echo   "Loading /boot/tinycore/@VERSION@/core.gz ..."
       initrd /boot/tinycore/@VERSION@/core.gz
+      echo   "Booting ..."
    }
 }
 
diff --git a/src/distros/ubuntu/cfg.label.iso.efi b/src/distros/ubuntu/cfg.label.iso.efi
index 0ef0d41..49c0bd9 100644
--- a/src/distros/ubuntu/cfg.label.iso.efi
+++ b/src/distros/ubuntu/cfg.label.iso.efi
@@ -3,4 +3,5 @@
       linux  /boot/ubuntu/@VERSION@/@ARCH@/vmlinuz -- quiet
       echo   "Loading /boot/ubuntu/@VERSION@/@ARCH@/initrd ..."
       initrd /boot/ubuntu/@VERSION@/@ARCH@/initrd
+      echo   "Booting ..."
    }