getch 0.1.0 → 0.1.1

data/lib/getch/filesystem/lvm/encrypt/format.rb

@@ -12,10 +12,10 @@ module Getch
 
           def format
             return if STATES[:format]
-            puts "Format #{@disk} with #{@fs}"
-            exec("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
+            puts "Format #{@disk}"
+            exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
             exec("mkfs.#{@fs} -F #{@dev_boot}") if @dev_boot
-            #exec("mkswap -f #{@lv_swap}")
+            exec("mkswap -f #{@lv_swap}")
             exec("mkfs.#{@fs} -F #{@lv_root}")
             exec("mkfs.#{@fs} -F #{@lv_home}") if @lv_home
             @state.format

data/lib/getch/filesystem/lvm/encrypt/mount.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Getch
   module FileSystem
     module Lvm
@@ -7,54 +5,17 @@ module Getch
         class Mount < Getch::FileSystem::Lvm::Encrypt::Device
           def initialize
             super
-            @root_dir = MOUNTPOINT
-            @boot_dir = "#{@root_dir}/boot"
-            @boot_efi_dir = "#{@root_dir}/boot/efi"
-            @home_dir = @user ? "#{@root_dir}/home/#{@user}" : nil
-            @state = Getch::States.new()
+            @mount = Getch::FileSystem::Mount.new
+            @state = Getch::States.new
           end
 
           def run
             return if STATES[:mount]
-            mount_swap
-            mount_root
-            mount_boot
-            mount_home
-            mount_boot_efi
-            @state.mount
-          end
-
-          private
-
-          def mount_swap
-            return if ! @lv_swap
-            system("swapon #{@lv_swap}")
-          end
-
-          def mount_root
-            return if ! @lv_root
-            Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
-            system("mount #{@lv_root} #{@root_dir}")
-          end
-
-          def mount_boot_efi
-            return if ! @dev_boot_efi
-            FileUtils.mkdir_p @boot_efi_dir, mode: 0700 if ! Dir.exist?(@boot_efi_dir)
-            system("mount #{@dev_boot_efi} #{@boot_efi_dir}")
-          end
-
-          def mount_boot
-            return if ! @dev_boot
-            FileUtils.mkdir_p @boot_dir, mode: 0700 if ! Dir.exist?(@boot_dir)
-            system("mount #{@dev_boot} #{@boot_dir}")
-          end
-
-          def mount_home
-            return if ! @lv_home
-            if @user != nil then
-              FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
-              system("mount #{@lv_home} #{@home_dir}")
-            end
+            @mount.swap(@lv_swap)
+            @mount.root(@lv_root)
+            @mount.boot(@dev_boot)
+            @mount.esp(@dev_esp)
+            @mount.home(@lv_home)
             @state.mount
           end
         end

data/lib/getch/filesystem/lvm/encrypt/partition.rb

@@ -6,14 +6,17 @@ module Getch
           def initialize
             super
             @state = Getch::States.new()
+            @clean = Getch::FileSystem::Clean
+            @partition = Getch::FileSystem::Partition.new
             @log = Log.new
             run_partition
           end
 
           def run_partition
             return if STATES[:partition ]
-            clear_struct
-            cleaning
+            @clean.old_vg(@dev_root, @vg)
+            @clean.struct(@disk, @cache_disk, @home_disk)
+            @clean.hdd(@disk, @cache_disk, @home_disk)
             partition
             encrypt
             lvm
@@ -22,35 +25,14 @@ module Getch
 
           private
 
-          def clear_struct
-            oldvg = `vgdisplay | grep #{@vg}`.chomp
-            exec("vgremove -f #{@vg}") if oldvg != '' # remove older volume group
-            exec("pvremove -f #{@dev_root}") if oldvg != '' and File.exist? @dev_root # remove older volume group
-
-            exec("sgdisk -Z /dev/#{@disk}")
-            exec("wipefs -a /dev/#{@disk}")
-          end
-
-          def cleaning
-            puts
-            print "Cleaning data on #{@disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? (n,y) "
-            case gets.chomp
-            when /^y|^Y/
-              bloc=`blockdev --getbsz /dev/#{@disk}`.chomp
-              exec("dd if=/dev/urandom of=/dev/#{@disk} bs=#{bloc} status=progress")
-            else
-              return
-            end
-          end
-
           def partition
             if Helpers::efi?
-              exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
-              exec("sgdisk -n2:0:+0 -t2:8e00 /dev/#{@disk}")
+              @partition.efi(@dev_esp)
+              @partition.root(@dev_root, "8e00")
             else
-              exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
-              exec("sgdisk -n2:0:+128MiB -t2:8300 /dev/#{@disk}")
-              exec("sgdisk -n3:0:+0 -t3:8e00 /dev/#{@disk}")
+              @partition.gpt(@dev_gpt)
+              @partition.boot(@dev_boot)
+              @partition.root(@dev_root, "8e00")
             end
           end
 
@@ -66,15 +48,21 @@ module Getch
             exec("pvcreate -f #{@luks_root}")
             exec("vgcreate -f #{@vg} #{@luks_root}")
             # Wipe old signature: https://github.com/chef-cookbooks/lvm/issues/45
-            exec("lvcreate -y -Wy -Zy -L 15G -n root #{@vg}")
             exec("lvcreate -y -Wy -Zy -L #{mem} -n swap #{@vg}")
-            exec("lvcreate -y -Wy -Zy -l 100%FREE -n home #{@vg}") if @user
+
+            if @user
+              exec("lvcreate -y -Wy -Zy -L 18G -n root #{@vg}")
+              exec("lvcreate -y -Wy -Zy -l 100%FREE -n home #{@vg}")
+            else
+              exec("lvcreate -y -Wy -Zy -l 100%FREE -n root #{@vg}")
+            end
+
             exec("vgchange --available y")
           end
 
           # Follow https://wiki.archlinux.org/index.php/Partitioning
           # Partition_efi
-          # /boot/efi - EFI system partition - 260MB
+          # /efi      - EFI system partition - 260MB
           # /         - Root
 
           # Partition_bios

data/lib/getch/filesystem/lvm/format.rb

@@ -4,21 +4,25 @@ module Getch
       class Format < Getch::FileSystem::Lvm::Device
         def initialize
           super
-          @fs = 'ext4'
           @state = Getch::States.new()
           format
         end
 
         def format
           return if STATES[:format]
-          puts "Format #{@disk} with #{@fs}"
-          system("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
-          system("mkfs.#{@fs} -F #{@dev_boot}") if @dev_boot
-          system("mkswap -f #{@lv_swap}")
-          system("mkfs.#{@fs} -F #{@lv_root}")
-          system("mkfs.#{@fs} -F #{@lv_home}") if @lv_home
+          exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
+          exec("mkfs.ext4 -F #{@dev_boot}") if @dev_boot
+          exec("mkswap -f #{@lv_swap}")
+          exec("mkfs.ext4 -F #{@lv_root}")
+          exec("mkfs.ext4 -F #{@lv_home}") if @lv_home
           @state.format
         end
+
+        private
+
+        def exec(cmd)
+          Getch::Command.new(cmd).run!
+        end
       end
     end
   end

data/lib/getch/filesystem/lvm/mount.rb

@@ -1,59 +1,20 @@
-require 'fileutils'
-
 module Getch
   module FileSystem
     module Lvm
       class Mount < Getch::FileSystem::Lvm::Device
         def initialize
           super
-          @root_dir = MOUNTPOINT
-          @boot_dir = "#{@root_dir}/boot"
-          @boot_efi_dir = "#{@root_dir}/boot/efi"
-          @home_dir = @user ? "#{@root_dir}/home/#{@user}" : nil
-          @state = Getch::States.new()
+          @mount = Getch::FileSystem::Mount.new
+          @state = Getch::States.new
         end
 
         def run
           return if STATES[:mount]
-          mount_swap
-          mount_root
-          mount_boot
-          mount_home
-          mount_boot_efi
-          @state.mount
-        end
-
-        private
-
-        def mount_swap
-          return if ! @lv_swap
-          system("swapon #{@lv_swap}")
-        end
-
-        def mount_root
-          return if ! @lv_root
-          Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
-          system("mount #{@lv_root} #{@root_dir}")
-        end
-
-        def mount_boot_efi
-          return if ! @dev_boot_efi
-          FileUtils.mkdir_p @boot_efi_dir, mode: 0700 if ! Dir.exist?(@boot_efi_dir)
-          system("mount #{@dev_boot_efi} #{@boot_efi_dir}")
-        end
-
-        def mount_boot
-          return if ! @dev_boot
-          FileUtils.mkdir_p @boot_dir, mode: 0700 if ! Dir.exist?(@boot_dir)
-          system("mount #{@dev_boot} #{@boot_dir}")
-        end
-
-        def mount_home
-          return if ! @lv_home
-          if @user != nil then
-            FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
-            system("mount #{@lv_home} #{@home_dir}")
-          end
+          @mount.swap(@lv_swap)
+          @mount.root(@lv_root)
+          @mount.boot(@dev_boot)
+          @mount.esp(@dev_esp)
+          @mount.home(@lv_home)
           @state.mount
         end
       end

data/lib/getch/filesystem/lvm/partition.rb

@@ -5,13 +5,16 @@ module Getch
         def initialize
           super
           @state = Getch::States.new()
+          @partition = Getch::FileSystem::Partition.new
+          @clean = Getch::FileSystem::Clean
           run_partition
         end
 
         def run_partition
           return if STATES[:partition ]
-          clear_struct
-          cleaning
+          @clean.old_vg(@dev_root, @vg)
+          @clean.struct(@disk, @cache_disk, @home_disk)
+          @clean.hdd(@disk, @cache_disk, @home_disk)
           partition
           lvm
           @state.partition
@@ -19,35 +22,14 @@ module Getch
 
         private
 
-        def clear_struct
-          oldvg = `vgdisplay | grep #{@vg}`.chomp
-          exec("vgremove -f #{@vg}") if oldvg != '' # remove older volume group
-          exec("pvremove -f #{@dev_root}") if oldvg != '' and File.exist? @dev_root # remove older volume group
-
-          exec("sgdisk -Z /dev/#{@disk}")
-          exec("wipefs -a /dev/#{@disk}")
-        end
-
-        def cleaning
-          puts
-          print "Cleaning data on #{@disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? (n,y) "
-          case gets.chomp
-          when /^y|^Y/
-            bloc=`blockdev --getbsz /dev/#{@disk}`.chomp
-            exec("dd if=/dev/urandom of=/dev/#{@disk} bs=#{bloc} status=progress")
-          else
-            return
-          end
-        end
-
         def partition
           if Helpers::efi?
-            exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
-            exec("sgdisk -n2:0:+0 -t2:8e00 /dev/#{@disk}")
+            @partition.efi(@dev_esp)
+            @partition.root(@dev_root, "8e00")
           else
-            exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
-            exec("sgdisk -n2:0:+128MiB -t2:8300 /dev/#{@disk}")
-            exec("sgdisk -n3:0:+0 -t3:8e00 /dev/#{@disk}")
+            @partition.gpt(@dev_gpt)
+            @partition.boot(@dev_boot)
+            @partition.root(@dev_root, "8e00")
           end
         end
 
@@ -56,15 +38,21 @@ module Getch
           exec("pvcreate -f #{@dev_root}")
           exec("vgcreate -f #{@vg} #{@dev_root}")
           # Wipe old signature: https://github.com/chef-cookbooks/lvm/issues/45
-          exec("lvcreate -y -Wy -Zy -L 15G -n root #{@vg}")
           exec("lvcreate -y -Wy -Zy -L #{mem} -n swap #{@vg}")
-          exec("lvcreate -y -Wy -Zy -l 100%FREE -n home #{@vg}") if @user
+
+          if @user
+            exec("lvcreate -y -Wy -Zy -L 18G -n root #{@vg}")
+            exec("lvcreate -y -Wy -Zy -l 100%FREE -n home #{@vg}")
+          else
+            exec("lvcreate -y -Wy -Zy -l 100%FREE -n root #{@vg}")
+          end
+
           exec("vgchange --available y")
         end
 
         # Follow https://wiki.archlinux.org/index.php/Partitioning
         # Partition_efi
-        # /boot/efi - EFI system partition - 260MB
+        # /efi      - EFI system partition - 260MB
         # /         - Root
 
         # Partition_bios

data/lib/getch/filesystem/mount.rb

@@ -0,0 +1,56 @@
+require 'fileutils'
+
+module Getch
+  module FileSystem
+    class Mount
+      def initialize
+        @root_dir = MOUNTPOINT
+        @boot_dir = "#{@root_dir}/boot"
+        @boot_efi_dir = "#{@root_dir}/efi"
+        @home_dir = "#{@root_dir}/home"
+        @state = Getch::States.new()
+        @log = Getch::Log.new
+      end
+
+      def swap(dev)
+        return if ! dev
+        if Helpers::grep?('/proc/swaps', /^\/dev/)
+          exec("swapoff #{dev}")
+        end
+
+        exec("swapon #{dev}")
+      end
+
+      def root(dev)
+        return if ! dev
+        Helpers::mkdir(@root_dir)
+        exec("mount #{dev} #{@root_dir}")
+      end
+
+      def esp(dev)
+        return if ! dev
+        Helpers::mkdir(@boot_efi_dir)
+        exec("mount #{dev} #{@boot_efi_dir}")
+      end
+
+      def boot(dev)
+        return if ! dev
+        Helpers::mkdir(@boot_dir)
+        exec("mount #{dev} #{@boot_dir}")
+      end
+
+      def home(dev)
+        return if ! dev
+        Helpers::mkdir(@home_dir)
+        exec("mount #{dev} #{@home_dir}")
+      end
+
+      private
+
+      def exec(cmd)
+        @log.info("==> #{cmd}")
+        Helpers::sys(cmd)
+      end
+    end
+  end
+end

data/lib/getch/filesystem/partition.rb

@@ -0,0 +1,77 @@
+module Getch
+  module FileSystem
+    class Partition
+      def initialize
+        @log = Getch::Log.new
+      end
+
+      def gpt(dev)
+        return if ! dev
+        disk = disk_name(dev)
+        part = dev.match(/[0-9]/)
+        exec("sgdisk -n#{part}:1MiB:+1MiB -t#{part}:EF02 #{disk}")
+      end
+
+      def boot(dev)
+        return if ! dev
+        disk = disk_name(dev)
+        part = dev.match(/[0-9]/)
+        if DEFAULT_OPTIONS[:fs] == "zfs"
+          exec("sgdisk -n#{part}:0:+2G -t#{part}:BE00 #{disk}")
+        else
+          exec("sgdisk -n#{part}:0:+128MiB -t#{part}:8300 #{disk}")
+        end
+      end
+
+      def efi(dev)
+        return if ! dev
+        disk = disk_name(dev)
+        part = dev.match(/[0-9]/)
+        exec("sgdisk -n#{part}:1M:+260M -t#{part}:EF00 #{disk}")
+      end
+
+      def swap(dev)
+        return if ! dev
+        disk = disk_name(dev)
+        part = dev.match(/[0-9]/)
+        if DEFAULT_OPTIONS[:cache_disk]
+          exec("sgdisk -n#{part}:0:0 -t#{part}:8200 #{disk}")
+        else
+          mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+          exec("sgdisk -n#{part}:0:+#{mem} -t#{part}:8200 #{disk}")
+        end
+      end
+
+      def root(dev, code)
+        return if ! dev
+        disk = disk_name(dev)
+        part = dev.match(/[0-9]/)
+        exec("sgdisk -n#{part}:0:0 -t#{part}:#{code} #{disk}")
+      end
+
+      def home(dev, code)
+        return if ! dev
+        disk = disk_name(dev)
+        part = dev.match(/[0-9]/)
+        if DEFAULT_OPTIONS[:home_disk]
+          exec("sgdisk -n#{part}:0:0 -t#{part}:#{code} #{disk}")
+        end
+      end
+
+      private
+
+      def disk_name(dev)
+        dev.match(/[^0-9]+/)
+      end
+
+      def exec(cmd)
+        @log.debug "Partition disk with #{cmd}"
+        if DEFAULT_OPTIONS[:encrypt]
+          Helpers::sys(cmd)
+        else
+          Getch::Command.new(cmd).run!
+        end
+      end
+    end
+  end
+end