diff --git a/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java b/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java
index fd69427bb13..62188f43697 100644
--- a/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java
+++ b/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java
@@ -22,8 +22,8 @@ final class MountBlockDeviceHelper {
 
     static final String LOG_PREFIX = "[MountBlockDevice]";
     private static final String FSTAB_SCAN_NO_UUID_SENTINEL = "__zs_no_uuid__";
-    private static final String FSTAB_OPTIONS_MULTIPATH = "defaults,_netdev,x-systemd.device-timeout=10";
-    private static final String FSTAB_OPTIONS_DEFAULT = "defaults";
+    private static final String FSTAB_OPTIONS_MULTIPATH = "defaults,_netdev,nofail,x-systemd.device-timeout=10";
+    private static final String FSTAB_OPTIONS_DEFAULT = "defaults,nofail,x-systemd.device-timeout=10";
     private static final String MULTIPATH_PREFIX = "/dev/mapper/mpath";
 
     private MountBlockDeviceHelper() {
@@ -352,4 +352,4 @@ private static SshResult executeSshCommand(Ssh ssh, String command) {
         }
         return ret;
     }
-}
\ No newline at end of file
+}
diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java
index 8bc6cc090b7..dae2ef16ef0 100755
--- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java
+++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java
@@ -183,6 +183,8 @@ public void run(MessageReply reply) {
                 cmd.setSshPort(greply.getSshPort());
                 cmd.setBackupStorageInstallPath(backupStorageInstallPath);
                 cmd.setPrimaryStorageInstallPath(primaryStorageInstallPath);
+                cmd.uuid = pinv.getUuid();
+                cmd.primaryStorageUuid = pinv.getUuid();
                 cmd.storagePath =  pinv.getUrl();
 
                 KVMHostAsyncHttpCallMsg msg = new KVMHostAsyncHttpCallMsg();