dev-lxc 0.2.2 → 0.2.3

data/lib/dev-lxc/chef-server.rb

@@ -155,12 +155,18 @@ module DevLXC
       base_platform.clone(base_server.name, {:flags => LXC::LXC_CLONE_SNAPSHOT})
       base_server = DevLXC::Container.new(base_server.name)
 
-      # Rename procps in Ubuntu platforms because Enterprise Chef server < 11.0.0
-      # postgres recipe will use it even though it does not work in an LXC container
-      @packages["server"].to_s.match(/private-chef[_-](\d+)\.(\d+\.?){2,}-/)
-      if base_platform.name.include?("ubuntu") && Regexp.last_match[1].to_i < 11
-        FileUtils.mv("#{base_server.config_item('lxc.rootfs')}/etc/init.d/procps",
-                     "#{base_server.config_item('lxc.rootfs')}/etc/init.d/procps.orig")
+      # Disable certain sysctl.d files in Ubuntu 10.04, they cause `start procps` to fail
+      # Enterprise Chef server's postgresql recipe expects to be able to `start procps`
+      if base_platform.name == "b-ubuntu-1004"
+        if File.exist?("#{base_server.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
+          FileUtils.mv("#{base_server.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
+                       "#{base_server.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
+        end
+      end
+      # TODO when LXC 1.0.2 is released the following test can be done using #config_item("lxc.mount.auto")
+      unless IO.readlines(base_server.config_file_name).select { |line| line.start_with?("lxc.mount.auto") }.empty?
+        base_server.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
+        base_server.save_config
       end
       base_server.sync_mounts(@mounts)
       base_server.start

data/lib/dev-lxc/container.rb

@@ -29,9 +29,12 @@ module DevLXC
     end
 
     def sync_mounts(mounts)
-      preserved_mounts = self.config_item("lxc.mount.entry").delete_if { |m| m.end_with?("## dev-lxc ##") }
-      self.clear_config_item('lxc.mount.entries')
-      self.set_config_item("lxc.mount.entry", preserved_mounts)
+      existing_mounts = self.config_item("lxc.mount.entry")
+      if existing_mounts.is_a?(Array)
+        preserved_mounts = existing_mounts.delete_if { |m| m.end_with?("## dev-lxc ##") }
+        self.clear_config_item('lxc.mount.entries')
+        self.set_config_item("lxc.mount.entry", preserved_mounts)
+      end
       mounts.each do |mount|
         raise "Mount source #{mount.split.first} does not exist." unless File.exists?(mount.split.first)
         puts "Adding mount entry #{mount}"

data/lib/dev-lxc/version.rb

@@ -1,3 +1,3 @@
 module DevLXC
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/dev-lxc.rb

@@ -23,6 +23,13 @@ module DevLXC
     when "b-centos-6"
       base_platform.create("download", "btrfs", 0, ["-d", "centos", "-r", "6", "-a", "amd64"])
     end
+    # TODO when LXC 1.0.2 is released and the following test is replaced with #config_item("lxc.mount.auto")
+    # then this #save_config can be removed
+    base_platform.save_config
+    # TODO when LXC 1.0.2 is released the following test can be done using #config_item("lxc.mount.auto")
+    unless IO.readlines(base_platform.config_file_name).select { |line| line.start_with?("lxc.mount.auto") }.empty?
+      base_platform.set_config_item("lxc.mount.auto", "proc:rw sys:rw")
+    end
     hwaddr = '00:16:3e:' + Digest::SHA1.hexdigest(Time.now.to_s).slice(0..5).unpack('a2a2a2').join(':')
     puts "Setting #{base_platform.name} container's lxc.network.0.hwaddr to #{hwaddr}"
     base_platform.set_config_item("lxc.network.0.hwaddr", hwaddr)
@@ -31,6 +38,11 @@ module DevLXC
     puts "Installing packages in container #{base_platform.name}"
     case base_platform.name
     when "b-ubuntu-1004"
+      # Disable certain sysctl.d files in Ubuntu 10.04, they cause `start procps` to fail
+      if File.exist?("#{base_platform.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf")
+        FileUtils.mv("#{base_platform.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf",
+                     "#{base_platform.config_item('lxc.rootfs')}/etc/sysctl.d/10-console-messages.conf.orig")
+      end
       base_platform.run_command("apt-get update")
       base_platform.run_command("apt-get install -y standard^ server^ vim-nox emacs23-nox curl tree")
     when "b-ubuntu-1204"
@@ -73,7 +85,7 @@ module DevLXC
 
   def self.append_line_to_file(file_name, line)
     content = IO.readlines(file_name)
-    content[-1] = content[-1].chomp + "\n"
+    content[-1] = content[-1].chomp + "\n" unless content.empty?
     content << line
     IO.write(file_name, content.join)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev-lxc
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler