diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2017-02-18 23:39:25 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-04-07 00:42:30 +0100 |
| commit | dc22177c8eb20f84cf0ca83a4ff786e0bed5414e (patch) | |
| tree | 03596e5dba2b72f3f9f253a5496853f5ff770274 /scripts/local | |
| parent | e5c68cea05e6c608a810bfbfe3645b17e1a7dbff (diff) | |
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>
Diffstat (limited to 'scripts/local')
| -rw-r--r-- | scripts/local | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/local b/scripts/local index 3558f7a..a4ddcea 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 |