From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 22 Mar 2017 15:52:42 +0000 (+0100)
Subject: - remove read-only mount option for new fstab entry in mksubvolume (bsc#1030257)
X-Git-Tag: v0.5.0~3^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=refs%2Fpull%2F336%2Fhead;p=thirdparty%2Fsnapper.git

- remove read-only mount option for new fstab entry in mksubvolume (bsc#1030257)
---

diff --git a/VERSION b/VERSION
index 17b2ccd9..6f2743d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.3
+0.4.4
diff --git a/client/mksubvolume.cc b/client/mksubvolume.cc
index 0bab2ab8..de56856e 100644
--- a/client/mksubvolume.cc
+++ b/client/mksubvolume.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2015] SUSE LLC
+ * Copyright (c) [2015-2017] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -63,7 +63,7 @@ do_tmp_mount(const libmnt_fs* fs, const char* tmp_mountpoint, const string& subv
     if (!subvol_option.empty())
 	mnt_context_set_options(cxt, ("subvol=" + subvol_option).c_str());
     else
-	mnt_context_set_options(cxt, "subvolid=5"); // 5 is the btrfs initial top-level subvolume
+	mnt_context_set_options(cxt, "subvolid=5"); // 5 is the btrfs top-level subvolume
 
     int ret = mnt_context_mount(cxt);
     if (ret != 0)
@@ -139,6 +139,7 @@ do_add_fstab_and_mount(MntTable& mnt_table, const libmnt_fs* fs, const string& s
 
     char* options = mnt_fs_strdup_options(x);
     mnt_optstr_remove_option(&options, "defaults");
+    mnt_optstr_remove_option(&options, "ro");
     mnt_optstr_set_option(&options, "subvol", full_subvol_option.c_str());
     mnt_fs_set_options(x, options);
     free(options);
@@ -202,7 +203,7 @@ do_set_nocow()
 bool
 is_subvol_mount(const string& fs_options)
 {
-    list<string> tmp1;
+    vector<string> tmp1;
     boost::split(tmp1, fs_options, boost::is_any_of(","), boost::token_compress_on);
     for (const string& tmp2 : tmp1)
     {
diff --git a/package/snapper.changes b/package/snapper.changes
index 34ea4dfd..bc0cee05 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 22 16:47:56 CET 2017 - aschnell@suse.com
+
+- remove read-only mount option for new fstab entry in mksubvolume
+  (bsc#1030257)
+- version 0.4.4
+
 -------------------------------------------------------------------
 Thu Feb 02 19:07:40 CET 2017 - aschnell@suse.com