ceph-disk: only call restorecon when available

9db80da added an unconditional call to restorecon after mounting the filesystem. It fails when restorecon is not available and must be made conditional. http://tracker.ceph.com/issues/12718 Fixes: ceph#12718 Signed-off-by: Loic Dachary <[email protected]>
bitfehler · Aug 18, 2015 · 3aab146 · 3aab146
1 parent c3de0af
commit 3aab146
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/ceph-disk b/src/ceph-disk
@@ -963,12 +963,13 @@ def mount(
                 path,
                 ],
             )
-        command(
-           [
-                'restorecon',
-                path,
+        if which('restorecon'):
+            command(
+                [
+                    'restorecon',
+                    path,
                 ],
-           )
+            )
     except subprocess.CalledProcessError as e:
         try:
             os.rmdir(path)