initrd-release.patch

   1 diff -ur dracut-043.orig/modules.d/01systemd-initrd/module-setup.sh dracut-043/modules.d/01systemd-initrd/module-setup.sh
   2 --- dracut-043.orig/modules.d/01systemd-initrd/module-setup.sh  2015-06-15 10:27:21.000000000 +0000
   3 +++ dracut-043/modules.d/01systemd-initrd/module-setup.sh       2015-08-07 17:00:41.855567301 +0000
   4 @@ -59,10 +59,8 @@
   5          echo VERSION_ID=$VERSION_ID
   6          echo PRETTY_NAME=\"$PRETTY_NAME\"
   7          echo ANSI_COLOR=\"$ANSI_COLOR\"
   8 -    } > $initdir/usr/lib/initrd-release
   9 +    } > $initdir/etc/initrd-release
  10      echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
  11 -    ln -sf ../usr/lib/initrd-release $initdir/etc/initrd-release
  12 -    ln -sf initrd-release $initdir/usr/lib/os-release
  13      ln -sf initrd-release $initdir/etc/os-release
  14  }
  15
  16 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh
  17 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh        2015-06-15 10:27:21.000000000 +0000
  18 +++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh     2015-08-07 17:01:34.828982244 +0000
  19 @@ -5,7 +5,7 @@
  20  fi
  21  type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
  22
  23 -[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
  24 +[ -f /etc/initrd-release ] && . /etc/initrd-release
  25  [ -n "$VERSION" ] && info "dracut-$VERSION"
  26
  27  if ! getargbool 1 'rd.hostonly'; then
  28 diff -ur dracut-043.orig/modules.d/99base/dracut-lib.sh dracut-043/modules.d/99base/dracut-lib.sh
  29 --- dracut-043.orig/modules.d/99base/dracut-lib.sh      2015-06-15 10:27:21.000000000 +0000
  30 +++ dracut-043/modules.d/99base/dracut-lib.sh   2015-08-07 17:00:50.435567301 +0000
  31 @@ -396,7 +396,7 @@
  32  }
  33
  34  setdebug() {
  35 -    [ -f /usr/lib/initrd-release ] || return
  36 +    [ -f /etc/initrd-release ] || return
  37      if [ -z "$RD_DEBUG" ]; then
  38          if [ -e /proc/cmdline ]; then
  39              RD_DEBUG=no
  40 diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/init.sh
  41 --- dracut-043.orig/modules.d/99base/init.sh    2015-06-15 10:27:21.000000000 +0000
  42 +++ dracut-043/modules.d/99base/init.sh 2015-08-07 17:01:00.536567301 +0000
  43 @@ -106,7 +106,7 @@
  44      exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
  45  fi
  46
  47 -[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
  48 +[ -f /etc/initrd-release ] && . /etc/initrd-release
  49  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
  50
  51  source_conf /etc/conf.d
  52 diff -ur dracut-043.orig/modules.d/99base/module-setup.sh dracut-043/modules.d/99base/module-setup.sh
  53 --- dracut-043.orig/modules.d/99base/module-setup.sh    2015-06-15 10:27:21.000000000 +0000
  54 +++ dracut-043/modules.d/99base/module-setup.sh 2015-08-07 17:01:25.104122302 +0000
  55 @@ -84,10 +84,8 @@
  56          echo VERSION_ID=$VERSION_ID
  57          echo PRETTY_NAME=\"$PRETTY_NAME\"
  58          echo ANSI_COLOR=\"$ANSI_COLOR\"
  59 -    } > $initdir/usr/lib/initrd-release
  60 +    } > $initdir/etc/initrd-release
  61      echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
  62 -    ln -sf ../usr/lib/initrd-release $initdir/etc/initrd-release
  63 -    ln -sf initrd-release $initdir/usr/lib/os-release
  64      ln -sf initrd-release $initdir/etc/os-release
  65
  66      ## save host_devs which we need bring up