getch 0.1.6 → 0.1.9

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm
@@ -11,6 +13,7 @@ module Getch
 
           def run
             return if STATES[:mount]
+
             @mount.root(@lv_root)
             @mount.boot(@dev_boot)
             @mount.esp(@dev_esp)

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

@@ -1,4 +1,4 @@
-require_relative '../../../helpers'
+# frozen_string_literal: true
 
 module Getch
   module FileSystem
@@ -31,20 +31,20 @@ module Getch
           private
 
           def partition
-            if Helpers::efi?
+            if Helpers.efi?
               @partition.efi(@dev_esp)
-              @partition.root(@dev_root, "8e00")
+              @partition.root(@dev_root, '8e00')
             else
               @partition.gpt(@dev_gpt)
               @partition.boot(@dev_boot)
-              @partition.root(@dev_root, "8e00")
+              @partition.root(@dev_root, '8e00')
             end
           end
 
           def encrypting
-            @log.info("Cryptsetup")
+            @log.info('Cryptsetup')
             encrypt(@dev_root)
-            open_crypt(@dev_root, "cryptroot")
+            open_crypt(@dev_root, 'cryptroot')
           end
 
           def lvm
@@ -61,7 +61,7 @@ module Getch
               exec("lvcreate -y -Wy -Zy -l 100%FREE -n root #{@vg}")
             end
 
-            exec("vgchange --available y")
+            exec('vgchange --available y')
           end
 
           # Follow https://wiki.archlinux.org/index.php/Partitioning

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

@@ -1,4 +1,4 @@
-require_relative '../../../helpers'
+# frozen_string_literal: true
 
 module Getch
   module FileSystem
@@ -6,12 +6,13 @@ module Getch
       module Encrypt
         class Void < Device
           include Helpers::Void
+
           attr_reader :boot_disk
 
           # Create key to avoid enter password twice
           def create_key
-            add_key("volume.key", @dev_root)
-            add_key("home.key", @dev_home) if @home_disk
+            add_key('volume.key', @dev_root)
+            add_key('home.key', @dev_home) if @home_disk
           end
 
           # Key need to be added in dracut.conf.d and crypttab
@@ -26,25 +27,25 @@ module Getch
           def fstab
             conf = "#{MOUNTPOINT}/etc/fstab"
             File.write(conf, "\n", mode: 'w', chmod: 0644)
-            line_fstab(@dev_esp, "/efi vfat noauto,rw,relatime 0 0") if @dev_esp
-            line_fstab(@dev_boot, "/boot ext4 noauto,rw,relatime 0 0") if @dev_boot
-            add_line(conf, "/dev/mapper/cryptswap none swap sw 0 0")
+            line_fstab(@dev_esp, '/efi vfat noauto,rw,relatime 0 0') if @dev_esp
+            line_fstab(@dev_boot, '/boot ext4 noauto,rw,relatime 0 0') if @dev_boot
+            add_line(conf, '/dev/mapper/cryptswap none swap sw 0 0')
             add_line(conf, "#{@lv_home} /home ext4 rw,discard 0 0") if @home_disk
             add_line(conf, "#{@lv_root} / ext4 rw,relatime 0 1")
-            add_line(conf, "tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0")
+            add_line(conf, 'tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0')
           end
 
           def crypttab
             conf = "#{MOUNTPOINT}/etc/crypttab"
             File.write(conf, "\n", mode: 'w', chmod: 0644)
             add_line(conf, "cryptswap #{@lv_swap} /dev/urandom swap,discard,cipher=aes-xts-plain64:sha256,size=512")
-            line_crypttab(@vg, @dev_root, "/boot/volume.key", "luks")
+            line_crypttab(@vg, @dev_root, '/boot/volume.key', 'luks')
             line_crypttab("crypthome", @dev_home, "/boot/home.key", "luks") if @home_disk
           end
 
           def config_grub
             conf = "#{MOUNTPOINT}/etc/default/grub"
-            content = "GRUB_ENABLE_CRYPTODISK=y"
+            content = 'GRUB_ENABLE_CRYPTODISK=y'
             unless search(conf, content)
               File.write(conf, "#{content}\n", mode: 'a')
             end
@@ -53,10 +54,10 @@ module Getch
           def config_dracut
             conf = "#{MOUNTPOINT}/etc/dracut.conf.d/lvm.conf"
             content = [
-              "hostonly=\"yes\"",
-              "omit_dracutmodules+=\" btrfs \"",
-              "install_items+=\" /boot/volume.key /etc/crypttab \"",
-              ""
+              'hostonly="yes"',
+              'omit_dracutmodules+=" btrfs "',
+              'install_items+=" /boot/volume.key /etc/crypttab "',
+              ''
             ]
             File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
             #add_line(conf, "install_items+=\" /boot/home.key \"") if @home_disk
@@ -71,17 +72,17 @@ module Getch
           end
 
           def finish
-            puts "+ Enter in your system: chroot /mnt /bin/bash"
-            puts "+ Reboot with: shutdown -r now"
+            puts '+ Enter in your system: chroot /mnt /bin/bash'
+            puts '+ Reboot with: shutdown -r now'
           end
 
           private
 
           def b_uuid(dev)
-            device = dev.delete_prefix("/dev/")
-            Dir.glob("/dev/disk/by-uuid/*").each { |f|
+            device = dev.delete_prefix('/dev/')
+            Dir.glob('/dev/disk/by-uuid/*').each { |f|
               link = File.readlink(f)
-              return f.delete_prefix("/dev/disk/by-uuid/") if link.match(/#{device}$/)
+              return f.delete_prefix('/dev/disk/by-uuid/') if link.match(/#{device}$/)
             }
           end
 
@@ -89,7 +90,7 @@ module Getch
           def line_crypttab(mapname, dev, point, rest)
             conf = "#{MOUNTPOINT}/etc/crypttab"
             device = s_uuid(dev)
-            raise "No partuuid for #{dev} #{device}" if !device
+            raise "No partuuid for #{dev} #{device}" unless device
             raise "Bad partuuid for #{dev} #{device}" if device.kind_of? Array
             add_line(conf, "#{mapname} PARTUUID=#{device} #{point} #{rest}")
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm
@@ -10,6 +12,7 @@ module Getch
 
         def format
           return if STATES[:format]
+
           exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
           exec("mkfs.ext4 -F #{@dev_boot}") if @dev_boot
           exec("mkswap -f #{@lv_swap}")

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm
@@ -10,6 +12,7 @@ module Getch
 
         def run
           return if STATES[:mount]
+
           @mount.swap(@lv_swap)
           @mount.root(@lv_root)
           @mount.boot(@dev_boot)

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm
       class Partition < Getch::FileSystem::Lvm::Device
         def initialize
           super
-          @state = Getch::States.new()
+          @state = Getch::States.new
           @partition = Getch::FileSystem::Partition.new
           @clean = Getch::FileSystem::Clean
           run_partition
@@ -12,6 +14,7 @@ module Getch
 
         def run_partition
           return if STATES[:partition ]
+
           @clean.old_vg(@dev_root, @vg)
           @clean.hdd(@disk)
           @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
@@ -23,13 +26,13 @@ module Getch
         private
 
         def partition
-          if Helpers::efi?
+          if Helpers.efi?
             @partition.efi(@dev_esp)
-            @partition.root(@dev_root, "8e00")
+            @partition.root(@dev_root, '8e00')
           else
             @partition.gpt(@dev_gpt)
             @partition.boot(@dev_boot)
-            @partition.root(@dev_root, "8e00")
+            @partition.root(@dev_root, '8e00')
           end
         end
 
@@ -47,7 +50,7 @@ module Getch
             exec("lvcreate -y -Wy -Zy -l 100%FREE -n root #{@vg}")
           end
 
-          exec("vgchange --available y")
+          exec('vgchange --available y')
         end
 
         # Follow https://wiki.archlinux.org/index.php/Partitioning

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

@@ -1,21 +1,22 @@
-require_relative '../../helpers'
+# frozen_string_literal: true
 
 module Getch
   module FileSystem
     module Lvm
       class Void < Device
         include Helpers::Void
+
         attr_reader :boot_disk
 
         def fstab
           conf = "#{MOUNTPOINT}/etc/fstab"
           File.write(conf, "\n", mode: 'w', chmod: 0644)
-          line_fstab(@dev_esp, "/efi vfat noauto,rw,relatime 0 0") if @dev_esp
-          line_fstab(@dev_boot, "/boot ext4 noauto,rw,relatime 0 0") if @dev_boot
+          line_fstab(@dev_esp, '/efi vfat noauto,rw,relatime 0 0') if @dev_esp
+          line_fstab(@dev_boot, '/boot ext4 noauto,rw,relatime 0 0') if @dev_boot
           add_line(conf, "#{@lv_swap} swap swap rw,noatime,discard 0 0") if @lv_swap
           add_line(conf, "#{@lv_home} /home/#{@user} ext4 rw,noatime,discard 0 2") if @lv_home
           add_line(conf, "#{@lv_root} / ext4 rw,relatime 0 1")
-          add_line(conf, "tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0")
+          add_line(conf, 'tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0')
         end
 
         def config_dracut
@@ -36,8 +37,8 @@ module Getch
         end
 
         def finish
-          puts "+ Enter in your system: chroot /mnt /bin/bash"
-          puts "+ Reboot with: shutdown -r now"
+          puts '+ Enter in your system: chroot /mnt /bin/bash'
+          puts '+ Reboot with: shutdown -r now'
         end
       end
     end

data/lib/getch/filesystem/lvm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm

data/lib/getch/filesystem/mount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Getch
@@ -8,13 +10,14 @@ module Getch
         @boot_dir = "#{@root_dir}/boot"
         @boot_efi_dir = "#{@root_dir}/efi"
         @home_dir = "#{@root_dir}/home"
-        @state = Getch::States.new()
+        @state = Getch::States.new
         @log = Getch::Log.new
       end
 
       def swap(dev)
-        return if ! dev
-        if Helpers::grep?('/proc/swaps', /^\/dev/)
+        return unless dev
+
+        if Helpers.grep?('/proc/swaps', /^\/dev/)
           exec("swapoff #{dev}")
         end
 
@@ -22,26 +25,30 @@ module Getch
       end
 
       def root(dev)
-        return if ! dev
-        Helpers::mkdir(@root_dir)
+        return unless dev
+
+        Helpers.mkdir(@root_dir)
         exec("mount #{dev} #{@root_dir}")
       end
 
       def esp(dev)
-        return if ! dev
-        Helpers::mkdir(@boot_efi_dir)
+        return unless dev
+
+        Helpers.mkdir(@boot_efi_dir)
         exec("mount #{dev} #{@boot_efi_dir}")
       end
 
       def boot(dev)
-        return if ! dev
-        Helpers::mkdir(@boot_dir)
+        return unless dev
+
+        Helpers.mkdir(@boot_dir)
         exec("mount #{dev} #{@boot_dir}")
       end
 
       def home(dev)
-        return if ! dev
-        Helpers::mkdir(@home_dir)
+        return unless dev
+
+        Helpers.mkdir(@home_dir)
         exec("mount #{dev} #{@home_dir}")
       end
 
@@ -49,7 +56,7 @@ module Getch
 
       def exec(cmd)
         @log.info("==> #{cmd}")
-        Helpers::sys(cmd)
+        Helpers.sys(cmd)
       end
     end
   end

data/lib/getch/filesystem/partition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     class Partition
@@ -6,17 +8,19 @@ module Getch
       end
 
       def gpt(dev)
-        return if ! dev
+        return unless 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
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
-        if Getch::OPTIONS[:fs] == "zfs"
+        if Getch::OPTIONS[:fs] == 'zfs'
           exec("sgdisk -n#{part}:0:+2G -t#{part}:BE00 #{disk}")
         else
           exec("sgdisk -n#{part}:0:+128MiB -t#{part}:8300 #{disk}")
@@ -24,14 +28,16 @@ module Getch
       end
 
       def efi(dev)
-        return if ! dev
+        return unless 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
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
         if Getch::OPTIONS[:cache_disk]
@@ -43,14 +49,16 @@ module Getch
       end
 
       def root(dev, code)
-        return if ! dev
+        return unless 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
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
         if Getch::OPTIONS[:home_disk]
@@ -67,7 +75,7 @@ module Getch
       def exec(cmd)
         @log.debug "Partition disk with #{cmd}"
         if Getch::OPTIONS[:encrypt]
-          Helpers::sys(cmd)
+          Helpers.sys(cmd)
         else
           Getch::Command.new(cmd).run!
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -5,37 +7,21 @@ module Getch
         def initialize
           super
           gen_uuid
-          @root_dir = MOUNTPOINT
           @init = '/usr/lib/systemd/systemd'
         end
 
         def fstab
-          file = "#{@root_dir}/etc/fstab"
+          file = "#{MOUNTPOINT}/etc/fstab"
           datas = data_fstab
-          File.write(file, datas.join("\n"))
-        end
-
-        def systemd_boot
-          return if ! Helpers::efi? 
-          esp = '/efi'
-          dir = "#{@root_dir}/#{esp}/loader/entries/"
-          datas_gentoo = [
-            'title Gentoo Linux',
-            'linux /vmlinuz',
-            'initrd /initramfs',
-            "options resume=UUID=#{@uuid_swap} root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs"
-          ]
-          File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
+          File.write file, datas.join("\n")
         end
 
         # See https://wiki.gentoo.org/wiki/ZFS#ZFS_root
-        def grub
-          return if Helpers::efi?
-          file = "#{@root_dir}/etc/default/grub"
-          cmdline = [ 
-            "GRUB_CMDLINE_LINUX=\"resume=UUID=#{@uuid_swap} root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs\""
-          ]
-          File.write("#{file}", cmdline.join("\n"), mode: 'a')
+        # https://github.com/openzfs/zfs/blob/master/contrib/dracut/README.dracut.markdown
+        def cmdline
+          src = "#{MOUNTPOINT}/etc/dracut.conf.d/cmdline.conf"
+          line = "kernel_cmdline=\"resume=UUID=#{@uuid_swap} root=zfs:#{@pool_name}/ROOT/#{@n} init=#{@init} zfs.force=1 zfs.zfs_arc_max=536870912\""
+          Helpers.echo src, line
         end
 
         private

data/lib/getch/filesystem/zfs/deps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -6,10 +8,8 @@ module Getch
           unstable_zfs
           install_deps
           zfs_mountpoint
-          auto_module_rebuild
           hostid
-          options_make
-          Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+          config_dracut
           zed_update_path
         end
 
@@ -18,79 +18,44 @@ module Getch
         def unstable_zfs
           conf = "#{MOUNTPOINT}/etc/portage/package.accept_keywords/zfs"
           data = [
-            "sys-fs/zfs-kmod",
-            "sys-fs/zfs"
+            'sys-fs/zfs-kmod',
+            'sys-fs/zfs'
           ]
-          File.write(conf, data.join("\n"), mode: "w")
+          File.write(conf, data.join("\n"), mode: 'w')
         end
 
         def install_deps
-          Getch::Bask.new('-a zfs').run!
-          Getch::Make.new("make modules_prepare").run!
-          Getch::Make.new("make -j$(nproc)").run!
-          Getch::Emerge.new('genkernel sys-fs/zfs').pkg!
+          Getch::Emerge.new('sys-kernel/gentoo-kernel').pkg!
+          Getch::Emerge.new('sys-fs/zfs').pkg!
         end
 
         # See: https://wiki.archlinux.org/index.php/ZFS#Using_zfs-mount-generator
         def zfs_mountpoint
-          Helpers::mkdir("#{MOUNTPOINT}/etc/zfs/zfs-list.cache")
-          Helpers::touch("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/#{@boot_pool_name}") if @dev_boot
-          Helpers::touch("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/#{@pool_name}")
-          exec("ln -fs /usr/libexec/zfs/zed.d/history_event-zfs-list-cacher.sh /etc/zfs/zed.d/")
-          exec("systemctl start zfs-zed.service")
-          exec("systemctl enable zfs-zed.service")
-          exec("systemctl enable zfs.target")
+          Helpers.mkdir("#{MOUNTPOINT}/etc/zfs/zfs-list.cache")
+          Helpers.touch("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/#{@boot_pool_name}") if @dev_boot
+          Helpers.touch("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/#{@pool_name}")
+          exec('ln -fs /usr/libexec/zfs/zed.d/history_event-zfs-list-cacher.sh /etc/zfs/zed.d/')
+          exec('systemctl start zfs-zed.service')
+          exec('systemctl enable zfs-zed.service')
+          exec('systemctl enable zfs.target')
         end
 
         def zed_update_path
           Dir.glob("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/*").each { |f|
-            if !system("sed", "-Ei", "s|#{MOUNTPOINT}/?|/|", f)
-              raise "system exec sed"
+            unless system('sed', '-Ei', "s|#{MOUNTPOINT}/?|/|", f)
+              raise 'system exec sed'
             end
           }
         end
 
-        def auto_module_rebuild
-          g_dir="#{MOUNTPOINT}/etc/portage/env/sys-kernel"
-          Helpers::mkdir(g_dir)
-          # See https://wiki.gentoo.org/wiki/Kernel/Upgrade#Automated_build_and_installation
-          content=<<EOF
-post_pkg_postinst() {
-  # BUG: reinstalls of a source will cause errors
-  CURRENT_KV=$(uname -r)
-  # Check to see if genkernel has been run previously for the running kernel and use that config
-  if [[ -f "${EROOT}/etc/kernels/kernel-config-${CURRENT_KV}" ]] ; then
-    genkernel --kernel-config="${EROOT}/etc/kernels/kernel-config-${CURRENT_KV}" all
-  elif [[ -f "${EROOT}/usr/src/linux-${CURRENT_KV}/.config" ]] ; then # Use latest kernel config from current kernel
-    genkernel --kernel-config="${EROOT}/usr/src/linux-${CURRENT_KV}/.config" all
-  else # No valid configs known
-    genkernel all
-  fi
-}
-EOF
-          File.write("#{g_dir}/gentoo-sources", content)
-        end
-
         def hostid
-          exec "zgenhostid $(hostid)"
+          exec 'zgenhostid $(hostid)'
         end
 
-        def options_make
-          bootloader = Helpers::efi? ? 'BOOTLOADER="no"' : 'BOOTLOADER="grub2"'
-          datas = [
-            '',
-            bootloader,
-            'INSTALL="yes"',
-            'MENUCONFIG="no"',
-            'CLEAN="yes"',
-            'SAVE_CONFIG="yes"',
-            'MOUNTBOOT="no"',
-            'MRPROPER="no"',
-            'ZFS="yes"',
-            'MODULEREBUILD="yes"'
-          ]
-          file = "#{MOUNTPOINT}/etc/genkernel.conf"
-          File.write(file, datas.join("\n"), mode: 'a')
+        def config_dracut
+          conf = "#{MOUNTPOINT}/etc/dracut.conf.d/zfs.conf"
+          content = 'hostonly="yes"'
+          Helpers.echo conf, content
         end
 
         def exec(cmd)

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
       class Device < Getch::FileSystem::Device
         def initialize
           super
-          @id = Helpers::pool_id(@dev_root)
+          @id = Helpers.pool_id(@dev_root)
           @boot_pool_name = "bpool-#{@id}"
           @pool_name = "rpool-#{@id}"
           @zfs_home = @user ? true : false