libvirtinator 0.1.0 → 0.1.1

data/lib/libvirtinator/examples/vmbuilder-init.sh.erb

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-chroot $1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-chroot $1 sh -c "echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
-chroot $1 apt-get purge -y grub
-chroot $1 apt-get update -qq
-chroot $1 apt-get install -y lxc-docker grub-pc
-chroot $1 sed -i'' -e"s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"cgroup_enable=memory swapaccount=1\"/" /etc/default/grub
-chroot $1 update-grub
+chroot $1 apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+chroot $1 sh -c "echo deb https://apt.dockerproject.org/repo ubuntu-trusty main > /etc/apt/sources.list.d/docker.list"
+chroot $1 apt-get update -qq && apt-get install -y docker-engine

data/lib/libvirtinator/examples/vmbuilder.cfg.erb

@@ -12,5 +12,4 @@ flavour    = virtual
 suite      = trusty
 domain     = example.com
 components = main,restricted,universe,multiverse
-removepkg  = grub
-addpkg     = openssh-server, unattended-upgrades, acpid, aptitude, language-pack-en-base, bwm-ng, htop, iotop, bzip2, file, unzip, zip, rar, unrar, nmap, man-db, curl, tmux, git-core, vim, locate, ipcalc, sl, nagios-plugins-basic, wget, rsync, tcpdump, mtr, apparmor, cgroup-lite, apt-transport-https, linux-image-generic, grub-pc
+addpkg     = openssh-server, unattended-upgrades, acpid, aptitude, language-pack-en-base, bwm-ng, htop, iotop, bzip2, file, unzip, zip, rar, unrar, nmap, man-db, curl, tmux, git-core, vim, locate, ipcalc, sl, nagios-plugins-basic, wget, rsync, tcpdump, mtr, apparmor, cgroup-lite, apt-transport-https, linux-image-generic, linux-image-extra-virtual

data/lib/libvirtinator/vm.rb

@@ -227,8 +227,10 @@ task :update_root_image => 'libvirtinator:load_settings' do
         "#{mount_point}/etc/sudoers"
       user = fetch(:user)
       begin
-        execute "bash", "-c", "\"for", "m", "in", "'sys'", "'dev'", "'proc';",
-          "do", "mount", "/$m", "#{mount_point}/$m", "-o", "bind;", "done\""
+        mounts = ["sys", "dev", "proc"]
+        mounts.each do |mount|
+          execute "mount", "-o", "bind", "/#{mount}", "#{mount_point}/#{mount}"
+        end
         execute "chroot", mount_point, "/bin/bash", "-c",
           "\"if", "!", "id", user, "&>", "/dev/null;", "then",
           "useradd", "--user-group", "--shell",
@@ -250,8 +252,9 @@ task :update_root_image => 'libvirtinator:load_settings' do
         execute "chmod", "600", "#{mount_point}/home/#{user}/.ssh/authorized_keys"
         execute "mkdir", "-p", "#{mount_point}#{fetch(:data_disk_mount_point)}" if fetch(:data_disk_enabled)
       ensure
-        execute "bash", "-c", "\"for", "m", "in", "'sys'", "'dev'", "'proc';",
-        "do", "umount", "#{mount_point}/$m;", "done\""
+        mounts.each do |mount|
+          execute "umount", "#{mount_point}/#{mount}"
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libvirtinator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano