getch 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c141cfefd0484364edafbbf424bc6e3d1fe98d26d5a2fa96411ae88efaae501a
-  data.tar.gz: 117fb8c04c3525ac5c5be3da0683eac0b68de537f674955fe6d363091233ab0b
+  metadata.gz: cb3fc628a7308969d14505c6f56623c11c5adda014841e162b264f189b5ad54c
+  data.tar.gz: ea50a6890b8c0c718ec38876809144fab98442daeddad2db85bc591a77996948
 SHA512:
-  metadata.gz: fbf00fb976d8e4a1ea8a4e3abf64de42f9804b4b33b125548021f733d27e2458d6c6ec2e9712f3f92806b66253550c600c217f3ece4bf3310f5b39c5cb58aebf
-  data.tar.gz: ed7af46af82c816f17296ba01301aece81d6655d4fc31c166fce5a013be8c20e5b89b8965c3d855913628c3566a47bd8b2ed123263c7dedaef5b3e3fdd0a6b4e
+  metadata.gz: 2395983c7fc521cc7867cdd54550177a2ed3f5eccdcd070f36eec256e73d06b8bfe961dc3f922fa9c5afac30d28e898625b32655ee89d45bc8e1da79dbf54d15
+  data.tar.gz: 1e8eeda1ff45f0d633820ced177fb6ae97645d5aa2e7f02e69279f0b9e611035269c23707f6677820886c92122a27e92d3906401a873fc60a1e1e9064c8de3bf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.4, release 2021-06-20
+* Install `iptables` by default.
+* Control input for options `--disk`, `--format`, `--zoneinfo`, `--keymap`.
+* Add a `/etc/portage/bashrc` to automatically signing kernel modules with `emerge`.
+* Now clean properly another disk used with option `--separate-x DISK`.
+* For ZFS, use `blockdev --getpbsz` to find correct bloc (sector) size.
+* Populate `/etc/modules-load.d/` with modules found with `lsmod` (only few wifi's, flash usb related (ehci, ohci, xhci, etc)).
+* Remove the package `dev-util/dwarves`.
+
 ## 0.1.3, release 2021-05-17
 * LVM use the format /dev/vg_name/lv_name for mount/format/fstab.
 * Stop using `euse` from `gentoolkit`, use native Ruby code here.

data/README.md

@@ -72,25 +72,28 @@ Unless your old LVM volume group is also named `vg0`, `getch` may fail to partit
     # pvremove -f /dev/sdb
 
 #### Encryption enable on BIOS with ext4
-To decrypt your disk on BIOS system, you have to enter your password two times. One time for Grub and another time for the initramfs (Genkernel). [post](https://wiki.archlinux.org/index.php/GRUB#Encrypted_/boot).  
+To decrypt your disk on BIOS system, you have to enter your password twice. One time for Grub and another time for Genkernel. [post](https://wiki.archlinux.org/index.php/GRUB#Encrypted_/boot).  
 Also with GRUB, only a `us` keymap is working.
 
-#### With ZFS
-When Gentoo boot, the pool may fail to start, it's happen when the pool has not been `export` to the ISO. So just reboot on your ISO:
+#### ZFS
+When Gentoo boot the first time, the pool may fail to start, it's happen when the pool has not been `export` to the ISO. So just `export` your pool from the genkernel shell:
 
-You need the partuuid, pool are create with the first 5 characters, just replace `sdX` by your real device:
+The zpool name should be visible (rpool-150ed here), so enter in the Genkernel shell:
 
-    # ls -l /dev/disk/by-partuuid/ | grep sdX4
-    -> 150ed969...
-    # zpool import -N -R /mnt rpool-150ed
+    > shell
+    zpool import -f -N -R /mnt rpool-150ed
+    zpool export -a
+
+Then, just reboot now, it's all.
 
-And export them correctly:
+*INFO*: To create the zpool, getch use the 5 fist characters from the `partuuid`, just replace `sdX` by your real device:
 
-    # zpool export -a
+    # ls -l /dev/disk/by-partuuid/ | grep sdX4
+    -> 150ed969...
 
-It's all.
+The pool will be called `rpool-150ed`.
 
 ## Issues
 If need more support for your hardware (network, sound card, ...), you can submit a [new issue](https://github.com/szorfein/getch/issues/new) and post the output of the following command:
 + lspci
-+ lsmod
++ cat /proc/modules

data/lib/getch.rb

@@ -6,6 +6,7 @@ require_relative 'getch/command'
 require_relative 'getch/helpers'
 require_relative 'getch/log'
 require_relative 'getch/config'
+require_relative 'getch/guard'
 
 module Getch
 

data/lib/getch/filesystem/clean.rb

@@ -23,15 +23,22 @@ module Getch
       end
 
       def self.hdd(*disks)
-        disks.each { |d| clean_hdd(d) }
+        disks.each { |d|
+          clean_struct(d)
+          clean_hdd(d)
+        }
       end
       # See https://wiki.archlinux.org/index.php/Solid_state_drive/Memory_cell_clearing
       # for SSD
       def self.sdd
       end
 
-      def self.struct(*disks)
-        disks.each { |d| clean_struct(d) }
+      def self.external_disk(root_disk, *disks)
+        disks.each { |d|
+          unless d && d != "" && d != nil && d == root_disk
+            hdd(d)
+          end
+        }
       end
 
       def self.old_vg(disk, vg)

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

@@ -14,8 +14,8 @@ module Getch
 
           def run_partition
             return if STATES[:partition ]
-            @clean.struct(@disk, @cache_disk, @home_disk)
-            @clean.hdd(@disk, @cache_disk, @home_disk)
+            @clean.hdd(@disk)
+            @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
             if Helpers::efi?
               partition_efi
               encrypt_efi

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

@@ -12,8 +12,8 @@ module Getch
 
         def run_partition
           return if STATES[:partition ]
-          @clean.struct(@disk, @cache_disk, @home_disk)
-          @clean.hdd(@disk, @cache_disk, @home_disk)
+          @clean.hdd(@disk)
+          @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
           if Helpers::efi?
             partition_efi
           else

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

@@ -15,8 +15,9 @@ module Getch
           def run_partition
             return if STATES[:partition ]
             @clean.old_vg(@dev_root, @vg)
-            @clean.struct(@disk, @cache_disk, @home_disk)
-            @clean.hdd(@disk, @cache_disk, @home_disk)
+            @clean.hdd(@disk)
+            @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
+
             partition
             encrypt
             lvm

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

@@ -13,8 +13,8 @@ module Getch
         def run_partition
           return if STATES[:partition ]
           @clean.old_vg(@dev_root, @vg)
-          @clean.struct(@disk, @cache_disk, @home_disk)
-          @clean.hdd(@disk, @cache_disk, @home_disk)
+          @clean.hdd(@disk)
+          @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
           partition
           lvm
           @state.partition

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

@@ -9,7 +9,6 @@ module Getch
             @state = Getch::States.new()
             if ! @id
               @log.info "Research pool id for #{@dev_root}..."
-              sleep 2 until Helpers::pool_id(@dev_root)
               @id = Helpers::pool_id(@dev_root)
               @boot_pool_name = "bpool-#{@id}"
               @pool_name = "rpool-#{@id}"
@@ -30,11 +29,11 @@ module Getch
           end
 
           def zfs
-            bloc=`blockdev --getbsz #{@dev_root}`.chomp
+            bloc=`blockdev --getpbsz #{@dev_root}`
             ashift = case bloc
-              when 8096
+              when /8096/
                 13
-              when 4096
+              when /4096/
                 12
               else # 512
                 9

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

@@ -15,8 +15,9 @@ module Getch
           def run
             return if STATES[:partition ]
             @clean.old_zpool
-            @clean.struct(@disk, @cache_disk, @home_disk)
-            @clean.hdd(@disk, @cache_disk, @home_disk)
+            @clean.hdd(@disk)
+            @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
+
             partition
             cache
             @state.partition
@@ -27,22 +28,22 @@ module Getch
           def partition
             if Helpers::efi?
               @partition.efi(@dev_esp)
-              @partition.swap(@dev_swap)
+              @partition.swap(@dev_swap) if !@cache_disk
               @partition.root(@dev_root, "BF00") if @root_part != 1
             else
               @partition.gpt(@dev_gpt)
               @partition.boot(@dev_boot)
-              @partition.swap(@dev_swap)
+              @partition.swap(@dev_swap) if !@cache_disk
               @partition.root(@dev_root, "BF00") if @root_part != 1
             end
           end
 
           def cache
-            if @dev_log
-              exec("sgdisk -n2:0:+4G -t2:BF07 #{cache_disk}")
-            end
-            if @dev_cache
-              exec("sgdisk -n3:0:0 -t3:BF08 #{cache_disk}")
+            if @cache_disk
+              mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+              exec("sgdisk -n1:0:+#{mem} -t1:8200 /dev/#{@cache_disk}")
+              exec("sgdisk -n2:0:+4G -t2:BF07 /dev/#{@cache_disk}")
+              exec("sgdisk -n3:0:0 -t3:BF08 /dev/#{@cache_disk}")
             end
           end
 

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

@@ -8,7 +8,6 @@ module Getch
           @state = Getch::States.new
           if ! @id
             @log.info "Research pool id for #{@dev_root}..."
-            sleep 2 until Helpers::pool_id(@dev_root)
             @id = Helpers::pool_id(@dev_root)
             @boot_pool_name = "bpool-#{@id}"
             @pool_name = "rpool-#{@id}"
@@ -30,11 +29,11 @@ module Getch
         end
 
         def zfs
-          bloc=`blockdev --getbsz #{@dev_root}`.chomp
+          bloc=`blockdev --getpbsz #{@dev_root}`
           ashift = case bloc
-            when 8096
+            when /8096/
               13
-            when 4096
+            when /4096/
               12
             else # 512
               9

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

@@ -14,8 +14,9 @@ module Getch
         def run_partition
           return if STATES[:partition ]
           @clean.old_zpool
-          @clean.struct(@disk, @cache_disk, @home_disk)
-          @clean.hdd(@disk, @cache_disk, @home_disk)
+          @clean.hdd(@disk)
+          @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
+
           partition
           cache
           @state.partition
@@ -26,23 +27,23 @@ module Getch
         def partition
           if @efi
             @partition.efi(@dev_esp)
-            @partition.swap(@dev_swap)
+            @partition.swap(@dev_swap) if !@cache_disk
             @partition.root(@dev_root, "BF00") if @root_part != 1
           else
             @partition.gpt(@dev_gpt)
             # Boot pool for GRUB2
             @partition.boot(@dev_boot)
-            @partition.swap(@dev_swap)
+            @partition.swap(@dev_swap) if !@cache_disk
             @partition.root(@dev_root, "BF00") if @root_part != 1
           end
         end
 
         def cache
-          if @dev_log
-            exec("sgdisk -n2:0:+4G -t2:BF07 #{cache_disk}")
-          end
-          if @dev_cache
-            exec("sgdisk -n3:0:0 -t3:BF08 #{cache_disk}")
+          if @cache_disk
+            mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+            exec("sgdisk -n1:0:+#{mem} -t1:8200 /dev/#{@cache_disk}")
+            exec("sgdisk -n2:0:+4G -t2:BF07 /dev/#{@cache_disk}")
+            exec("sgdisk -n3:0:0 -t3:BF00 /dev/#{@cache_disk}")
           end
         end
 

data/lib/getch/gentoo.rb

@@ -29,6 +29,7 @@ module Getch
         config = Getch::Gentoo::Config.new()
         config.portage
         config.portage_fs
+        config.portage_bashrc
         config.repo
         config.network
         config.systemd(options)
@@ -50,6 +51,7 @@ module Getch
         chroot.kernel
         chroot.kernel_deps
         chroot.install_pkgs
+        chroot.kernel_link
       end
 
       def kernel
@@ -58,6 +60,7 @@ module Getch
         new
         source.build_kspp
         source.build_others
+        source.firewall
         source.make
         @state.kernel
       end

data/lib/getch/gentoo/boot.rb

@@ -18,6 +18,9 @@ module Getch
       end
 
       def bootloader
+        # Ensure than systemd is build with all our flags
+        Getch::Emerge.new("@world").pkg!
+
         if Helpers::efi?
           bootctl
         else

data/lib/getch/gentoo/chroot.rb

@@ -39,7 +39,6 @@ module Getch
         license = "#{MOUNTPOINT}/etc/portage/package.license"
         File.write(license, "sys-kernel/linux-firmware linux-fw-redistributable no-source-code\n")
         @pkgs << "sys-kernel/gentoo-sources"
-        @pkgs << "dev-util/dwarves"
       end
 
       def kernel_deps
@@ -56,6 +55,12 @@ module Getch
         Getch::Emerge.new(all_pkgs).pkg!
       end
 
+      # create a symbolic link for /usr/src/linux
+      def kernel_link
+        cmd = "eselect kernel set 1"
+        exec_chroot(cmd)
+      end
+
       private
 
       def mount

data/lib/getch/gentoo/config.rb

@@ -94,6 +94,40 @@ module Getch
         Helpers::add_file("#{portage}/package.unmask/zzz_via_autounmask")
       end
 
+      def portage_bashrc
+        conf = "#{MOUNTPOINT}/etc/portage/bashrc"
+        content = %q{
+# https://wiki.gentoo.org/wiki/Signed_kernel_module_support
+function pre_pkg_preinst() {
+    # This hook signs any out-of-tree kernel modules.
+    if [[ "$(type -t linux-mod_pkg_preinst)" != "function" ]]; then
+        # The package does not seem to install any kernel modules.
+        return
+    fi
+    # Get the signature algorithm used by the kernel.
+    local module_sig_hash="$(grep -Po '(?<=CONFIG_MODULE_SIG_HASH=").*(?=")' "${KERNEL_DIR}/.config")"
+    # Get the key file used by the kernel.
+    local module_sig_key="$(grep -Po '(?<=CONFIG_MODULE_SIG_KEY=").*(?=")' "${KERNEL_DIR}/.config")"
+    module_sig_key="${module_sig_key:-certs/signing_key.pem}"
+    # Path to the key file or PKCS11 URI
+    if [[ "${module_sig_key#pkcs11:}" == "${module_sig_key}" && "${module_sig_key#/}" == "${module_sig_key}" ]]; then
+        local key_path="${KERNEL_DIR}/${module_sig_key}"
+    else
+        local key_path="${module_sig_key}"
+    fi
+    # Certificate path
+    local cert_path="${KERNEL_DIR}/certs/signing_key.x509"
+    # Sign all installed modules before merging.
+    find "${D%/}/${INSDESTTREE#/}/" -name "*.ko" -exec "${KERNEL_DIR}/scripts/sign-file" "${module_sig_hash}" "${key_path}" "${cert_path}" '{}' \;
+}
+        }
+
+        f = File.new(conf, "w")
+        f.write("#{content}\n")
+        f.chmod(0644)
+        f.close
+      end
+
       private
 
       def control_options(options)

data/lib/getch/gentoo/sources.rb

@@ -12,6 +12,7 @@ module Getch
         qemu_guest
         install_wifi
         install_audio
+        flash_mod
       end
 
       def build_kspp
@@ -27,6 +28,11 @@ module Getch
         end
       end
 
+      def firewall
+        bask("-a iptables")
+        Getch::Emerge.new("net-firewall/iptables").pkg!
+      end
+
       private
 
       def make_kernel
@@ -80,7 +86,33 @@ module Getch
       end
 
       def wifi_drivers
-        bask("-a ath9k-driver") if ismatch?('ath9k')
+        conf = "#{MOUNTPOINT}/etc/modules-load.d/wifi.conf"
+        File.delete(conf) if File.exists? conf
+
+        if ismatch?('ath9k')
+          bask("-a ath9k-driver")
+        end
+
+        module_load("iwlmvm", conf)
+        module_load("ath9k", conf)
+      end
+
+      def flash_mod
+        conf = "#{MOUNTPOINT}/etc/modules-load.d/usb.conf"
+        File.delete(conf) if File.exists? conf
+
+        module_load("ehci_pci", conf)
+        module_load("rtsx_pci_sdmmc", conf)
+        module_load("sdhci_pci", conf)
+        module_load("uas", conf)
+        module_load("uhci_hcd", conf)
+        module_load("xhci_pci", conf)
+      end
+
+      def module_load(name, file)
+        return unless name
+        return unless ismatch?(name)
+        File.write(file, "#{name}\n", mode: 'a')
       end
     end
   end

data/lib/getch/guard.rb

@@ -0,0 +1,62 @@
+class InvalidDisk < StandardError
+end
+
+class InvalidFormat < StandardError
+end
+
+class InvalidZone < StandardError
+end
+
+class InvalidKeymap < StandardError
+end
+
+module Getch::Guard
+  def self.disk(name)
+    raise InvalidDisk, "No disk." unless name
+    raise InvalidDisk, "Bad device name #{name}." unless name.match(/^sd[a-z]{1}$/)
+    raise InvalidDisk, "Disk /dev/#{name} no found." unless File.exist? "/dev/#{name}"
+    name
+  rescue InvalidDisk => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+
+  def self.format(name)
+    raise InvalidFormat, "No format specified." unless name
+    raise InvalidFormat, "Format #{name} not yet available." if name.match(/btrfs/)
+    raise InvalidFormat, "Format #{name} not supported." unless name.match(/zfs|lvm|zfs/)
+  rescue InvalidFormat => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+
+  def self.zone(name)
+    raise InvalidZone, "No zoneinfo specified." unless name
+    raise InvalidZone, "Directory /usr/share/zoneinfo/ no found on this system..." unless Dir.exist? "/usr/share/zoneinfo/"
+    raise InvalidZone, "Zoneinfo #{name} is no found in /usr/share/zoneinfo/." unless File.exist? "/usr/share/zoneinfo/#{name}"
+  rescue InvalidZone => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+
+  def self.keymap(name)
+    raise InvalidKeymap, "No keymap specified." unless name
+    key = []
+
+    if Dir.exist? '/usr/share/keymaps'
+      key = Dir.glob("/usr/share/keymaps/**/#{name}.map.gz")
+    elsif Dir.exist? '/usr/share/kbd/keymaps'
+      key = Dir.glob("/usr/share/kbd/keymaps/**/#{name}.map.gz")
+    else
+      raise InvalidKeymap, "No directory found for keymap."
+    end
+
+    if key == []
+      raise InvalidKeymap, "Keymap #{name} no found."
+    end
+    name
+  rescue InvalidKeymap => e
+    puts "#{e.class} => #{e}"
+    exit 1
+  end
+end

data/lib/getch/helpers.rb

@@ -66,6 +66,20 @@ module Helpers
 
   # Used with ZFS for the pool name
   def self.pool_id(dev)
-    `lsblk -o PARTUUID #{dev}`.delete("\n").delete("PARTUUID").match(/[\w]{5}/)
+    if dev.match(/[0-9]/)
+      sleep 1
+      `lsblk -o PARTUUID #{dev}`.delete("\n").delete("PARTUUID").match(/[\w]{5}/)
+    else
+      puts "Please, enter a pool name"
+      while true
+        print "\n> "
+        value = gets
+        if value.match(/[a-z]{4,20}/)
+          return value
+        end
+        puts "Bad name, you enter: #{value}"
+        puts "Valid pool name use character only, between 4-20."
+      end
+    end
   end
 end

data/lib/getch/options.rb

@@ -27,31 +27,31 @@ module Getch
           @language = lang
         end
         opts.on("-z", "--zoneinfo ZONE", "Default is US/Eastern") do |zone|
-          @zoneinfo = zone
+          @zoneinfo = Getch::Guard.zone(zone)
         end
         opts.on("-k", "--keymap KEY", "Default is us") do |key|
-          @keymap = key
+          @keymap = Getch::Guard.keymap(key)
         end
         opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb), default use #{@disk}") do |disk|
-          @disk = disk
+          @disk = Getch::Guard.disk(disk)
         end
         opts.on("-f", "--format FS", "Can be ext4, lvm or zfs. Default use ext4") do |fs|
-          @fs = fs
+          @fs = Getch::Guard.format(fs)
           DEFAULT_OPTIONS[:fs] = fs # dont known why, but it should be enforce
         end
         opts.on("-u", "--username USERNAME", "Create a new user /home/USERNAME with password.") do |user|
           @username = user
         end
         opts.on("--separate-boot DISK", "Disk for the boot/efi partition, default use #{@disk}") do |boot|
-          @boot_disk = boot
+          @boot_disk = Getch::Guard.disk(boot)
           DEFAULT_OPTIONS[:boot_disk] = boot
         end
         opts.on("--separate-cache DISK", "Disk for the swap partition, add ZIL/L2ARC for ZFS when set, default use #{@disk}") do |swap|
-          @cache_disk = swap
+          @cache_disk = Getch::Guard.disk(swap)
           DEFAULT_OPTIONS[:cache_disk] = swap
         end
         opts.on("--separate-home DISK", "Disk for the /home partition, default is nil") do |home|
-          @home_disk = home
+          @home_disk = Getch::Guard.disk(home)
           DEFAULT_OPTIONS[:home_disk] = home
         end
         opts.on("--encrypt", "Encrypt your system.") do

data/lib/getch/version.rb

@@ -1,3 +1,3 @@
 module Getch
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   F9Dl4EPzjBJOgQWf+NxzxNuNKI46Lp5Q8AI+xtDUHAPbSswHa40BA6ChFehP+j0L
   fg==
   -----END CERTIFICATE-----
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -110,6 +110,7 @@ files:
 - lib/getch/gentoo/stage.rb
 - lib/getch/gentoo/use.rb
 - lib/getch/gentoo/use_flag.rb
+- lib/getch/guard.rb
 - lib/getch/helpers.rb
 - lib/getch/log.rb
 - lib/getch/options.rb