lvmsync 1.0.1 → 1.0.2

data/README.md

@@ -52,14 +52,21 @@ straight for the source code.
 
 ## Installation
 
-On the machine you're transferring from, you'll need have `dmsetup` and
-`ssh` installed and available on the PATH, and an installation of Ruby 1.8
-(or later).  Then just copy the `lvmsync` script to somewhere in root's
-PATH.
-
-On the machine you're transferring *to*, you'll need `sshd` installed and
-available for connection, and an installation of Ruby 1.8 (or later).  Then
-just copy the `lvmsync` script to somewhere in root's PATH.
+To run `lvmsync`, you'll need to have a working installation of Ruby 1.8 (or
+later) on both the machine you're transferring from, and the machine you're
+transferring to.  On the source, you'll need `vgcfgbackup` (which is part of
+the core LVM2 toolset), and if you want to deal with thin snapshots, you'll
+also need `thin_dump` (which is part of the "thin provisioning tools" which
+are highly recommended for anyone working with thin-provisioned LVs).  For
+transferring dumps between machines, you'll need SSH installed and working
+between the two machines.
+
+Installing `lvmsync` itself is easiest using Rubygems: `gem install
+lvmsync`.  This will install all the dependencies and (presumably) put the
+`lvmsync` command itself in root's PATH.  If for some reason you want to
+install it all by hand, you'll need to copy the contents of `lib/` into a
+directory in your Ruby library path, copy `bin/lvmsync` to somewhere on your
+PATH, and install the `treetop` and `git-version-bump` gems.
 
 
 ## How do I use it?

data/lib/lvm/snapshot.rb

@@ -108,6 +108,6 @@ class LVM::Snapshot
 	end
 
 	def metadata_device
-		"/dev/mapper/#{@vg}-#{@lv}-cow"
+		"/dev/mapper/#{@vg}-#{@lv.gsub('-', '--')}-cow"
 	end
 end

data/lib/lvm/vg_config.rb

@@ -57,13 +57,16 @@ class LVM::VGConfig
 				cmd = "#{@vgcfgbackup_cmd} -f #{tmpf.path} #{@vg_name}"
 				stdout = nil
 				stderr = nil
-				Open3.popen3(cmd) do |stdin_fd, stdout_fd, stderr_fd|
+				exit_status = nil
+
+				Open3.popen3(cmd) do |stdin_fd, stdout_fd, stderr_fd, wait_thr|
 					stdin_fd.close
 					stdout = stdout_fd.read
 					stderr = stderr_fd.read
+					exit_status = wait_thr.value
 				end
 
-				if $?.exitstatus != 0
+				if exit_status.exitstatus != 0
 					raise RuntimeError,
 					      "Failed to run vgcfgbackup: #{stdout}\n#{stderr}"
 				end

data/lib/vgcfgbackup.treetop

@@ -8,7 +8,7 @@ grammar VgCfgBackup
 	end
 
 	rule variable_name
-		[a-z0-9_]+ <VariableName>
+		[a-z0-9_-]+ <VariableName>
 	end
 
 	rule group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lvmsync
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3361242777286472333
+      hash: 2970664606006248824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3361242777286472333
+      hash: 2970664606006248824
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23