Small fixes to mounting and unmounting

lvmsnapshot.py

@@ -131,10 +131,10 @@ class Snapshot:
             self.get_name().replace("-", "--"))
 
     def get_mount_options(self):
-        return "-nfstype=xfs,ro,noatime,nouuid,norecovery"
+        return "ro,noatime,nouuid,norecovery"
 
     def get_tab_entry(self):
-        return "{} {} :{}".format(
+        return "{} -fstype=xfs,{} :{}".format(
             self.get_name(),
             self.get_mount_options(),
             self.get_mapper_device())
@@ -166,10 +166,21 @@ class Snapshot:
             "/bin/mount",
             self.get_mapper_device(),
             self.get_mountpoint(),
-            self.get_mount_options() # nouuid is necessary for xfs snapshots
+            "-o", self.get_mount_options()
         ]
         sp.run(mount_command, check=True)
 
+    def check_mount(self):
+        check_command = [
+            "/bin/findmnt",
+            "--source", self.get_mapper_device()
+        ]
+        try:
+            sp.check_call(check_command)
+            return True
+        except sp.CalledProcessError:
+            return False
+
     def remove(self):
         self.unmount()
         remove_command = [
@@ -179,6 +190,7 @@ class Snapshot:
         sp.run(remove_command, check=True)
 
     def unmount(self):
+        if self.check_mount():
             unmount_command = [
                 "/bin/umount",
                 self.get_mountpoint()