From 0cd84ee25035df2f232e5778f5ab9fb5b6c3adb0 Mon Sep 17 00:00:00 2001
From: Julien Fontanet <julien.fontanet@isonoe.net>
Date: Fri, 19 Oct 2018 11:10:27 +0200
Subject: [PATCH] chore(xo-server): move LVM start hook to file restore NG

Otherwise, I have a feeling that we may forget to migrate this code when
legacy backup code will be retired.
---
 packages/xo-server/src/xo-mixins/backups.js         | 8 --------
 packages/xo-server/src/xo-mixins/file-restore-ng.js | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/xo-server/src/xo-mixins/backups.js b/packages/xo-server/src/xo-mixins/backups.js
index 4a060dbbf..21e491585 100644
--- a/packages/xo-server/src/xo-mixins/backups.js
+++ b/packages/xo-server/src/xo-mixins/backups.js
@@ -300,14 +300,6 @@ const mountLvmPv = (device, partition) => {
 export default class {
   constructor (xo) {
     this._xo = xo
-
-    // clean any LVM volumes that might have not been properly
-    // unmounted
-    xo.on('start', () =>
-      Promise.all([execa('losetup', ['-D']), execa('vgchange', ['-an'])]).then(
-        () => execa('pvscan', ['--cache'])
-      )
-    )
   }
 
   async listRemoteBackups (remoteId) {
diff --git a/packages/xo-server/src/xo-mixins/file-restore-ng.js b/packages/xo-server/src/xo-mixins/file-restore-ng.js
index 521e155b9..93c4fa5a6 100644
--- a/packages/xo-server/src/xo-mixins/file-restore-ng.js
+++ b/packages/xo-server/src/xo-mixins/file-restore-ng.js
@@ -163,6 +163,13 @@ export default class BackupNgFileRestore {
   constructor (app) {
     this._app = app
     this._mounts = { __proto__: null }
+
+    // clean any LVM volumes that might have not been properly
+    // unmounted
+    app.on('start', async () => {
+      await Promise.all([execa('losetup', ['-D']), execa('vgchange', ['-an'])])
+      await execa('pvscan', ['--cache'])
+    })
   }
 
   @defer