getch 0.0.9 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f332c1aa466828838d7968874705953bba34c2179426f4931a355d5c13963c
-  data.tar.gz: 47fa91c9b9086013db895772f4faece39afe9f4377ad96a53c4b6aee3822f79b
+  metadata.gz: cb3fc628a7308969d14505c6f56623c11c5adda014841e162b264f189b5ad54c
+  data.tar.gz: ea50a6890b8c0c718ec38876809144fab98442daeddad2db85bc591a77996948
 SHA512:
-  metadata.gz: 0450bc2fbc6e7b3835802dae660ee878da6890bb2181826057442d3de3c580ff0d68d1348ca1d395c0820ce8d9fa5770fdaaee384e67b2619c0fc37c72190f28
-  data.tar.gz: 961a9019de0dc20e67da6042c2c61d2052cff31299f07c796fec71cb1b9a84e3db92cb1df276a5dd8de896faed53c967871e2d959fc3a317a7d2eccb9ba1622c
+  metadata.gz: 2395983c7fc521cc7867cdd54550177a2ed3f5eccdcd070f36eec256e73d06b8bfe961dc3f922fa9c5afac30d28e898625b32655ee89d45bc8e1da79dbf54d15
+  data.tar.gz: 1e8eeda1ff45f0d633820ced177fb6ae97645d5aa2e7f02e69279f0b9e611035269c23707f6677820886c92122a27e92d3906401a873fc60a1e1e9064c8de3bf

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+## 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.
+* Optimization on package installation, they shouln't be installed more than once.
+* Regroup use flags under Getch::Gentoo::UseFlag.
+* Upd Bask v0.5 (zstd compression, better support for wifi...)
+* Config for systemd-resolved, enable DNS over TLS with Quad9 (9.9.9.9)
+* Add configs for systemd-network with DHCP for wifi and ethernet.
+* Correct permissions (/home/[user] and /etc/portage)
+
+## 0.1.2, release 2021-05-12
+* DOCS update.
+* Keep Nano for those who need :)
+* ZFS use the last version >=2.0 with kernel stable =5.10
+* ZFS create a Log device and Cache device if getch is used with `--separate-cache`.
+* GRUB or Systemd-boot can now be installed on separate disk with `--separate-boot`.
+* Adding flag for ZFS `-o autotrim=on` (used with `zpool create`).
+* Encrypted swap use: `cipher=aes-xts-plain64:sha256,size=512` by default.
+* In the make.conf: add `-fomit-frame-pointer`, designed to reduce generated code size.
+
+## 0.1.1, release 2020-11-01
+* Change mountpoint for the esp at /efi rather than /boot/efi
+* Replace Garden by Bask https://github.com/szorfein/bask
+* Correct option --username USERNAME, do not create a new partition.
+* New set of options --separate-{boot,cache,home} to install them on another disk
+* Refactor codes
+* Add cpu name to COMMON_FLAGS
+* Add cpuflags with app-portage/cpuid2cpuflags
++ Use the whole disk space available for / when option --username is unset
+
+## 0.1.0, release 2020-10-15
+* Add the (Zeta) filesystem ZFS
+* `emerge --depclean` to save space.
+* Add a message when getch have finish, keep /mnt/gentoo if you need to add something.
+* Use systemd-detect-virt to detect a Virtual Guest.
+
 ## 0.0.9, release 2020-10-03
 * Add encryption on ext4 and lvm (BIOS,UEFI)
 * Correct KEYMAP="yes" with genkernel

data/README.md

@@ -3,16 +3,17 @@ A CLI tool to install Gentoo.
 
 ## Description
 Actually, Getch support only the [AMD64 handbook](https://wiki.gentoo.org/wiki/Handbook:AMD64) and only with the last `stage3-amd64-systemd`.  
-It also require a disk (only one for now) with a minimum of 20G.  
 
-BIOS system will use Grub2 and UEFI, systemd-boot. Filesystem supported by Getch are for now:
-+ ext4
-+ lvm
+BIOS system will use `Grub2` and `systemd-boot` for UEFI. Filesystem supported by Getch are for now:
++ Ext4
++ LVM
++ ZFS
 
-I would also add disk encryption soon.
+Encryption is also supported.
 
 The ISO images i was able to test and that works:
 + [Archlinux](https://www.archlinux.org/download/)
++ [Archaeidae](https://github.com/szorfein/archaeidae): Custom Archiso that includes ZFS support.
 
 ## Install
 Getch is cryptographically signed, so add my public key (if you haven’t already) as a trusted certificate.  
@@ -27,27 +28,72 @@ When you boot from an `iso`, you can install `ruby`, `getch` and correct your `P
     # sh <(curl -L https://raw.githubusercontent.com/szorfein/getch/master/bin/setup.sh)
     # source ~/.zshrc # or ~/.bashrc
 
+If you want to try the master branch:
+
+    # git clone https://github.com/szorfein/getch
+    # cd getch
+    # ruby -I lib bin/getch -h
+
 ## Usage
+Just ensure than the script is run with a root account.
+
+    # getch -h
 
-    $ getch -h
+After an install by Getch, take a look on the [wiki](https://github.com/szorfein/getch/wiki).
 
 ## Examples
 For a french user:
 
-    # getch --username ninja --zoneinfo "Europe/Paris" --language fr_FR --keymap fr
-
-After an install by Getch, take a look on the [wiki](https://github.com/szorfein/getch/wiki).
+    # getch --zoneinfo "Europe/Paris" --language fr_FR --keymap fr
 
 Install Gentoo on LVM:
 
     # getch --format lvm --disk sda
 
+Encrypt your disk with LVM with a french keymap
+
+    # getch --format lvm --encrypt --keymap fr
+
+Encrypt with ext4 and create a home directory /home/ninja
+
+    # getch --format ext4 --encrypt --username ninja
+
+With ZFS:
+
+    # getch --format zfs
+
 ## Troubleshooting
 
 #### LVM
-Unless than your older LVM volume group is named `vg0`, `getch` may fail to partition your disk, you have to clean your device before proceed with `vgremove` and `pvremove`.
+Unless your old LVM volume group is also named `vg0`, `getch` may fail to partition your disk. You have to clean up your device before proceed with `vgremove` and `pvremove`. An short example how doing this with a volume group named `vg0`:
+
+    # vgdisplay | grep vg0
+    # vgremove -f vg0
+    # pvremove -f /dev/sdb
+
+#### Encryption enable on BIOS with ext4
+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.
+
+#### 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:
+
+The zpool name should be visible (rpool-150ed here), so enter in the Genkernel shell:
+
+    > shell
+    zpool import -f -N -R /mnt rpool-150ed
+    zpool export -a
+
+Then, just reboot now, it's all.
+
+*INFO*: To create the zpool, getch use the 5 fist characters from the `partuuid`, just replace `sdX` by your real device:
+
+    # ls -l /dev/disk/by-partuuid/ | grep sdX4
+    -> 150ed969...
+
+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/bin/setup.sh

@@ -72,10 +72,12 @@ set_shell() {
   [ -f ~/.zshrc ] && your_shell=~/.zshrc
 
   [ -f "$your_shell" ] && {
-    if ! grep -q ".gem/ruby/[0-9.]*/bin" "$your_shell" ; then
+    if ! grep -q "ruby" "$your_shell" ; then
       echo "export PATH=\$PATH:$(ruby -e 'puts Gem.user_dir')/bin" >> "$your_shell"
     fi
-    . "$your_shell"
+    if $(. "$your_shell") ; then
+      echo "Shell loaded"
+    fi
   }
 }
 

data/lib/getch.rb

@@ -5,6 +5,8 @@ require_relative 'getch/filesystem'
 require_relative 'getch/command'
 require_relative 'getch/helpers'
 require_relative 'getch/log'
+require_relative 'getch/config'
+require_relative 'getch/guard'
 
 module Getch
 
@@ -15,6 +17,9 @@ module Getch
     disk: 'sda',
     fs: 'ext4',
     username: nil,
+    boot_disk: nil,
+    cache_disk: nil,
+    home_disk: nil,
     encrypt: false,
     verbose: false
   }
@@ -33,11 +38,13 @@ module Getch
   DEFAULT_FS = {
     true => {
       ext4: Getch::FileSystem::Ext4::Encrypt,
-      lvm: Getch::FileSystem::Lvm::Encrypt
+      lvm: Getch::FileSystem::Lvm::Encrypt,
+      zfs: Getch::FileSystem::Zfs::Encrypt
     },
     false => {
       ext4: Getch::FileSystem::Ext4,
-      lvm: Getch::FileSystem::Lvm
+      lvm: Getch::FileSystem::Lvm,
+      zfs: Getch::FileSystem::Zfs,
     }
   }.freeze
 
@@ -49,13 +56,17 @@ module Getch
 
   def self.resume_options(opts)
     puts "\nBuild Gentoo with the following args:\n"
-    puts "lang: #{DEFAULT_OPTIONS[:language]}"
-    puts "zoneinfo: #{DEFAULT_OPTIONS[:zoneinfo]}"
-    puts "keymap: #{DEFAULT_OPTIONS[:keymap]}"
-    puts "disk: #{DEFAULT_OPTIONS[:disk]}"
-    puts "fs: #{DEFAULT_OPTIONS[:fs]}"
-    puts "username: #{DEFAULT_OPTIONS[:username]}"
-    puts "encrypt: #{DEFAULT_OPTIONS[:encrypt]}"
+    puts "Lang: #{DEFAULT_OPTIONS[:language]}"
+    puts "Zoneinfo: #{DEFAULT_OPTIONS[:zoneinfo]}"
+    puts "Keymap: #{DEFAULT_OPTIONS[:keymap]}"
+    puts "Disk: #{DEFAULT_OPTIONS[:disk]}"
+    puts "Filesystem: #{DEFAULT_OPTIONS[:fs]}"
+    puts "Username: #{DEFAULT_OPTIONS[:username]}"
+    puts "Encrypt: #{DEFAULT_OPTIONS[:encrypt]}"
+    puts
+    puts "separate-boot disk: #{DEFAULT_OPTIONS[:boot_disk]}"
+    puts "separate-cache disk: #{DEFAULT_OPTIONS[:cache_disk]}"
+    puts "separate-home disk: #{DEFAULT_OPTIONS[:home_disk]}"
     puts
     print "Continue? (n,y) "
     case gets.chomp
@@ -85,11 +96,16 @@ module Getch
     gentoo = Getch::Gentoo
     gentoo.stage3
     gentoo.config(options)
-    gentoo.chroot
+    gentoo.chroot(options)
     gentoo.kernel
     gentoo.boot(options)
   end
 
+  def self.configure(options)
+    config = Getch::Config.new
+    config.network
+  end
+
   def self.main(argv)
     options = Options.new(argv)
     DEFAULT_OPTIONS.freeze
@@ -98,5 +114,6 @@ module Getch
     format(options.disk, options.fs, options.username)
     class_fs::Mount.new.run
     init_gentoo(options)
+    configure(options)
   end
 end

data/lib/getch/command.rb

@@ -127,19 +127,21 @@ module Getch
     end
   end
 
-  class Garden
+  class Bask
     def initialize(cmd)
       @gentoo = MOUNTPOINT
       @cmd = cmd
       @log = Getch::Log.new
+      @version = "0.5"
     end
 
     def run!
-      @log.info "Running Garden: #{@cmd}"
+      download_bask if ! Dir.exist? "#{MOUNTPOINT}/root/bask-#{@version}"
+      @log.info "Running Bask: #{@cmd}"
       cmd = "chroot #{@gentoo} /bin/bash -c \"source /etc/profile \
         && env-update \
-        && cd /root/garden-master \
-        && ./kernel.sh #{@cmd} -k /usr/src/linux\""
+        && cd /root/bask-#{@version} \
+        && ./bask.sh #{@cmd} -k /usr/src/linux\""
       Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
         while line = stdout_err.gets
           puts line
@@ -152,5 +154,24 @@ module Getch
         end
       end
     end
+
+    private 
+
+    def download_bask
+      @log.info "Installing Bask..."
+      url = "https://github.com/szorfein/bask/archive/v#{@version}.tar.gz"
+      file = "bask-#{@version}.tar.gz"
+
+      Dir.chdir("#{MOUNTPOINT}/root")
+      Helpers::get_file_online(url, file)
+      Getch::Command.new("tar xzf #{file}").run!
+    end
+  end
+
+  class Chroot < Command
+    def initialize(cmd)
+      super
+      @cmd = "chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile; #{cmd}\""
+    end
   end
 end

data/lib/getch/config.rb

@@ -0,0 +1,58 @@
+module Getch
+  class Config
+    def initialize
+      @systemd_net_dir = "#{MOUNTPOINT}/etc/systemd"
+    end
+
+    def network
+      ethernet
+      wifi
+      resolved
+      Getch::Chroot.new('systemctl enable systemd-networkd').run!
+      Getch::Chroot.new('systemctl enable systemd-resolved').run!
+    end
+
+    private
+
+    def ethernet
+      conf = "#{@systemd_net_dir}/network/20-ethernet.network"
+      datas = [
+        "[Match]",
+        "Name=en*",
+        "Name=eth*",
+        "[Network]",
+        "DHCP=yes",
+        "IPv6PrivacyExtensions=yes",
+        "[DHCP]",
+        "RouteMetric=512"
+      ]
+      File.write(conf, datas.join("\n"), mode: 'w')
+    end
+
+    def wifi
+      conf = "#{@systemd_net_dir}/network/20-wireless.network"
+      datas = [
+        "[Match]",
+        "Name=wlp*",
+        "Name=wlan*",
+        "[Network]",
+        "DHCP=yes",
+        "IPv6PrivacyExtensions=yes",
+        "[DHCP]",
+        "RouteMetric=1024",
+      ]
+      File.write(conf, datas.join("\n"), mode: 'w')
+    end
+
+    def resolved
+      conf = "#{@systemd_net_dir}/resolved.conf.d/dns_over_tls.conf"
+      datas = [
+        "[Resolve]",
+        "DNS=9.9.9.9#dns.quad9.net",
+        "DNSOverTLS=yes",
+      ]
+      Helpers::create_dir("#{@systemd_net_dir}/resolved.conf.d")
+      File.write(conf, datas.join("\n"), mode: 'w')
+    end
+  end
+end

data/lib/getch/filesystem.rb

@@ -3,5 +3,11 @@ module Getch
   end
 end
 
+require_relative 'filesystem/device'
+require_relative 'filesystem/clean'
+require_relative 'filesystem/partition'
+require_relative 'filesystem/mount'
+
 require_relative 'filesystem/ext4'
 require_relative 'filesystem/lvm'
+require_relative 'filesystem/zfs'

data/lib/getch/filesystem/clean.rb

@@ -0,0 +1,58 @@
+module Getch
+  module FileSystem
+    module Clean
+      def self.clean_hdd(disk)
+        return if ! disk
+        raise ArgumentError, "Disk #{disk} is no found." if ! File.exist? "/dev/#{disk}"
+        puts
+        print "Cleaning data on #{disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? [y,N] "
+        case gets.chomp
+        when /^y|^Y/
+          bloc=`blockdev --getbsz /dev/#{disk}`.chomp
+          Helpers::sys("dd if=/dev/urandom of=/dev/#{disk} bs=#{bloc} status=progress")
+        else
+          return
+        end
+      end
+
+      def self.clean_struct(disk)
+        return if ! disk
+        raise ArgumentError, "Disk #{disk} is no found." if ! File.exist? "/dev/#{disk}"
+        Helpers::sys("sgdisk -Z /dev/#{disk}")
+        Helpers::sys("wipefs -a /dev/#{disk}")
+      end
+
+      def self.hdd(*disks)
+        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.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)
+        oldvg = `vgdisplay | grep #{vg}`.chomp
+        Helpers::sys("vgremove -f #{vg}") if oldvg != ''
+        Helpers::sys("pvremove -f #{disk}") if oldvg != '' and File.exist? disk
+      end
+
+      def self.old_zpool
+        oldzpool = `zpool status | grep pool:`.gsub(/pool: /, '').delete(' ').split("\n")
+        if oldzpool[0] != "" and $?.success?
+          oldzpool.each { |p| Helpers::sys("zpool destroy #{p}") if p }
+        end
+      end
+    end
+  end
+end