[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH initramfs-tools 1/5] scripts/local: local_device_setup should not assume devices hold file systems



Move the 'file system' name suffix into the callers.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/local | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/local b/scripts/local
index 3558f7a04b1f..a4ddcea73a38 100644
--- a/scripts/local
+++ b/scripts/local
@@ -71,7 +71,7 @@ local_device_setup()
 	# there are devices stacked on top of those.
 	if ! real_dev=$(resolve_device "${dev_id}") ||
 	   ! get_fstype "${real_dev}" >/dev/null; then
-		log_begin_msg "Waiting for ${name} file system"
+		log_begin_msg "Waiting for ${name}"
 
 		# Timeout is max(30, rootdelay) seconds (approximately)
 		slumber=30
@@ -115,7 +115,7 @@ local_device_setup()
 local_mount_root()
 {
 	local_top
-	local_device_setup "${ROOT}" root
+	local_device_setup "${ROOT}" "root file system"
 	ROOT="${DEV}"
 
 	# Get the root filesystem type if not set
@@ -151,7 +151,7 @@ local_mount_fs()
 {
 	read_fstab_entry "$1"
 
-	local_device_setup "$MNT_FSNAME" "$1"
+	local_device_setup "$MNT_FSNAME" "$1 file system"
 	MNT_FSNAME="${DEV}"
 
 	local_premount

Attachment: signature.asc
Description: Digital signature


Reply to: