getch 0.0.9 → 0.1.5

data/lib/getch/filesystem/device.rb

@@ -0,0 +1,61 @@
+module Getch
+  module FileSystem
+    class Device
+      def initialize
+        @efi = Helpers::efi?
+        @root_part = 1
+        @user = DEFAULT_OPTIONS[:username]
+
+        @disk = DEFAULT_OPTIONS[:disk]
+        @boot_disk = DEFAULT_OPTIONS[:boot_disk]
+        @cache_disk = DEFAULT_OPTIONS[:cache_disk]
+        @home_disk = DEFAULT_OPTIONS[:home_disk]
+
+        search_boot
+        search_swap
+        search_root
+        search_home
+      end
+
+      private
+      def search_boot
+        if @efi
+          if @boot_disk
+            @dev_esp = "/dev/#{@boot_disk}#{@root_part}"
+          else
+            @dev_esp = "/dev/#{@disk}#{@root_part}"
+            @root_part += 1
+          end
+        else
+          if @boot_disk
+            @dev_gpt = "/dev/#{@boot_disk}#{@root_part}"
+            @dev_grub = "/dev/#{@boot_disk}"
+          else
+            @dev_gpt = "/dev/#{@disk}#{@root_part}"
+            @dev_grub = "/dev/#{@disk}"
+            @root_part += 1
+          end
+        end
+      end
+
+      def search_swap
+        if @cache_disk
+          @dev_swap = "/dev/#{@cache_disk}1"
+        else
+          @dev_swap = "/dev/#{@disk}#{@root_part}"
+          @root_part += 1
+        end
+      end
+
+      def search_root
+        @dev_root = "/dev/#{@disk}#{@root_part}"
+      end
+
+      def search_home
+        if @home_disk
+          @dev_home = "/dev/#{@home_disk}1"
+        end
+      end
+    end
+  end
+end

data/lib/getch/filesystem/ext4/config.rb

@@ -17,7 +17,7 @@ module Getch
 
         def systemd_boot
           return if ! Helpers::efi? 
-          esp = '/boot/efi'
+          esp = '/efi'
           dir = "#{@root_dir}/#{esp}/loader/entries/"
           datas_gentoo = [
             'title Gentoo Linux',
@@ -30,28 +30,27 @@ module Getch
         def grub
           return if Helpers::efi?
           file = "#{@root_dir}/etc/default/grub"
-          cmdline = "GRUB_CMDLINE_LINUX=\"resume=#{@dev_swap} root=#{@dev_root} init=#{@init} rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force\"\n"
+          cmdline = "GRUB_CMDLINE_LINUX=\"resume=PARTUUID=#{@partuuid_swap} root=PARTUUID=#{@partuuid_root} init=#{@init} rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force\"\n"
           File.write(file, cmdline, mode: 'a')
         end
 
         private
 
         def gen_uuid
-          @partuuid_root = `lsblk -o "PARTUUID" #{@dev_root} | tail -1`.chomp() if @dev_root
-          @uuid_swap = `lsblk -o "UUID" #{@dev_swap} | tail -1`.chomp() if @dev_swap
+          @partuuid_root = Helpers::partuuid(@dev_root)
+          @partuuid_swap = Helpers::partuuid(@dev_swap)
           @uuid_root = `lsblk -o "UUID" #{@dev_root} | tail -1`.chomp() if @dev_root
-          @uuid_boot = `lsblk -o "UUID" #{@dev_boot} | tail -1`.chomp() if @dev_boot
-          @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
+          @uuid_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
           @uuid_home = `lsblk -o "UUID" #{@dev_home} | tail -1`.chomp() if @dev_home
         end
 
         def data_fstab
-          boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
-          swap = @dev_swap ? "UUID=#{@uuid_swap} none swap discard 0 0" : ''
+          esp = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
+          swap = @dev_swap ? "PARTUUID=#{@partuuid_swap} none swap discard 0 0" : ''
           root = @dev_root ? "UUID=#{@uuid_root} / ext4 defaults 0 1" : ''
           home = @dev_home ? "UUID=#{@uuid_home} /home/#{@user} ext4 defaults 0 2" : ''
 
-          [ boot_efi, swap, root, home ]
+          [ esp, swap, root, home ]
         end
       end
     end

data/lib/getch/filesystem/ext4/device.rb

@@ -1,14 +1,9 @@
 module Getch
   module FileSystem
     module Ext4
-      class Device
+      class Device < Getch::FileSystem::Device
         def initialize
-          @disk = DEFAULT_OPTIONS[:disk]
-          @user = DEFAULT_OPTIONS[:username]
-          @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
-          @dev_root = "/dev/#{@disk}2"
-          @dev_swap = "/dev/#{@disk}3"
-          @dev_home = @user ? "/dev/#{@disk}4" : nil
+          super
         end
       end
     end

data/lib/getch/filesystem/ext4/encrypt/config.rb

@@ -22,21 +22,21 @@ module Getch
 
           def systemd_boot
             return if ! Helpers::efi?
-            esp = '/boot/efi'
+            esp = '/efi'
             dir = "#{@root_dir}/#{esp}/loader/entries/"
             datas_gentoo = [
               'title Gentoo Linux',
               'linux /vmlinuz',
               'initrd /initramfs',
-              "options crypt_root=UUID=#{@uuid_root} root=/dev/mapper/root init=#{@init} keymap=#{DEFAULT_OPTIONS[:keymap]} rw"
+              "options crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root init=#{@init} keymap=#{DEFAULT_OPTIONS[:keymap]} rw"
             ]
             File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
           end
 
           def crypttab
-            home = @dev_home ? "crypthome UUID=#{@uuid_home} /root/secretkeys/crypto_keyfile.bin luks" : ''
+            home = @home_disk ? "crypthome UUID=#{@uuid_home} /root/secretkeys/crypto_keyfile.bin luks" : ''
             datas = [
-              "cryptswap UUID=#{@uuid_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=256",
+              "cryptswap PARTUUID=#{@partuuid_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=512",
               home
             ]
             File.write("#{@root_dir}/etc/crypttab", datas.join("\n"))
@@ -46,7 +46,7 @@ module Getch
             return if Helpers::efi?
             file = "#{@root_dir}/etc/default/grub"
             cmdline = [
-              "GRUB_CMDLINE_LINUX=\"crypt_root=UUID=#{@uuid_dev_root} init=#{@init} rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force keymap=#{DEFAULT_OPTIONS[:keymap]}\"",
+              "GRUB_CMDLINE_LINUX=\"crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root init=#{@init} rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force keymap=#{DEFAULT_OPTIONS[:keymap]}\"",
               "GRUB_ENABLE_CRYPTODISK=y"
             ]
             File.write(file, cmdline.join("\n"), mode: 'a')
@@ -55,16 +55,15 @@ module Getch
           private
 
           def gen_uuid
-            @partuuid_root = `lsblk -o "PARTUUID" #{@dev_root} | tail -1`.chomp() if @dev_root
-            @uuid_swap = `lsblk -o "UUID" #{@dev_swap} | tail -1`.chomp() if @dev_swap
+            @partuuid_swap = Helpers::partuuid(@dev_swap)
             @uuid_dev_root = `lsblk -d -o "UUID" #{@dev_root} | tail -1`.chomp() if @dev_root
-            @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
+            @uuid_esp = Helpers::uuid(@dev_esp) if @dev_esp
             @uuid_root = `lsblk -d -o "UUID" #{@luks_root} | tail -1`.chomp() if @dev_root
             @uuid_home = `lsblk -d -o "UUID" #{@dev_home} | tail -1`.chomp() if @luks_home
           end
 
           def data_fstab
-            boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+            boot_efi = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
             swap = @dev_swap ? "#{@luks_swap} none swap discard 0 0 " : ''
             root = @dev_root ? "UUID=#{@uuid_root} / ext4 defaults 0 1" : ''
             home = @dev_home ? "#{@luks_home} /home/#{@user} ext4 defaults 0 2" : ''

data/lib/getch/filesystem/ext4/encrypt/deps.rb

@@ -3,23 +3,13 @@ module Getch
     module Ext4
       module Encrypt
         class Deps
-          def initialize
-            if Helpers::efi?
-              install_efi
-            else
-              install_bios
-            end
-            install_deps
-          end
-
           def make
+            install_deps
             genkernel
             Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
           end
 
           private
-          def install_efi
-          end
 
           def genkernel
             grub = Helpers::efi? ? 'BOOTLOADER="no"' : 'BOOTLOADER="grub2"'
@@ -39,18 +29,12 @@ module Getch
             File.write(file, datas.join("\n"), mode: 'a')
           end
 
-          def install_bios
-            exec("euse -p sys-boot/grub -E device-mapper")
-            exec("euse -p sys-fs/cryptsetup -E luks1_default")
-          end
-
           def install_deps
-            exec("euse -E cryptsetup") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /cryptsetup/)
-            Getch::Emerge.new('genkernel sys-apps/systemd sys-fs/cryptsetup').pkg!
+            Getch::Emerge.new('genkernel').pkg!
           end
 
           def exec(cmd)
-            Helpers::run_chroot(cmd, MOUNTPOINT)
+            Getch::Chroot.new(cmd).run!
           end
         end
       end

data/lib/getch/filesystem/ext4/encrypt/device.rb

@@ -2,16 +2,11 @@ module Getch
   module FileSystem
     module Ext4
       module Encrypt
-        class Device
+        class Device < Getch::FileSystem::Device
           def initialize
-            @disk = DEFAULT_OPTIONS[:disk]
-            @user = DEFAULT_OPTIONS[:username]
-            @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
-            @dev_root = "/dev/#{@disk}2"
-            @dev_swap = "/dev/#{@disk}3"
-            @dev_home = @user ? "/dev/#{@disk}4" : nil
+            super
             @luks_root = "/dev/mapper/cryptroot"
-            @luks_home = @user ? "/dev/mapper/crypthome" : nil
+            @luks_home = @home_disk ? "/dev/mapper/crypthome" : nil
             @luks_swap = "/dev/mapper/cryptswap"
           end
         end

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

@@ -5,18 +5,16 @@ module Getch
         class Format < Getch::FileSystem::Ext4::Encrypt::Device
           def initialize
             super
-            @fs = 'ext4'
             @state = Getch::States.new()
             format
           end
 
           def format
             return if STATES[:format]
-            puts "Format #{@disk} with #{@fs}"
-            exec("mkfs.fat -F32 #{@dev_boot_efi}") if Helpers::efi?
-            exec("mkfs.#{@fs} -F #{@luks_root}")
+            exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
+            exec("mkfs.ext4 -F #{@luks_root}")
             exec("mkswap -f #{@dev_swap}")
-            exec("mkfs.#{@fs} -F #{@luks_home}") if @dev_home
+            exec("mkfs.ext4 -F #{@luks_home}") if @dev_home
             @state.format
           end
 

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

@@ -7,54 +7,17 @@ module Getch
         class Mount < Getch::FileSystem::Ext4::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
+            @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 ! @dev_swap
-            system("swapon #{@dev_swap}")
-          end
-
-          def mount_root
-            return if ! @dev_root
-            Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
-            system("mount #{@luks_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 ! @dev_home
-            if @user != nil then
-              FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
-              system("mount #{@luks_home} #{@home_dir}")
-            end
+            @mount.swap(@dev_swap)
+            @mount.root(@luks_root)
+            @mount.boot(@dev_boot)
+            @mount.esp(@dev_esp)
+            @mount.home(@luks_home)
             @state.mount
           end
         end

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

@@ -5,15 +5,17 @@ module Getch
         class Partition < Getch::FileSystem::Ext4::Encrypt::Device
           def initialize
             super
-            @state = Getch::States.new()
+            @state = Getch::States.new
+            @partition = Getch::FileSystem::Partition.new
+            @clean = Getch::FileSystem::Clean
             @log = Log.new
             run_partition
           end
 
           def run_partition
             return if STATES[:partition ]
-            clear_struct
-            cleaning
+            @clean.hdd(@disk)
+            @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
             if Helpers::efi?
               partition_efi
               encrypt_efi
@@ -26,35 +28,16 @@ module Getch
 
           private
 
-          def clear_struct
-            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
-
           # Follow https://wiki.archlinux.org/index.php/Partitioning
           def partition_efi
-            # /boot/efi - EFI system partition - 260MB
-            # /         - Root
-            # swap      - Linux Swap - size of the ram
-            # /home     - Home
-            mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
-
-            exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
-            exec("sgdisk -n2:0:+15G -t2:8309 /dev/#{@disk}")
-            exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
-            exec("sgdisk -n4:0:0 -t4:8309 /dev/#{@disk}") if @dev_home
+            # /efi  - EFI system partition - 260MB
+            # swap  - Linux Swap - size of the ram
+            # /     - Root
+            # /home - Home
+            @partition.efi(@dev_esp)
+            @partition.swap(@dev_swap)
+            @partition.root(@dev_root, "8309")
+            @partition.home(@dev_home, "8309") if @dev_home
           end
 
           def encrypt_efi
@@ -90,20 +73,18 @@ module Getch
             key_name = "crypto_keyfile.bin"
             @key_path = "#{keys_dir}/#{key_name}"
             FileUtils.mkdir keys_dir, mode: 0700 if ! Dir.exist?(keys_dir)
-            Getch::Command.new("dd bs=512 count=4 if=/dev/urandom of=#{@key_path}").run!
+            exec("dd bs=512 count=4 if=/dev/urandom of=#{@key_path}")
           end
 
           def partition_bios
             # None      - Bios Boot Partition - 1MiB
-            # /         - Root
             # swap      - Linux Swap - size of the ram
+            # /         - Root
             # /home     - Home
-            mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
-
-            exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
-            exec("sgdisk -n2:0:+15G -t2:8309 /dev/#{@disk}")
-            exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
-            exec("sgdisk -n4:0:0 -t4:8309 /dev/#{@disk}") if @dev_home
+            @partition.gpt(@dev_gpt)
+            @partition.swap(@dev_swap)
+            @partition.root(@dev_root, "8309")
+            @partition.home(@dev_home, "8309") if @dev_home
           end
 
           def exec(cmd)

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

@@ -4,18 +4,16 @@ module Getch
       class Format < Getch::FileSystem::Ext4::Device
         def initialize
           super
-          @fs = 'ext4'
           @state = Getch::States.new()
           format
         end
 
         def format
           return if STATES[:format]
-          puts "Format #{@disk} with #{@fs}"
-          exec("mkfs.fat -F32 #{@dev_boot_efi}") if Helpers::efi?
+          exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
           exec("mkswap -f #{@dev_swap}")
-          exec("mkfs.#{@fs} -F #{@dev_root}")
-          exec("mkfs.#{@fs} -F #{@dev_home}") if @dev_home
+          exec("mkfs.ext4 -F #{@dev_root}")
+          exec("mkfs.ext4 -F #{@dev_home}") if @dev_home
           @state.format
         end
 

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

@@ -1,59 +1,20 @@
-require 'fileutils'
-
 module Getch
   module FileSystem
     module Ext4
       class Mount < Getch::FileSystem::Ext4::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 ! @dev_swap
-          system("swapon #{@dev_swap}")
-        end
-
-        def mount_root
-          return if ! @dev_root
-          Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
-          system("mount #{@dev_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 ! @dev_home
-          if @user != nil then
-            FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
-            system("mount #{@dev_home} #{@home_dir}")
-          end
+          @mount.swap(@dev_swap)
+          @mount.root(@dev_root)
+          @mount.boot(@dev_boot)
+          @mount.esp(@dev_esp)
+          @mount.home(@dev_home)
           @state.mount
         end
       end