[gentoo-commits] proj/genkernel:master commit in: defaults/

[Thomas Deutschmann]

commit:     f2bff3217a493b661dcde5dc1dea2f187106ca1a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 15:49:27 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 19:34:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f2bff321

initrd.scripts: modules_scan(): Rename GK_ROOTFS_DETECTED_STATEFILE -> 
GK_ROOT_DEV_DETECTED_STATEFILE

GK_ROOT_DEV_DETECTED_STATEFILE is the more precise name.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.defaults | 2 +-
 defaults/initrd.scripts  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults
index c9e956a..b4e1e1d 100644
--- a/defaults/initrd.defaults
+++ b/defaults/initrd.defaults
@@ -89,7 +89,7 @@ GK_NET_TIMEOUT_INTERFACE=10
 GK_PRESERVE_RUN=1
 GK_PROMPT_FILE='/tmp/current_prompt'
 GK_PROMPT_TIMEOUT=0
-GK_ROOTFS_DETECTED_STATEFILE="/tmp/rootfs.detected"
+GK_ROOT_DEV_DETECTED_STATEFILE="/tmp/root_dev.detected"
 GK_SHELL_LOCKFILE='/tmp/rescueshell.lock'
 GK_SSHD_LOCKFILE='/tmp/remote-rescueshell.lock'
 GK_SSHD_PIDFILE='/var/run/dropbear.pid'

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 55fe73f..da15db7 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -99,16 +99,16 @@ modules_scan() {
                then
                        if [ "${smart_loading}" = "yes" ]
                        then
-                               if [ ! -f "${GK_ROOTFS_DETECTED_STATEFILE}" ]
+                               if [ ! -f "${GK_ROOT_DEV_DETECTED_STATEFILE}" ]
                                then
                                        _root_dev=$(findfs "${REAL_ROOT}" 
2>/dev/null)
                                        if [ $? -eq 0 ] && [ -n "${_root_dev}" 
] && [ -b "${_root_dev}" ]
                                        then
-                                               echo "${_root_dev}" > 
"${GK_ROOTFS_DETECTED_STATEFILE}"
+                                               echo "${_root_dev}" > 
"${GK_ROOT_DEV_DETECTED_STATEFILE}"
                                        fi
                                fi
 
-                               if [ -f "${GK_ROOTFS_DETECTED_STATEFILE}" ]
+                               if [ -f "${GK_ROOT_DEV_DETECTED_STATEFILE}" ]
                                then
                                        log_msg "${root_dev_found}"
                                        printf "%b" "${root_dev_found}"