getch 0.5.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505fe1616a7fbe15dbb126b4a058abebf52f59ca1c047e698e85dc07dc99fd0d
-  data.tar.gz: 2cd67e6ba44be6558f732aaee0ee4324c76f571c3c53cee6cbaf3648bffef99b
+  metadata.gz: e8949c8a35b78615d49e8a79daadbd70052adc9e84291bdc2832ecf58bbb185d
+  data.tar.gz: e44e2466636fa47f72be581818f4648e19a7291ccdf435358b97241b1b12c77b
 SHA512:
-  metadata.gz: 4fa666326ce8182467755bf8cb6806c03f5fa8a0e99d666d652a5a22d4d0628456364b0fd72382546ecc575e6f3c5d561b9b19d903b00be502b1af561e57f7a8
-  data.tar.gz: ddf580e37958246f12e00b3331084bdc6f07a3d5dc251ec1051442b632fdf6487d982e82d8bca88180776b280d67c1f22da85093b2b46f8b1f93366c19bc9f37
+  metadata.gz: c4fd298a8d04ddabaf2e1bc53f27af50131479190a7df542840f2557ea227677b42bf7b2bfee25185d305e54b71a934c5723f36e4b0631b50eecba186b1b5e90
+  data.tar.gz: 31b0a7f44918791c981b8f4af725d3be13565098dec21fd4948619e3edfa4c66f61fd93e4d646921d5df7be315e77c5ac0d4aeb3fb5ea1b26a9deab900520f32

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.7.3, release 2024-10
+Add a Workflow to build gem on Github
+
+### Fix
+- Voidlinux, remove 'base-container-full' instead of 'base-voidstrap'.
+- Gentoo, use and configure 'sys-kernel/installkernel', sys-kernel/installkernel-systemd was removed from portage.
+
+## 0.7.0, release 2023-12
+* Add support for ssd disk `/dev/nvme*` #5
+* System with systemd may need `systemd-machine-id-setup && systemctl restart systemd-networkd` after the first boot to make the dhcp works.
+* Install of systemd/encrypt for Gentoo use GRUB instead of bootctl.
+* Luks key if `--encrypt` are created earlier.
+* Remove `noauto` and update arguments of fstab, this make futur system updates more easy.
+* Correct lvm `OPTIONS[:lvm]`instead of the old `OPTIONS[:fs] == 'lvm'`.
+
 ## 0.5.0, release 2023-12
 * Update Voidlinux url https://repo-default.voidlinux.org.
 * Add global use="modules-sign" for Gentoo.

data/README.md

@@ -49,7 +49,8 @@ You can also use your current `linux` host, just pay attention to the disk that
 ## Dependencies
 Getch is build without external libs, so it only require `ruby >= 2.5`.
 
-On a live image of Void, you need to install `xbps-install -S ruby xz gptfdisk`.
+On a live image of Void, you need to install `xbps-install -S ruby xz gptfdisk
+openssl`.
 
 ## Install
 Getch is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.  

data/getch.gemspec

@@ -1,4 +1,6 @@
-require File.dirname(__FILE__) + '/lib/getch/version'
+# frozen_string_literal: true
+
+require_relative 'lib/getch/version'
 
 Gem::Specification.new do |s|
   s.name = 'getch'
@@ -15,7 +17,7 @@ Gem::Specification.new do |s|
     'wiki_uri' => 'https://github.com/szorfein/getch'
   }
   s.license = 'MIT'
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6'
 
   s.files = Dir.glob('{assets,lib}/**/*', File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
 
@@ -26,6 +28,6 @@ Gem::Specification.new do |s|
   s.executables << 'getch'
   s.require_paths = ['lib']
 
-  s.cert_chain  = ['certs/szorfein.pem']
-  s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  #s.cert_chain  = ['certs/szorfein.pem']
+  #s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
 end

data/lib/cryptsetup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'luks'
 
 # Used to interact with dmcrypt

data/lib/dracut/encrypt.rb

@@ -1,6 +1,7 @@
-# frozen_string_litteral: true
+# frozen_string_literal: true
 
 module Dracut
+  # configure dracut for encypted system
   class Encrypt < Root
     def initialize(devs, options)
       @luks = options[:luks_name]
@@ -26,6 +27,11 @@ module Dracut
       echo file, 'install_items+=" /boot/boot.key /boot/root.key /etc/crypttab "'
     end
 
+    def others
+      file = "#{@mountpoint}/etc/dracut.conf.d/mods.conf"
+      echo file, 'add_dracutmodules+=" crypt "'
+    end
+
     private
 
     def get_dm_uuid(name)

data/lib/dracut/root.rb

@@ -1,9 +1,10 @@
-# frozen_string_litteral: true
+# frozen_string_literal: true
 
 require 'nito'
 require_relative '../getch/log'
 
 module Dracut
+  # base for other dracut child
   class Root
     include NiTo
 
@@ -37,10 +38,8 @@ module Dracut
       echo file, "kernel_cmdline=\"#{line}\""
     end
 
-    def get_line
-    end
+    def get_line; end
 
-    def others
-    end
+    def others; end
   end
 end

data/lib/fstab/encrypt.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Fstab
+  # configure fstab for encrypt
   class Encrypt < Root
     def initialize(devs, options)
       super
@@ -12,7 +13,7 @@ module Fstab
 
       dm = Getch::Helpers.get_dm "boot-#{@luks}"
       uuid = gen_uuid dm
-      line = "UUID=#{uuid} /boot #{@fs} noauto,rw,relatime 0 0"
+      line = "UUID=#{uuid} /boot #{@fs} defaults,nosuid,noexec,nodev 0 2"
       echo_a @conf, line
     end
 
@@ -28,7 +29,7 @@ module Fstab
 
       dm = Getch::Helpers.get_dm "root-#{@luks}"
       uuid = gen_uuid dm
-      line = "UUID=#{uuid} / #{@fs} rw,relatime 0 1"
+      line = "UUID=#{uuid} / #{@fs} defaults 1 1"
       echo_a @conf, line
     end
 
@@ -37,7 +38,7 @@ module Fstab
 
       dm = Getch::Helpers.get_dm "home-#{@luks}"
       uuid = gen_uuid dm
-      line = "UUID=#{uuid} /home #{@fs} rw,relatime 0 2"
+      line = "UUID=#{uuid} /home #{@fs} defaults,nosuid,nodev 0 2"
       echo_a @conf, line
     end
   end

data/lib/fstab/minimal.rb

@@ -1,4 +1,4 @@
-# frozen_string_litteral: true
+# frozen_string_literal: true
 
 module Fstab
   class Minimal < Root

data/lib/fstab/root.rb

@@ -1,9 +1,10 @@
-# frozen_string_litteral: true
+# frozen_string_literal: true
 
 require 'nito'
 require_relative '../getch/log'
 
 module Fstab
+  # Generating /etc/fstab
   class Root
     include NiTo
 
@@ -36,7 +37,7 @@ module Fstab
       @efi || return
 
       uuid = gen_uuid @efi
-      line = "UUID=#{uuid} /efi vfat noauto,rw,relatime 0 0"
+      line = "UUID=#{uuid} /efi vfat defaults,nosuid,nodev 0 0"
       echo_a @conf, line
     end
 
@@ -44,7 +45,7 @@ module Fstab
       @boot || return
 
       uuid = gen_uuid @boot
-      line = "UUID=#{uuid} /boot #{@fs} noauto,rw,relatime 0 0"
+      line = "UUID=#{uuid} /boot #{@fs} defaults,nosuid,noexec,nodev 0 2"
       echo_a @conf, line
     end
 
@@ -60,7 +61,7 @@ module Fstab
       @root || return
 
       uuid = gen_uuid @root
-      line = "UUID=#{uuid} / #{@fs} rw,relatime 0 1"
+      line = "UUID=#{uuid} / #{@fs} defaults 1 1"
       echo_a @conf, line
     end
 
@@ -68,14 +69,14 @@ module Fstab
       @home || return
 
       uuid = gen_uuid @home
-      line = "UUID=#{uuid} /home #{@fs} rw,relatime 0 2"
+      line = "UUID=#{uuid} /home #{@fs} defaults,nosuid,nodev 0 2"
       echo_a @conf, line
     end
 
     def write_tmp
       Getch::Helpers.systemd? && return
 
-      line = 'tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0'
+      line = 'tmpfs /tmp tmpfs defaults,nosuid,noexec,nodev 0 0'
       echo_a @conf, line
     end
 

data/lib/getch/assembly.rb

@@ -5,6 +5,7 @@ require 'nito'
 require 'cryptsetup'
 
 module Getch
+  # define steps/order for getch
   class Assembly
     include NiTo
 
@@ -91,13 +92,24 @@ module Getch
       @state.post_config
     end
 
+    # Luks_keys
+    # Install external keys to avoid enter password multiple times
+    def luks_keys
+      return unless OPTIONS[:encrypt] && OPTIONS[:fs] != 'zfs'
+
+      return if STATES[:luks_keys]
+
+      CryptSetup.new(DEVS, OPTIONS).keys
+      @state.luks_keys
+    end
+
     # terraform
     # Install all the required packages
     # Also add services
     def terraform
       return if STATES[:terraform]
 
-      #@fs::PreDeps.new
+      # @fs::PreDeps.new
       @os::Terraform.new
       @fs::Deps.new
       @state.terraform
@@ -110,17 +122,6 @@ module Getch
       @state.services
     end
 
-    # Luks_keys
-    # Install external keys to avoid enter password multiple times
-    def luks_keys
-      return if not OPTIONS[:encrypt] or OPTIONS[:fs] == 'zfs'
-
-      return if STATES[:luks_keys]
-
-      CryptSetup.new(DEVS, OPTIONS).keys
-      @state.luks_keys
-    end
-
     # bootloader
     # Install and configure Grub2 or Systemd-boot with Dracut
     # Adding keys for Luks

data/lib/getch/config/grub.rb

@@ -4,7 +4,10 @@ require 'nito'
 
 module Getch
   module Config
+    # install grub
     class Grub
+      include NiTo
+
       def initialize
         @log = Log.new
         @disk = OPTIONS[:boot_disk] ||= OPTIONS[:disk]
@@ -14,10 +17,12 @@ module Getch
         x
       end
 
+      protected
+
       def x
         @log.info "Installing Grub on #{@disk}...\n"
         Helpers.efi? ? grub_efi : grub_bios
-      end 
+      end
 
       private
 
@@ -35,7 +40,7 @@ module Getch
       # In case where efivars is not mounted
       # avoid error with grub
       def mount_efivars
-        NiTo.mount '-t efivarfs', 'efivarfs', '/sys/firmware/efi/efivars'
+        mount '-t efivarfs', 'efivarfs', '/sys/firmware/efi/efivars'
       end
     end
   end

data/lib/getch/config.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Getch
+  # configurations for the new system
   module Config
     def sysctl
-      pwd = File.expand_path(File.dirname(__FILE__))
+      pwd = File.expand_path(__dir__)
       dest = "#{Getch::MOUNTPOINT}/etc/sysctl.d/"
 
       mkdir dest

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

@@ -17,8 +17,8 @@ module Getch
 
           def x
             Fstab::Encrypt.new(DEVS, OPTIONS).generate
-            Dracut::Encrypt.new(DEVS, OPTIONS).generate
             CryptSetup.new(DEVS, OPTIONS).configs
+            Dracut::Encrypt.new(DEVS, OPTIONS).generate
           end
         end
       end

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

@@ -21,7 +21,7 @@ module Getch
             puts " => Creating a key for #{dev}, password required:"
             chroot "cryptsetup luksAddKey #{dev} /boot/#{name}"
             command "chmod 000 /boot/#{name}"
-            #command "chmod -R g-rwx,o-rwx /boot"
+            # command "chmod -R g-rwx,o-rwx /boot"
           end
 
           def crypttab
@@ -52,7 +52,7 @@ module Getch
             conf = "#{MOUNTPOINT}/etc/crypttab"
             device = s_uuid(dev)
             raise "No partuuid for #{dev} #{device}" unless device
-            raise "Bad partuuid for #{dev} #{device}" if device.kind_of? Array
+            raise "Bad partuuid for #{dev} #{device}" if device.is_a?(Array)
 
             add_line(conf, "#{mapname} PARTUUID=#{device} #{point} #{rest}")
           end

data/lib/getch/gentoo/bootloader.rb

@@ -2,6 +2,7 @@
 
 module Getch
   module Gentoo
+    # install grub or bootctl
     class Bootloader
       def initialize
         @esp = '/efi'
@@ -11,8 +12,7 @@ module Getch
 
       # Dracut is used by sys-kernel/gentoo-kernel
       def dependencies
-        Install.new('app-shells/dash')
-        if Helpers.systemd? and Helpers.efi?
+        if Helpers.systemd_minimal?
           Log.new.info "Systemd-boot alrealy installed...\n"
         else
           ChrootOutput.new('emerge --update --newuse sys-boot/grub')
@@ -20,18 +20,22 @@ module Getch
       end
 
       def install
-        Helpers.grub? ?
-          Config::Grub.new :
+        if Helpers.grub?
+          Config::Grub.new
+        else
           bootctl
+        end
 
-        #ChrootOutput.new('emerge --config sys-kernel/gentoo-kernel')
-        ChrootOutput.new('emerge --config sys-kernel/gentoo-kernel-bin')
+        # ChrootOutput.new('emerge --config sys-kernel/gentoo-kernel')
+        ChrootOutput.new('emerge --config sys-kernel/gentoo-kernel-bin') # should also reload grub-mkconfig
       end
 
       def bootctl
-        @boot ?
-          with_boot :
+        if @boot
+          with_boot
+        else
           Chroot.new("bootctl --esp-path=#{@esp} install")
+        end
       end
 
       # We need to umount the encrypted /boot first

data/lib/getch/gentoo/sources.rb

@@ -22,6 +22,7 @@ module Getch
         bask
         gen_cmdline
         grub_mkconfig
+        systemd_mkconfig
         use_flags
         make
       end
@@ -43,14 +44,24 @@ module Getch
         cmdline.main
       end
 
+      # https://wiki.gentoo.org/wiki/Handbook:X86/Installation/Kernel#GRUB
       def grub_mkconfig
-        return if Helpers.systemd? && Helpers.efi?
+        return if Helpers.systemd_minimal?
 
-        file = "#{OPTIONS[:mountpoint]}/etc/kernel/postinst.d/90-mkconfig.install"
-        content = grub_script
-        mkdir "#{OPTIONS[:mountpoint]}/etc/kernel/postinst.d"
-        File.write file, content
-        File.chmod('0755', file)
+        # https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+        use = Getch::Gentoo::Use.new('sys-kernel/installkernel')
+
+        use.add(%w[grub dracut])
+      end
+
+      #  https://wiki.gentoo.org/wiki/Handbook:X86/Installation/Kernel#systemd-boot
+      def systemd_mkconfig
+        return unless Helpers.systemd_minimal?
+
+        use = Getch::Gentoo::Use.new('sys-apps/systemd')
+        use.add('boot')
+        other_use = Getch::Gentoo::Use.new('sys-kernel/installkernel')
+        other_use.add(%w[systemd-boot dracut])
       end
 
       def use_flags
@@ -60,11 +71,7 @@ module Getch
 
       # https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Kernel#Alternative:_Using_distribution_kernels
       def make
-        if Helpers.systemd?
-          Install.new('sys-kernel/installkernel-systemd')
-        else
-          Install.new('sys-kernel/installkernel-gentoo')
-        end
+        Install.new('sys-kernel/installkernel')
 
         # Install.new 'sys-kernel/gentoo-kernel'
         Install.new 'sys-kernel/gentoo-kernel-bin'
@@ -109,19 +116,6 @@ module Getch
 
         File.write(file, "#{name}\n", mode: 'a')
       end
-
-      def grub_script
-        <<~SHELL
-#!/usr/bin/env sh
-set -o errexit
-
-if ! hash grub-mkconfig ; then
- exit 0
-fi
-
-grub-mkconfig -o /boot/grub/grub.cfg
-        SHELL
-      end
     end
   end
 end

data/lib/getch/gentoo/terraform.rb

@@ -23,6 +23,7 @@ module Getch
         @pkgs << ' sys-kernel/linux-firmware'
         @pkgs << ' sys-firmware/intel-microcode'
         @pkgs << ' sys-fs/dosfstools' if Helpers.efi?
+        @pkgs << ' app-shells/dash'
         Install.new(@pkgs)
       end
 

data/lib/getch/gentoo/use_flag.rb

@@ -60,7 +60,7 @@ module Getch
         use = Getch::Gentoo::Use.new('sys-boot/grub')
         flags << '-grub_platforms_efi-64' unless Helpers.efi?
         flags << 'libzfs' if OPTIONS[:fs] == 'zfs'
-        flags << 'device-mapper' if OPTIONS[:fs] == 'lvm' || OPTIONS[:encrypt]
+        flags << 'device-mapper' if OPTIONS[:lvm] || OPTIONS[:encrypt]
         use.add(flags)
       end
 
@@ -74,7 +74,7 @@ module Getch
       end
 
       def lvm
-        return unless Getch::OPTIONS[:fs] == 'lvm'
+        return unless Getch::OPTIONS[:lvm]
 
         use = Getch::Gentoo::Use.new
         use.add_global('lvm', 'device-mapper')

data/lib/getch/gentoo.rb

@@ -5,6 +5,7 @@ require_relative 'gentoo/use'
 require_relative 'gentoo/use_flag'
 
 module Getch
+  # all class to install Gentoo linux
   module Gentoo
   end
 end

data/lib/getch/guard.rb

@@ -12,11 +12,23 @@ end
 class InvalidKeymap < StandardError
 end
 
+def valid_disk(name)
+  case name
+  when /^sd|^hd|^vd/
+    true
+  when /^nvm/
+    true
+  else
+    false
+  end
+end
+
 module Getch
+  # various guard
   module Guard
     def self.disk(name)
       raise InvalidDisk, 'No disk.' unless name
-      raise InvalidDisk, "Bad device name #{name}." unless name.match(/^?d[a-z]{1}$/)
+      raise InvalidDisk, "Bad device name #{name}." unless valid_disk(name)
       raise InvalidDisk, "Disk /dev/#{name} no found." unless File.exist? "/dev/#{name}"
 
       name

data/lib/getch/helpers.rb

@@ -28,6 +28,11 @@ module Getch
       File.exist? "#{OPTIONS[:mountpoint]}/etc/default/grub"
     end
 
+    # if systemd without encryption
+    def self.systemd_minimal?
+      systemd? && efi? && !OPTIONS[:encrypt]
+    end
+
     def self.get_file_online(url, dest)
       URI.open(url) do |l|
         File.open(dest, 'wb') { |f| f.write(l.read) }

data/lib/getch/log.rb

@@ -3,8 +3,8 @@
 require 'logger'
 
 module Getch
+  # Display message to stdout and write in a log file.
   class Log
-
     WHITE   = "\033[37m"
     CYAN    = "\033[36m"
     MAGENTA = "\033[35m"
@@ -16,13 +16,13 @@ module Getch
     BOLD    = "\033[1m"
     CLEAR   = "\033[0m"
 
-    def initialize(verbose = false)
+    def initialize(verbose: false)
       @log_file = '/tmp/log_install.txt'
       @verbose = verbose
       init
     end
 
-    # TODO remove length
+    # TODO, remove length
     def info(msg)
       tab = msg.match("\n") ? '' : add_tab(msg)
       l = msg.length
@@ -62,32 +62,32 @@ module Getch
 
     def init_res
       @result = Logger.new $stdout, level: 'INFO'
-      @result.formatter = proc do | _, _, _, msg | msg end
+      @result.formatter = proc do |_, _, _, msg| msg end
     end
 
     def init_debug
       @debug = Logger.new $stdout
-      @debug.formatter = proc do | severity, _, _, msg |
+      @debug.formatter = proc do |severity, _, _, msg|
         "\n#{BLUE}#{BOLD}#{severity[0]}#{CLEAR} [#{Process.pid}]#{CLEAR}#{msg}"
       end
     end
 
     def init_error
       @error = Logger.new $stdout
-      @error.formatter = proc do | severity, _, _, msg |
+      @error.formatter = proc do |severity, _, _, msg|
         "#{RED}#{BOLD}#{severity[0]}#{CLEAR}#{msg}\t"
       end
     end
 
     def init_fatal
       @fatal = Logger.new $stdout
-      @fatal.formatter = proc do | severity, _, _, msg |
+      @fatal.formatter = proc do |severity, _, _, msg|
         "\n#{YELLOW}#{BOLD}#{severity[0]}#{CLEAR}#{msg}"
       end
     end
 
     def init_save
-      File.exist? @log_file || puts("Creating log at #{@log_file}")
+      File.exist?(@log_file) || puts("Creating log at #{@log_file}")
       @save = Logger.new(@log_file, 1)
       @save.level = Logger::DEBUG
       @save.formatter = proc { |severity, datetime, _, msg|
@@ -108,7 +108,7 @@ module Getch
 
     def add_tab(text)
       case text.length
-      when 39..47 then "\t\t"
+      when 39..46 then "\t\t"
       when 31..38 then "\t\t\t"
       when 23..30 then "\t\t\t\t"
       when 16..22 then "\t\t\t\t\t"

data/lib/getch/tree.rb

@@ -2,8 +2,8 @@
 
 module Getch
   module Tree
+    # call class depend of the os choosen
     class Os
-
       OS_TREE = {
         gentoo: Gentoo,
         void: Void
@@ -18,26 +18,27 @@ module Getch
         OS_TREE[@os.to_sym] || @log.fatal('OS no found')
       end
     end
-    class FS
 
+    # call class depend on filesystem choosen.
+    class FS
       FS_TREE = {
         true => { # + encrypt
           true => { # + lvm
-            ext4: FileSystem::Ext4::Hybrid,
+            ext4: FileSystem::Ext4::Hybrid
           },
           false => { # - lvm
             ext4: FileSystem::Ext4::Encrypt,
             zfs: FileSystem::Zfs::Encrypt
-          },
+          }
         },
         false => { # - encrypt
           true => { # + lvm
-            ext4: FileSystem::Ext4::Lvm,
+            ext4: FileSystem::Ext4::Lvm
           },
           false => { # - lvm
             ext4: FileSystem::Ext4::Minimal,
-            zfs: FileSystem::Zfs::Minimal,
-          },
+            zfs: FileSystem::Zfs::Minimal
+          }
         }
       }.freeze
 

data/lib/getch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Getch
-  VERSION = '0.5.0'
+  VERSION = '0.7.3'
 end

data/lib/getch/void/terraform.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module Getch
   module Void
+    # install dependencies packages
     class Terraform
       def initialize
+        @deps = 'sudo'
         x
       end
 
@@ -12,13 +16,13 @@ module Getch
       end
 
       def install_pkgs
-        @pkgs = 'sudo'
+        @pkgs = @deps.dup
         @pkgs << ' vim'
         @pkgs << ' iptables'
         @pkgs << ' runit-iptables'
         @pkgs << ' iwd'
         @pkgs << ' dhcpcd'
-        @pkgs << ' lvm2' if OPTIONS[:fs] == 'lvm'
+        @pkgs << ' lvm2' if OPTIONS[:lvm]
         @pkgs << ' zfs' if OPTIONS[:fs] == 'zfs'
         @pkgs << ' cryptsetup' if OPTIONS[:encrypt]
         Install.new(@pkgs)

data/lib/getch/void/update.rb

@@ -26,7 +26,7 @@ module Getch
       def update
         ChrootOutput.new '/usr/bin/xbps-install -uy'
         ChrootOutput.new '/usr/bin/xbps-install', '-Sy', 'base-system'
-        ChrootOutput.new '/usr/bin/xbps-remove -y base-voidstrap'
+        ChrootOutput.new '/usr/bin/xbps-remove -y base-container-full'
       end
     end
   end

data/lib/getch/void.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Getch
+  # All class to install Voidlinux
   module Void
   end
 end

data/lib/luks.rb

@@ -3,8 +3,10 @@
 require 'nito'
 require 'getch/log'
 require 'getch/command'
+require 'English'
 
 module Luks
+  # define luks name, path, etc...
   class Main
     include Luks
     include NiTo
@@ -21,7 +23,7 @@ module Luks
       @mount = nil
       @bootloader = false
       @log = Getch::Log.new
-      @bs = get_bs
+      @bs = sector_size
     end
 
     def encrypt
@@ -32,9 +34,11 @@ module Luks
 
     def encrypt_with_key
       make_key
-      args = @luks_type == 'luks2' ?
-        "#{@command_args} -q --sector-size #{@bs} -d #{@full_key_path}" :
-        "#{@command_args} -q -d #{@full_key_path}"
+      args = if @luks_type == 'luks2'
+               "#{@command_args} -q --sector-size #{@bs} -d #{@full_key_path}"
+             else
+               "#{@command_args} -q -d #{@full_key_path}"
+             end
       @log.info "Encrypting #{@luks_name} with #{@full_key_path}...\n"
       cmd_crypt 'cryptsetup', 'luksFormat', args, "/dev/#{@disk}"
     end
@@ -44,9 +48,8 @@ module Luks
 
       @log.info "Opening #{@luks_name} > #{@disk}...\n"
       cmd_crypt 'cryptsetup', 'open', @command_args, "/dev/#{@disk}", @luks_name
-      unless File.exist? "/dev/mapper/#{@luks_name}"
-        raise "No dev /dev/mapper/#{@luks_name}, open it first..."
-      end
+
+      raise "No dev /dev/mapper/#{@luks_name}, open it first..." unless File.exist? "/dev/mapper/#{@luks_name}"
     end
 
     def open_with_key(file = nil)
@@ -94,8 +97,7 @@ module Luks
       cmd_crypt 'cryptsetup', 'close', @luks_name
     end
 
-    def gen_datas
-    end
+    def gen_datas; end
 
     protected
 
@@ -145,29 +147,28 @@ module Luks
     end
 
     def config_grub
-      return unless @bootloader
+      # return unless Getch::Helpers.grub? && !Getch::Helpers.systemd_minimal?
+      return unless @bootloader && Getch::Helpers.grub?
 
-      if Getch::Helpers.grub?
-        @log.info ' * Writing to /etc/default/grub...'
-        line = 'GRUB_ENABLE_CRYPTODISK=y'
-        echo_a "#{@mountpoint}/etc/default/grub", line
-        @log.result_ok
-      end
+      @log.info ' * Writing to /etc/default/grub...'
+      line = 'GRUB_ENABLE_CRYPTODISK=y'
+      echo_a "#{@mountpoint}/etc/default/grub", line
+      @log.result_ok
     end
 
     def perm
       @key_path = "#{@key_dir}/#{@key_name}"
       @full_key_path = "#{@mountpoint}#{@key_path}"
       @log.info "Enforcing permission on #{@full_key_path}..."
-      File.chmod 0400, "#{@mountpoint}#{@key_dir}"
-      File.chmod 0000, @full_key_path
-      File.chown 0, 0, @full_key_path
+      File.chmod(0400, "#{@mountpoint}#{@key_dir}")
+      File.chmod(0000, @full_key_path)
+      File.chown(0, 0, @full_key_path)
       @log.result_ok
     end
 
     private
 
-    def get_bs
+    def sector_size
       @disk || @log.fatal("No disk for #{@luks_name}.")
 
       sh 'blockdev', '--getpbsz', "/dev/#{@disk}"
@@ -175,16 +176,16 @@ module Luks
 
     def cmd_crypt_raw(*args)
       system args.join(' ')
-      return if $?.exitstatus == 0
+      return if $CHILD_STATUS.success?
 
       @log.dbg args.join(' ')
-      @log.dbg $?
+      @log.dbg $CHILD_STATUS.success
       @log.fatal 'die'
     end
 
     def cmd_crypt(*args)
       cmd_crypt_raw args
-    rescue => e
+    rescue StandardError => e
       @log.fatal e
     end
 
@@ -193,7 +194,7 @@ module Luks
     end
   end
 
-  # Boot can decrypt the root (/)
+  # Boot can decrypt all other partitions.
   class Boot < Main
     def initialize(disk, options)
       super
@@ -223,6 +224,7 @@ module Luks
     end
   end
 
+  # define home partition for luks
   class Home < Main
     def initialize(disk, options)
       super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.3
 platform: ruby
 authors:
 - szorfein
@@ -36,7 +36,7 @@ cert_chain:
   urXgRIzALxd/xazPCnoLSXPzfJSI6Y77S1EBvhPd9RaSO8IyH9RhPDP9mnTvW2Kl
   NAUnoL+txK5a
   -----END CERTIFICATE-----
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -184,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="