]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
Revert "- removed unused variable" 475/head
authorNeal Gompa <ngompa13@gmail.com>
Tue, 19 Feb 2019 03:34:17 +0000 (22:34 -0500)
committerNeal Gompa <ngompa13@gmail.com>
Tue, 19 Feb 2019 03:34:17 +0000 (22:34 -0500)
The variable previously removed is actually used when SELinux is
enabled.

This reverts commit 842721cd470ce5b97316fff250b0c1fa356a00f4.

snapper/Lvm.cc
snapper/Lvm.h

index 5dd062197e408a702df211bf2be6185e0516ef17..a944800d5d922f8ef6b50e5a647e103a74c498b8 100644 (file)
@@ -63,7 +63,7 @@ namespace snapper
     Lvm::Lvm(const string& subvolume, const string& root_prefix, const string& mount_type)
        : Filesystem(subvolume, root_prefix), mount_type(mount_type),
          caps(LvmCapabilities::get_lvm_capabilities()),
-         cache(LvmCache::get_lvm_cache())
+         cache(LvmCache::get_lvm_cache()), sh(NULL)
     {
        if (access(LVCREATEBIN, X_OK) != 0)
        {
index 5aa3098c45cddee3bd0fc86ab351e49e1d3404d9..5f29dd9e4d43b5cc4599175e1307540de8027737 100644 (file)
@@ -115,6 +115,7 @@ namespace snapper
        const string mount_type;
        const LvmCapabilities* caps;
        LvmCache* cache;
+       SelinuxLabelHandle* sh;
 
        bool detectThinVolumeNames(const MtabData& mtab_data);
        void activateSnapshot(const string& vg_name, const string& lv_name) const;