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-ask.service dracut-043/modules.d/98dracut-systemd/dracut-cmdline-ask.service
  17 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline-ask.service       2015-06-15 10:27:21.000000000 +0000
  18 +++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline-ask.service    2015-08-07 17:01:39.047090272 +0000
  19 @@ -13,7 +13,7 @@
  20  Before=dracut-cmdline.service
  21  After=systemd-journald.socket
  22  Wants=systemd-journald.socket
  23 -ConditionPathExists=/usr/lib/initrd-release
  24 +ConditionPathExists=/etc/initrd-release
  25  ConditionKernelCommandLine=rd.cmdline=ask
  26
  27  [Service]
  28 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.service dracut-043/modules.d/98dracut-systemd/dracut-cmdline.service
  29 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.service   2015-06-15 10:27:21.000000000 +0000
  30 +++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline.service        2015-08-07 17:01:43.389261760 +0000
  31 @@ -14,7 +14,7 @@
  32  Before=dracut-pre-udev.service
  33  After=systemd-journald.socket
  34  Wants=systemd-journald.socket
  35 -ConditionPathExists=/usr/lib/initrd-release
  36 +ConditionPathExists=/etc/initrd-release
  37  ConditionPathExistsGlob=|/etc/cmdline.d/*.conf
  38  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cmdline
  39  ConditionKernelCommandLine=|rd.break=cmdline
  40 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh
  41 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-cmdline.sh        2015-06-15 10:27:21.000000000 +0000
  42 +++ dracut-043/modules.d/98dracut-systemd/dracut-cmdline.sh     2015-08-07 17:01:34.828982244 +0000
  43 @@ -5,7 +5,7 @@
  44  fi
  45  type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
  46
  47 -[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
  48 +[ -f /etc/initrd-release ] && . /etc/initrd-release
  49  [ -n "$VERSION" ] && info "dracut-$VERSION"
  50
  51  if ! getargbool 1 'rd.hostonly'; then
  52 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-initqueue.service dracut-043/modules.d/98dracut-systemd/dracut-initqueue.service
  53 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-initqueue.service 2015-06-15 10:27:21.000000000 +0000
  54 +++ dracut-043/modules.d/98dracut-systemd/dracut-initqueue.service      2015-08-07 17:01:28.936035859 +0000
  55 @@ -15,7 +15,7 @@
  56  Wants=remote-fs-pre.target
  57  After=systemd-udev-trigger.service
  58  Wants=systemd-udev-trigger.service
  59 -ConditionPathExists=/usr/lib/initrd-release
  60 +ConditionPathExists=/etc/initrd-release
  61  ConditionPathExists=|/lib/dracut/need-initqueue
  62  ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/*.sh
  63  ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/settled/*.sh
  64 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-mount.service dracut-043/modules.d/98dracut-systemd/dracut-mount.service
  65 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-mount.service     2015-06-15 10:27:21.000000000 +0000
  66 +++ dracut-043/modules.d/98dracut-systemd/dracut-mount.service  2015-08-07 17:01:51.992559672 +0000
  67 @@ -12,7 +12,7 @@
  68  Documentation=man:dracut-mount.service(8)
  69  After=initrd-root-fs.target initrd-parse-etc.service
  70  After=dracut-initqueue.service dracut-pre-mount.service
  71 -ConditionPathExists=/usr/lib/initrd-release
  72 +ConditionPathExists=/etc/initrd-release
  73  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/mount
  74  ConditionKernelCommandLine=|rd.break=mount
  75
  76 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-mount.service dracut-043/modules.d/98dracut-systemd/dracut-pre-mount.service
  77 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-mount.service 2015-06-15 10:27:21.000000000 +0000
  78 +++ dracut-043/modules.d/98dracut-systemd/dracut-pre-mount.service      2015-08-07 17:01:41.108120404 +0000
  79 @@ -14,7 +14,7 @@
  80  Before=initrd-root-fs.target sysroot.mount
  81  After=dracut-initqueue.service
  82  After=cryptsetup.target
  83 -ConditionPathExists=/usr/lib/initrd-release
  84 +ConditionPathExists=/etc/initrd-release
  85  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-mount
  86  ConditionKernelCommandLine=|rd.break=pre-mount
  87
  88 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-pivot.service dracut-043/modules.d/98dracut-systemd/dracut-pre-pivot.service
  89 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-pivot.service 2015-06-15 10:27:21.000000000 +0000
  90 +++ dracut-043/modules.d/98dracut-systemd/dracut-pre-pivot.service      2015-08-07 17:01:45.669399767 +0000
  91 @@ -15,7 +15,7 @@
  92  Before=initrd-cleanup.service
  93  Wants=remote-fs.target
  94  After=remote-fs.target
  95 -ConditionPathExists=/usr/lib/initrd-release
  96 +ConditionPathExists=/etc/initrd-release
  97  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-pivot
  98  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/cleanup
  99  ConditionKernelCommandLine=|rd.break=pre-pivot
 100 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-trigger.service dracut-043/modules.d/98dracut-systemd/dracut-pre-trigger.service
 101 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-trigger.service       2015-06-15 10:27:21.000000000 +0000
 102 +++ dracut-043/modules.d/98dracut-systemd/dracut-pre-trigger.service    2015-08-07 17:01:49.791458705 +0000
 103 @@ -14,7 +14,7 @@
 104  Before=systemd-udev-trigger.service dracut-initqueue.service
 105  After=dracut-pre-udev.service systemd-udevd.service systemd-tmpfiles-setup-dev.service
 106  Wants=dracut-pre-udev.service systemd-udevd.service
 107 -ConditionPathExists=/usr/lib/initrd-release
 108 +ConditionPathExists=/etc/initrd-release
 109  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-trigger
 110  ConditionKernelCommandLine=|rd.break=pre-trigger
 111
 112 diff -ur dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-udev.service dracut-043/modules.d/98dracut-systemd/dracut-pre-udev.service
 113 --- dracut-043.orig/modules.d/98dracut-systemd/dracut-pre-udev.service  2015-06-15 10:27:21.000000000 +0000
 114 +++ dracut-043/modules.d/98dracut-systemd/dracut-pre-udev.service       2015-08-07 17:01:47.669399123 +0000
 115 @@ -14,7 +14,7 @@
 116  Before=systemd-udevd.service dracut-pre-trigger.service
 117  After=dracut-cmdline.service
 118  Wants=dracut-cmdline.service
 119 -ConditionPathExists=/usr/lib/initrd-release
 120 +ConditionPathExists=/etc/initrd-release
 121  ConditionDirectoryNotEmpty=|/lib/dracut/hooks/pre-udev
 122  ConditionKernelCommandLine=|rd.break=pre-udev
 123  ConditionKernelCommandLine=|rd.driver.blacklist
 124 diff -ur dracut-043.orig/modules.d/99base/dracut-lib.sh dracut-043/modules.d/99base/dracut-lib.sh
 125 --- dracut-043.orig/modules.d/99base/dracut-lib.sh      2015-06-15 10:27:21.000000000 +0000
 126 +++ dracut-043/modules.d/99base/dracut-lib.sh   2015-08-07 17:00:50.435567301 +0000
 127 @@ -396,7 +396,7 @@
 128  }
 129
 130  setdebug() {
 131 -    [ -f /usr/lib/initrd-release ] || return
 132 +    [ -f /etc/initrd-release ] || return
 133      if [ -z "$RD_DEBUG" ]; then
 134          if [ -e /proc/cmdline ]; then
 135              RD_DEBUG=no
 136 diff -ur dracut-043.orig/modules.d/99base/init.sh dracut-043/modules.d/99base/init.sh
 137 --- dracut-043.orig/modules.d/99base/init.sh    2015-06-15 10:27:21.000000000 +0000
 138 +++ dracut-043/modules.d/99base/init.sh 2015-08-07 17:01:00.536567301 +0000
 139 @@ -106,7 +106,7 @@
 140      exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
 141  fi
 142
 143 -[ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release
 144 +[ -f /etc/initrd-release ] && . /etc/initrd-release
 145  [ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
 146
 147  source_conf /etc/conf.d
 148 diff -ur dracut-043.orig/modules.d/99base/module-setup.sh dracut-043/modules.d/99base/module-setup.sh
 149 --- dracut-043.orig/modules.d/99base/module-setup.sh    2015-06-15 10:27:21.000000000 +0000
 150 +++ dracut-043/modules.d/99base/module-setup.sh 2015-08-07 17:01:25.104122302 +0000
 151 @@ -84,10 +84,8 @@
 152          echo VERSION_ID=$VERSION_ID
 153          echo PRETTY_NAME=\"$PRETTY_NAME\"
 154          echo ANSI_COLOR=\"$ANSI_COLOR\"
 155 -    } > $initdir/usr/lib/initrd-release
 156 +    } > $initdir/etc/initrd-release
 157      echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
 158 -    ln -sf ../usr/lib/initrd-release $initdir/etc/initrd-release
 159 -    ln -sf initrd-release $initdir/usr/lib/os-release
 160      ln -sf initrd-release $initdir/etc/os-release
 161
 162      ## save host_devs which we need bring up