getch 0.1.0 → 0.1.6

data/lib/getch/command.rb

@@ -59,7 +59,7 @@ module Getch
       block.each do |f|
         begin
           data = f.read_nonblock(@block_size)
-          puts data if DEFAULT_OPTIONS[:verbose]
+          puts data if OPTIONS[:verbose]
         rescue EOFError
           puts ""
         rescue => e
@@ -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,6 +154,18 @@ 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

data/lib/getch/config.rb

@@ -0,0 +1,42 @@
+require_relative 'config/gentoo'
+require_relative 'config/void'
+
+CONFIG_LOAD = {
+  gentoo: Getch::Config::Gentoo,
+  void: Getch::Config::Void
+}.freeze
+
+module Getch
+  module Config
+    class Main
+      def initialize
+        os = OPTIONS[:os].to_sym
+        @load = CONFIG_LOAD[os].new
+      end
+
+      def ethernet
+        @load.ethernet
+      end
+
+      def dns
+        @load.dns
+      end
+
+      def wifi
+        @load.wifi
+      end
+
+      def sysctl
+        pwd = File.expand_path(File.dirname(__FILE__))
+        dest = "#{Getch::MOUNTPOINT}/etc/sysctl.d/"
+
+        Helpers::mkdir dest
+        Helpers::cp("#{pwd}/../../assets/network-stack.conf", dest)
+      end
+      
+      def shell
+        @load.shell
+      end
+    end
+  end
+end

data/lib/getch/config/gentoo.rb

@@ -0,0 +1,59 @@
+module Getch
+  module Config
+    class Gentoo
+      def initialize
+        @systemd_net_dir = "#{MOUNTPOINT}/etc/systemd"
+      end
+
+      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 dns
+        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')
+
+        Getch::Chroot.new('systemctl enable systemd-networkd').run!
+        Getch::Chroot.new('systemctl enable systemd-resolved').run!
+      end
+
+      def shell
+      end
+    end
+  end
+end

data/lib/getch/config/void.rb

@@ -0,0 +1,49 @@
+require_relative '../helpers'
+
+module Getch
+  module Config
+    class Void
+      include Helpers::Void
+
+      def initialize
+        @service_dir = "/etc/runit/runsvdir/default/"
+      end
+
+      # Enable dhcpcd service
+      def ethernet
+        command "ln -fs /etc/sv/dhcpcd #{@service_dir}"
+      end
+
+      # with Quad9
+      # https://www.dnsknowledge.com/tutorials/how-to-setup-quad9-dns-on-a-linux/
+      def dns
+        conf = "#{MOUNTPOINT}/etc/resolv.conf"
+        content = [
+          "nameserver 9.9.9.9",
+          "nameserver 2620:fe::fe",
+          "options rotate",
+          "",
+        ]
+        File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
+      end
+
+      # https://docs.voidlinux.org/config/network/iwd.html
+      def wifi
+        conf = "#{MOUNTPOINT}/etc/iwd/main.conf"
+        content = [
+          "[General]",
+          "UseDefaultInterface=true",
+          "",
+        ]
+        File.write(conf, content.join("\n"), mode: 'a', chmod: 0644)
+        # Enabling dbus and iwd
+        command "ln -fs /etc/sv/dbus #{@service_dir}"
+        command "ln -fs /etc/sv/iwd #{@service_dir}"
+      end
+
+      def shell
+        command "chsh -s /bin/bash"
+      end
+    end
+  end
+end

data/lib/getch/filesystem.rb

@@ -3,6 +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

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 = Getch::OPTIONS[:username]
+
+        @disk = Getch::OPTIONS[:disk]
+        @boot_disk = Getch::OPTIONS[:boot_disk]
+        @cache_disk = Getch::OPTIONS[:cache_disk]
+        @home_disk = Getch::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.rb

@@ -11,4 +11,5 @@ require_relative 'ext4/format'
 require_relative 'ext4/mount'
 require_relative 'ext4/config'
 require_relative 'ext4/deps'
+require_relative 'ext4/void'
 require_relative 'ext4/encrypt'

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.rb

@@ -13,3 +13,4 @@ require_relative 'encrypt/format'
 require_relative 'encrypt/mount'
 require_relative 'encrypt/config'
 require_relative 'encrypt/deps'
+require_relative 'encrypt/void'

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=#{Getch::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=#{Getch::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" : ''