drop 10rpmversion module and introduce /etc/initrd-release

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 617d96731c2b128226a889cbaae62903bd1c639c..e362e733722bb8cb643b3a1ae011b1bf06058fae 100644 (file)
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -2,7 +2,6 @@
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-add_dracutmodules+=" rpmversion "
 omit_dracutmodules+=" dash "
 omit_drivers+=" .*/fs/ocfs/.* "
 stdloglvl=3

diff --git a/dracut.spec b/dracut.spec
index 144b6e25a5bb5f175d9a5bcd18c007825073e3d6..eb5df2cff17a8dc4aef976324e896408cdebb8a6 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -178,7 +178,7 @@ make install DESTDIR=$RPM_BUILD_ROOT \
 %endif
      sysconfdir=/etc mandir=%{_mandir}
 
-echo %{name}-%{version}-%{release} > $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/10rpmversion/dracut-version
+echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dracut-version.sh
 
 %if 0%{?fedora} == 0 && 0%{?rhel} == 0
 rm -fr $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
@@ -256,7 +256,6 @@ rm -rf $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/00dash
 %{dracutlibdir}/modules.d/05busybox
 %{dracutlibdir}/modules.d/10i18n
-%{dracutlibdir}/modules.d/10rpmversion
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/50plymouth

diff --git a/modules.d/10rpmversion/module-setup.sh b/modules.d/10rpmversion/module-setup.sh
deleted file mode 100755 (executable)
index 4c021ad..0000000
--- a/modules.d/10rpmversion/module-setup.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-check() {
-    [[ "$mount_needs" ]] && return 1
-    [ -f /etc/redhat-release ]
-}
-
-depends() {
-    return 0
-}
-
-install() {
-    local _line
-    local _dracut_rpm_version
-    if [ -e "$moddir/dracut-version" ]; then
-        _dracut_rpm_version=$(cat "$moddir/dracut-version")
-        inst "$moddir/dracut-version" /lib/dracut/$_dracut_rpm_version
-    else
-        if rpm -qf $(type -P $0) &>/dev/null; then
-            _dracut_rpm_version=$(rpm -qf --qf '%{name}-%{version}-%{release}\n' $(type -P $0) | { ver="";while read _line;do ver=$_line;done;echo $ver;} )
-            mkdir -m 0755 -p $initdir/lib/dracut
-            echo $_dracut_rpm_version > $initdir/lib/dracut/$_dracut_rpm_version
-        fi
-    fi
-    inst_hook cmdline 01 "$moddir/version.sh"
-
-}
-

diff --git a/modules.d/10rpmversion/version.sh b/modules.d/10rpmversion/version.sh
deleted file mode 100755 (executable)
index e961ccd..0000000
--- a/modules.d/10rpmversion/version.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-for i in lib/dracut/dracut-*; do
-    if [ -f $i ]; then
-        vinfo < $i
-    fi
-done
-unset i

diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index 5807b1265e7fc79ece592990fba2f57e229c6024..b8736ecb69afe441ae4045fdfc647b17bcae7b36 100755 (executable)
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -19,6 +19,7 @@ export PATH
 
 RD_DEBUG=""
 . /lib/dracut-lib.sh
+
 trap "emergency_shell Signal caught!" 0
 
 [ -c /dev/null ] || mknod -m 0666 /dev/null c 1 3
@@ -88,6 +89,9 @@ else
     exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
 fi
 
+[ -f /etc/initrd-release ] && . /etc/initrd-release
+[ -n "$VERSION" ] && vinfo "dracut-$VERSION"
+
 source_conf /etc/conf.d
 
 # run scriptlets to parse the command line

diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index 8bf3d4d161b2a5b7763494dfa9229cbb146f9a91..96c18ab54e4ce60302bd92c4c7c10a7977a9858a 100755 (executable)
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -49,5 +49,30 @@ install() {
     fi
 
     ln -s /proc/self/mounts "$initdir/etc/mtab"
-}
 
+    if [ -e /etc/os-release ]; then
+        . /etc/os-release
+        VERSION+=" "
+        PRETTY_NAME+=" "
+    else
+        VERSION=""
+        PRETTY_NAME=""
+    fi
+    NAME=Dracut
+    ID=dracut
+    VERSION+="dracut-$DRACUT_VERSION"
+    PRETTY_NAME+="dracut-$DRACUT_VERSION (Initramfs)"
+    VERSION_ID=$DRACUT_VERSION
+    ANSI_COLOR="0;34"
+
+    {
+        echo NAME=\"$NAME\"
+        echo VERSION=\"$VERSION\"
+        echo ID=$ID
+        echo VERSION_ID=$VERSION_ID
+        echo PRETTY_NAME=\"$PRETTY_NAME\"
+        echo ANSI_COLOR=\"$ANSI_COLOR\"
+    } > $initdir/etc/initrd-release
+    echo dracut-$DRACUT_VERSION > $initdir/lib/dracut/dracut-$DRACUT_VERSION
+    ln -s initrd-release $initdir/etc/os-release
+}