X-Git-Url: https://git.tld-linux.org/?p=packages%2Fdracut.git;a=blobdiff_plain;f=initrd-release.patch;h=80ff9945fb537e818fe4ed12746f1a5860ac2cb3;hp=dc8f735dcb55949d871573f78740b973e3bd8d5a;hb=HEAD;hpb=6e9542887007f5af61d385af9a048f7cdb86c4e4

diff --git a/initrd-release.patch b/initrd-release.patch
index dc8f735..a961195 100644
--- a/initrd-release.patch
+++ b/initrd-release.patch
@@ -1,34 +1,19 @@
-diff -urpa dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh dracut-047/modules.d/01systemd-initrd/module-setup.sh
---- dracut-047.orig/modules.d/01systemd-initrd/module-setup.sh	2018-02-19 09:00:33.000000000 +0000
-+++ dracut-047/modules.d/01systemd-initrd/module-setup.sh	2018-03-15 12:17:03.400973601 +0000
-@@ -60,10 +60,8 @@ install() {
-         echo VERSION_ID=$VERSION_ID
-         echo PRETTY_NAME=\"$PRETTY_NAME\"
-         echo ANSI_COLOR=\"$ANSI_COLOR\"
--    } > $initdir/usr/lib/initrd-release
-+    } > $initdir/etc/initrd-release
-     echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
--    ln -sf ../usr/lib/initrd-release $initdir/etc/initrd-release
--    ln -sf initrd-release $initdir/usr/lib/os-release
-     ln -sf initrd-release $initdir/etc/os-release
- }
- 
-diff -urpa dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-047/modules.d/98dracut-systemd/dracut-cmdline.sh
---- dracut-047.orig/modules.d/98dracut-systemd/dracut-cmdline.sh	2018-02-19 09:00:33.000000000 +0000
-+++ dracut-047/modules.d/98dracut-systemd/dracut-cmdline.sh	2018-03-15 12:17:03.400973601 +0000
+diff -urpa dracut-059.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-059/modules.d/98dracut-systemd/dracut-cmdline.sh
+--- dracut-059.orig/modules.d/98dracut-systemd/dracut-cmdline.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/98dracut-systemd/dracut-cmdline.sh	2024-04-03 01:31:54.785960810 +0200
 @@ -5,7 +5,7 @@ if [ -f /dracut-state.sh ]; then
  fi
- type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
+ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
  
 -[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
 +[ -f /etc/initrd-release ] && . /etc/initrd-release
  [ -n "$VERSION" ] && info "dracut-$VERSION"
  
  if ! getargbool 1 'rd.hostonly'; then
-diff -urpa dracut-047.orig/modules.d/99base/dracut-lib.sh dracut-047/modules.d/99base/dracut-lib.sh
---- dracut-047.orig/modules.d/99base/dracut-lib.sh	2018-02-19 09:00:33.000000000 +0000
-+++ dracut-047/modules.d/99base/dracut-lib.sh	2018-03-15 12:17:03.400973601 +0000
-@@ -401,7 +401,7 @@ splitsep() {
+diff -urpa dracut-059.orig/modules.d/99base/dracut-lib.sh dracut-059/modules.d/99base/dracut-lib.sh
+--- dracut-059.orig/modules.d/99base/dracut-lib.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/99base/dracut-lib.sh	2024-04-03 01:31:54.785960810 +0200
+@@ -365,7 +365,7 @@ splitsep() {
  }
  
  setdebug() {
@@ -37,11 +22,11 @@ diff -urpa dracut-047.orig/modules.d/99base/dracut-lib.sh dracut-047/modules.d/9
      if [ -z "$RD_DEBUG" ]; then
          if [ -e /proc/cmdline ]; then
              RD_DEBUG=no
-diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/init.sh
---- dracut-047.orig/modules.d/99base/init.sh	2018-03-15 12:11:57.000000000 +0000
-+++ dracut-047/modules.d/99base/init.sh	2018-03-15 12:17:03.400973601 +0000
-@@ -111,7 +111,7 @@ else
-     exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
+diff -urpa dracut-059.orig/modules.d/99base/init.sh dracut-059/modules.d/99base/init.sh
+--- dracut-059.orig/modules.d/99base/init.sh	2024-04-03 01:30:43.901003428 +0200
++++ dracut-059/modules.d/99base/init.sh	2024-04-03 01:31:54.785960810 +0200
+@@ -102,7 +102,7 @@ else
+     exec 0<> /dev/console 1<> /dev/console 2<> /dev/console
  fi
  
 -[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
@@ -49,18 +34,36 @@ diff -urpa dracut-047.orig/modules.d/99base/init.sh dracut-047/modules.d/99base/
  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  
  source_conf /etc/conf.d
-diff -urpa dracut-047.orig/modules.d/99base/module-setup.sh dracut-047/modules.d/99base/module-setup.sh
---- dracut-047.orig/modules.d/99base/module-setup.sh	2018-02-19 09:00:33.000000000 +0000
-+++ dracut-047/modules.d/99base/module-setup.sh	2018-03-15 12:17:03.400973601 +0000
-@@ -86,10 +86,8 @@ install() {
-         echo VERSION_ID=$VERSION_ID
-         echo PRETTY_NAME=\"$PRETTY_NAME\"
-         echo ANSI_COLOR=\"$ANSI_COLOR\"
--    } > $initdir/usr/lib/initrd-release
-+    } > $initdir/etc/initrd-release
-     echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
--    ln -sf ../usr/lib/initrd-release $initdir/etc/initrd-release
--    ln -sf initrd-release $initdir/usr/lib/os-release
-     ln -sf initrd-release $initdir/etc/os-release
+diff -urpa dracut-059.orig/modules.d/99base/module-setup.sh dracut-059/modules.d/99base/module-setup.sh
+--- dracut-059.orig/modules.d/99base/module-setup.sh	2022-12-24 17:49:27.000000000 +0100
++++ dracut-059/modules.d/99base/module-setup.sh	2024-04-03 01:31:54.785960810 +0200
+@@ -77,7 +77,7 @@ install() {
+     if [[ -e $dracutsysrootdir/etc/os-release ]]; then
+         # shellcheck disable=SC1090
+         . "$dracutsysrootdir"/etc/os-release
+-        grep -hE -ve '^VERSION=' -ve '^PRETTY_NAME' "$dracutsysrootdir"/etc/os-release > "${initdir}"/usr/lib/initrd-release
++        grep -hE -ve '^VERSION=' -ve '^PRETTY_NAME' "$dracutsysrootdir"/etc/os-release > "${initdir}"/etc/initrd-release
+         [[ -n ${VERSION} ]] && VERSION+=" "
+         [[ -n ${PRETTY_NAME} ]] && PRETTY_NAME+=" "
+     else
+@@ -88,7 +88,7 @@ install() {
+             echo "ID=dracut"
+             echo "VERSION_ID=\"$DRACUT_VERSION\""
+             echo 'ANSI_COLOR="0;34"'
+-        } > "${initdir}"/usr/lib/initrd-release
++        } > "${initdir}"/etc/initrd-release
+     fi
+     VERSION+="dracut-$DRACUT_VERSION"
+     PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"
+@@ -99,10 +99,8 @@ install() {
+         # to easily detect the dracut version if need be without
+         # having it mixed in with the real underlying OS version.
+         echo "DRACUT_VERSION=\"${DRACUT_VERSION}\""
+-    } >> "$initdir"/usr/lib/initrd-release
++    } >> "$initdir"/etc/initrd-release
+     echo "dracut-$DRACUT_VERSION" > "$initdir/lib/dracut/dracut-$DRACUT_VERSION"
+-    ln -sf ../usr/lib/initrd-release "$initdir"/etc/initrd-release
+-    ln -sf initrd-release "$initdir"/usr/lib/os-release
+     ln -sf initrd-release "$initdir"/etc/os-release
  
      ## save host_devs which we need bring up