aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-03-14 16:49:27 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-03-14 20:34:08 +0100
commitf2bff3217a493b661dcde5dc1dea2f187106ca1a (patch)
treefb8cc47bff3445de9c77c1591d3b146cc2e8a9c5
parentlinuxrc: Skip loading embedded boot font for serial consoles (diff)
downloadgenkernel-f2bff3217a493b661dcde5dc1dea2f187106ca1a.tar.gz
genkernel-f2bff3217a493b661dcde5dc1dea2f187106ca1a.tar.bz2
genkernel-f2bff3217a493b661dcde5dc1dea2f187106ca1a.zip
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@gentoo.org>
-rw-r--r--defaults/initrd.defaults2
-rw-r--r--defaults/initrd.scripts6
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}"