From 7e05c84aaed4edd01681a9c41cedac344be36f1e Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 30 Aug 2016 21:26:00 +0200 Subject: mount-nv: ensure --format is not disabled by absence of --auto-format When --format is passed and the file system is not detected, the DO_FORMAT variable gets replaced by the AUTO_FORMAT variable. The purpose was to OR them but that's obviously not what was done, so some mounts fail if only --format is specified without --auto-format. --- scripts/mount-nv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mount-nv b/scripts/mount-nv index 96008c7..367df2c 100755 --- a/scripts/mount-nv +++ b/scripts/mount-nv @@ -226,7 +226,7 @@ if [ -z "$FS_TYPE" -o -n "$DO_IDENTIFY" ]; then exit 1 fi # no need to try to mount before formating, let's save errors - DO_FORMAT=$AUTO_FORMAT + DO_FORMAT=$DO_FORMAT$AUTO_FORMAT REPLY=$DEFAULT_FS_TYPE fi FS_TYPE=$REPLY -- 1.7.12.1