Thu Jun 27 02:51:33 UTC 202420240627025133

a/grub-2.12-x86_64-9.txz:  Rebuilt.
  Fix generated initrd path to be correct in more (all?) cases. Thanks to kaott.

5 files changed, 47 insertions, 31 deletions

diff --git a/ChangeLog.rss b/ChangeLog.rss
index 464639619..3f835ec26 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,22 @@
       <description>Tracking Slackware development in git.</description>
       <language>en-us</language>
       <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
-      <pubDate>Wed, 26 Jun 2024 20:06:09 GMT</pubDate>
-      <lastBuildDate>Wed, 26 Jun 2024 20:29:58 GMT</lastBuildDate>
+      <pubDate>Thu, 27 Jun 2024 02:51:33 GMT</pubDate>
+      <lastBuildDate>Thu, 27 Jun 2024 03:58:34 GMT</lastBuildDate>
       <generator>maintain_current_git.sh v 1.17</generator>
       <item>
+         <title>Thu, 27 Jun 2024 02:51:33 GMT</title>
+         <pubDate>Thu, 27 Jun 2024 02:51:33 GMT</pubDate>
+         <link>https://git.slackware.nl/current/tag/?h=20240627025133</link>
+         <guid isPermaLink="false">20240627025133</guid>
+         <description>
+           <![CDATA[<pre>
+a/grub-2.12-x86_64-9.txz:  Rebuilt.
+  Fix generated initrd path to be correct in more (all?) cases. Thanks to kaott.
+           </pre>]]>
+         </description>
+      </item>
+      <item>
          <title>Wed, 26 Jun 2024 20:06:09 GMT</title>
          <pubDate>Wed, 26 Jun 2024 20:06:09 GMT</pubDate>
          <link>https://git.slackware.nl/current/tag/?h=20240626200609</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index b17dba46b..5292c9630 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,7 @@
+Thu Jun 27 02:51:33 UTC 2024
+a/grub-2.12-x86_64-9.txz:  Rebuilt.
+  Fix generated initrd path to be correct in more (all?) cases. Thanks to kaott.
++--------------------------+
 Wed Jun 26 20:06:09 UTC 2024
 a/grub-2.12-x86_64-8.txz:  Rebuilt.
   Sort the kernel menu entries newest first. Thanks to Daedra.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index b6491a31f..a06b7f03d 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Wed Jun 26 20:11:17 UTC 2024
+Thu Jun 27 02:55:08 UTC 2024
 
 Here is the file list for this directory.  If you are using a 
 mirror site and find missing or extra files in the disk 
 subdirectories, please have the archive administrator refresh
 the mirror.
 
-drwxr-xr-x 12 root root      4096 2024-06-26 20:06 .
+drwxr-xr-x 12 root root      4096 2024-06-27 02:51 .
 -rw-r--r--  1 root root      5767 2022-02-02 22:44 ./ANNOUNCE.15.0
 -rw-r--r--  1 root root     16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
--rw-r--r--  1 root root   1153123 2024-06-25 19:38 ./CHECKSUMS.md5
--rw-r--r--  1 root root       195 2024-06-25 19:38 ./CHECKSUMS.md5.asc
+-rw-r--r--  1 root root   1153226 2024-06-26 20:11 ./CHECKSUMS.md5
+-rw-r--r--  1 root root       195 2024-06-26 20:11 ./CHECKSUMS.md5.asc
 -rw-r--r--  1 root root     17976 1994-06-10 02:28 ./COPYING
 -rw-r--r--  1 root root     35147 2007-06-30 04:21 ./COPYING3
 -rw-r--r--  1 root root     19573 2016-06-23 20:08 ./COPYRIGHT.TXT
 -rw-r--r--  1 root root       616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r--  1 root root   1108473 2024-06-26 20:06 ./ChangeLog.txt
+-rw-r--r--  1 root root   1108648 2024-06-27 02:51 ./ChangeLog.txt
 drwxr-xr-x  3 root root      4096 2013-03-20 22:17 ./EFI
 drwxr-xr-x  2 root root      4096 2024-06-23 18:50 ./EFI/BOOT
 -rw-r--r--  1 root root   1200128 2024-06-23 18:50 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x  2 root root      4096 2024-06-23 18:50 ./EFI/BOOT
 -rwxr-xr-x  1 root root      2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
 -rw-r--r--  1 root root     10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
 -rw-r--r--  1 root root      1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r--  1 root root   1509370 2024-06-25 19:37 ./FILELIST.TXT
+-rw-r--r--  1 root root   1509490 2024-06-26 20:11 ./FILELIST.TXT
 -rw-r--r--  1 root root      1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r--  1 root root    912447 2024-06-26 20:10 ./PACKAGES.TXT
+-rw-r--r--  1 root root    912447 2024-06-27 02:54 ./PACKAGES.TXT
 -rw-r--r--  1 root root      8034 2022-02-02 03:36 ./README.TXT
 -rw-r--r--  1 root root      3623 2024-06-21 18:40 ./README.initrd
 -rw-r--r--  1 root root     34114 2023-12-11 20:35 ./README_CRYPT.TXT
@@ -662,13 +662,13 @@ drwxr-xr-x  2 root root      4096 2022-02-03 07:02 ./patches
 -rw-r--r--  1 root root       575 2022-02-03 07:02 ./patches/FILE_LIST
 -rw-r--r--  1 root root        14 2022-02-03 07:02 ./patches/MANIFEST.bz2
 -rw-r--r--  1 root root       224 2022-02-03 07:02 ./patches/PACKAGES.TXT
-drwxr-xr-x 17 root root      4096 2024-06-26 20:10 ./slackware64
--rw-r--r--  1 root root    355839 2024-06-26 20:10 ./slackware64/CHECKSUMS.md5
--rw-r--r--  1 root root       195 2024-06-26 20:10 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r--  1 root root    440680 2024-06-26 20:09 ./slackware64/FILE_LIST
--rw-r--r--  1 root root   4695591 2024-06-26 20:10 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root      4096 2024-06-27 02:54 ./slackware64
+-rw-r--r--  1 root root    355839 2024-06-27 02:54 ./slackware64/CHECKSUMS.md5
+-rw-r--r--  1 root root       195 2024-06-27 02:54 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root    440680 2024-06-27 02:53 ./slackware64/FILE_LIST
+-rw-r--r--  1 root root   4701442 2024-06-27 02:54 ./slackware64/MANIFEST.bz2
 lrwxrwxrwx  1 root root        15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x  2 root root     32768 2024-06-26 20:09 ./slackware64/a
+drwxr-xr-x  2 root root     32768 2024-06-27 02:53 ./slackware64/a
 -rw-r--r--  1 root root       327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
 -rw-r--r--  1 root root     10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz
 -rw-r--r--  1 root root       163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc
@@ -795,9 +795,9 @@ drwxr-xr-x  2 root root     32768 2024-06-26 20:09 ./slackware64/a
 -rw-r--r--  1 root root       291 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txt
 -rw-r--r--  1 root root    271096 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txz
 -rw-r--r--  1 root root       163 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txz.asc
--rw-r--r--  1 root root       269 2024-06-26 19:24 ./slackware64/a/grub-2.12-x86_64-8.txt
--rw-r--r--  1 root root  10451572 2024-06-26 19:24 ./slackware64/a/grub-2.12-x86_64-8.txz
--rw-r--r--  1 root root       195 2024-06-26 19:24 ./slackware64/a/grub-2.12-x86_64-8.txz.asc
+-rw-r--r--  1 root root       269 2024-06-27 02:40 ./slackware64/a/grub-2.12-x86_64-9.txt
+-rw-r--r--  1 root root  10449056 2024-06-27 02:40 ./slackware64/a/grub-2.12-x86_64-9.txz
+-rw-r--r--  1 root root       195 2024-06-27 02:40 ./slackware64/a/grub-2.12-x86_64-9.txz.asc
 -rw-r--r--  1 root root       314 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txt
 -rw-r--r--  1 root root    117772 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txz
 -rw-r--r--  1 root root       163 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txz.asc
@@ -5786,11 +5786,11 @@ drwxr-xr-x   2 root root      4096 2024-05-05 18:37 ./slackware64/y
 -rw-r--r--   1 root root   1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz
 -rw-r--r--   1 root root       195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc
 -rw-r--r--   1 root root        26 2020-12-30 21:55 ./slackware64/y/tagfile
-drwxr-xr-x  18 root root      4096 2024-06-26 20:11 ./source
--rw-r--r--   1 root root    621570 2024-06-26 20:11 ./source/CHECKSUMS.md5
--rw-r--r--   1 root root       195 2024-06-26 20:11 ./source/CHECKSUMS.md5.asc
--rw-r--r--   1 root root    866667 2024-06-26 20:11 ./source/FILE_LIST
--rw-r--r--   1 root root  29709728 2024-06-26 20:11 ./source/MANIFEST.bz2
+drwxr-xr-x  18 root root      4096 2024-06-27 02:55 ./source
+-rw-r--r--   1 root root    621570 2024-06-27 02:55 ./source/CHECKSUMS.md5
+-rw-r--r--   1 root root       195 2024-06-27 02:55 ./source/CHECKSUMS.md5.asc
+-rw-r--r--   1 root root    866667 2024-06-27 02:54 ./source/FILE_LIST
+-rw-r--r--   1 root root  29715561 2024-06-27 02:54 ./source/MANIFEST.bz2
 -rw-r--r--   1 root root       828 2022-02-02 04:43 ./source/README.TXT
 drwxr-xr-x 124 root root      4096 2024-06-23 18:42 ./source/a
 -rw-r--r--   1 root root       339 2023-09-28 19:06 ./source/a/FTBFSlog
@@ -6210,13 +6210,13 @@ drwxr-xr-x   2 root root      4096 2024-06-26 17:45 ./source/a/grub
 -rw-r--r--   1 root root       766 2023-12-21 19:30 ./source/a/grub/0003-support-dropins-for-default-configuration.patch
 -rw-r--r--   1 root root       376 2024-06-26 17:44 ./source/a/grub/0004-add-GRUB_DISABLE_KERNEL_SYMLINKS-variable.patch
 -rw-r--r--   1 root root      1103 2018-05-16 15:18 ./source/a/grub/0198-align-struct-efi_variable-better.patch
--rw-r--r--   1 root root      6581 2024-06-26 19:22 ./source/a/grub/09_slackware_linux
+-rw-r--r--   1 root root      6539 2024-06-27 02:36 ./source/a/grub/09_slackware_linux
 -rw-r--r--   1 root root      1320 2023-12-21 07:17 ./source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch
 -rw-r--r--   1 root root       688 2024-06-23 22:41 ./source/a/grub/doinst.sh
 -rw-r--r--   1 root root      1607 2024-06-25 18:33 ./source/a/grub/etc.default.grub
 -rw-r--r--   1 root root   6675608 2023-12-20 16:53 ./source/a/grub/grub-2.12.tar.xz
 -rw-r--r--   1 root root       566 2023-12-20 16:53 ./source/a/grub/grub-2.12.tar.xz.sig
--rwxr-xr-x   1 root root      9021 2024-06-26 17:46 ./source/a/grub/grub.SlackBuild
+-rwxr-xr-x   1 root root      9021 2024-06-27 02:37 ./source/a/grub/grub.SlackBuild
 -rw-r--r--   1 root root      1458 2016-12-25 09:49 ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff
 -rw-r--r--   1 root root       619 2012-09-29 04:34 ./source/a/grub/initrd_naming.patch
 -rw-r--r--   1 root root       721 2023-12-21 19:34 ./source/a/grub/slack-desc
diff --git a/source/a/grub/09_slackware_linux b/source/a/grub/09_slackware_linux
index 3e2858da8..1915a0848 100644
--- a/source/a/grub/09_slackware_linux
+++ b/source/a/grub/09_slackware_linux
@@ -92,7 +92,7 @@ EOF
   if test -n "${initrd}" ; then
     cat << EOF
     echo    $(gettext "Loading initial ramdisk ...")
-    initrd  /$(basename ${initrd})
+    initrd  ${rel_dirname}/${initrd}
 EOF
   fi
   cat << EOF
@@ -133,9 +133,9 @@ process_list() {
                      ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do
                 if [ -e "${dirname}/${i}" ]; then
                     if [ -z "$initrd" ]; then
-                        initrd="${dirname}/$i"
+                        initrd="$i"
                     else
-                        initrd="$initrd ${dirname}/$i"
+                        initrd="$initrd $i"
                     fi
                 fi
             done
@@ -147,9 +147,9 @@ process_list() {
                 if [ -e "${dirname}/${i}" ]; then
                     actual_initrd="true"
                     if [ -z "$initrd" ]; then
-                        initrd="${dirname}/$i"
+                        initrd="$i"
                     else
-                        initrd="$initrd ${dirname}/$i"
+                        initrd="$initrd $i"
                     fi
                     break
                 fi
diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild
index dc555692a..6af98740e 100755
--- a/source/a/grub/grub.SlackBuild
+++ b/source/a/grub/grub.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=grub
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # Better to use _ than ~ in the package filenames version:
 PKGVER=$(echo $VERSION | tr '~' '_')
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
 
 # If you use stack-protector, then grub will not work with legacy BIOS:
 STACKPROTECT=${STACKPROTECT:---enable-stack-protector=no}