getch 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f332c1aa466828838d7968874705953bba34c2179426f4931a355d5c13963c
-  data.tar.gz: 47fa91c9b9086013db895772f4faece39afe9f4377ad96a53c4b6aee3822f79b
+  metadata.gz: 259461a4875fb46c062067c9663e211c206475aaaaa89d3066f85d1b3be2c19b
+  data.tar.gz: 3ab40d87e3f039ef840156cc81df8ee75e3f8f76c332ae4ba08335b04440625f
 SHA512:
-  metadata.gz: 0450bc2fbc6e7b3835802dae660ee878da6890bb2181826057442d3de3c580ff0d68d1348ca1d395c0820ce8d9fa5770fdaaee384e67b2619c0fc37c72190f28
-  data.tar.gz: 961a9019de0dc20e67da6042c2c61d2052cff31299f07c796fec71cb1b9a84e3db92cb1df276a5dd8de896faed53c967871e2d959fc3a317a7d2eccb9ba1622c
+  metadata.gz: eef130ea5b78dcde7f2897d16f3f74293c16da487ca029c0d47c905489d5cd4d9f32d5bffeba30fe06ab13694370f99a380aceaec6da053dece11598eb938ba4
+  data.tar.gz: f9f4584abb87c4287ba81e16bb0274c483627a712916728fbcc9a4667a2d91f03e09a092bdf09400bd1f92318c67ddabdf4c20217eff1eeb64f2d8d0c97a1a02

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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

@@ -9,7 +9,7 @@ BIOS system will use Grub2 and UEFI, systemd-boot. Filesystem supported by Getch
 + ext4
 + lvm
 
-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/)
@@ -28,24 +28,37 @@ When you boot from an `iso`, you can install `ruby`, `getch` and correct your `P
     # source ~/.zshrc # or ~/.bashrc
 
 ## Usage
+Just ensure than the script is run with a root account, not just sudo.
 
-    $ 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
+
 ## 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`.
+
+#### 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).  
+Also with GRUB, only a `us` keymap is working.
 
 ## 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:

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

@@ -33,11 +33,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
 

data/lib/getch/command.rb

@@ -153,4 +153,11 @@ module Getch
       end
     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/filesystem.rb

@@ -5,3 +5,4 @@ end
 
 require_relative 'filesystem/ext4'
 require_relative 'filesystem/lvm'
+require_relative 'filesystem/zfs'

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

@@ -49,7 +49,7 @@ module Getch
         end
 
         def exec(cmd)
-          Helpers::run_chroot(cmd, MOUNTPOINT)
+          Getch::Chroot.new(cmd).run!
         end
       end
     end

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

@@ -54,7 +54,7 @@ module Getch
           end
 
           def exec(cmd)
-            Helpers::run_chroot(cmd, MOUNTPOINT)
+            Getch::Chroot.new(cmd).run!
           end
         end
       end

data/lib/getch/filesystem/zfs.rb

@@ -0,0 +1,14 @@
+module Getch
+  module FileSystem
+    module Zfs
+    end
+  end
+end
+
+require_relative 'zfs/device'
+require_relative 'zfs/partition'
+require_relative 'zfs/format'
+require_relative 'zfs/mount'
+require_relative 'zfs/config'
+require_relative 'zfs/deps'
+require_relative 'zfs/encrypt'

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

@@ -0,0 +1,58 @@
+module Getch
+  module FileSystem
+    module Zfs
+      class Config < Getch::FileSystem::Zfs::Device
+        def initialize
+          super
+          gen_uuid
+          @root_dir = MOUNTPOINT
+          @init = '/usr/lib/systemd/systemd'
+        end
+
+        def fstab
+          file = "#{@root_dir}/etc/fstab"
+          datas = data_fstab
+          File.write(file, datas.join("\n"))
+        end
+
+        def systemd_boot
+          return if ! Helpers::efi? 
+          esp = '/boot/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/gentoo init=#{@init} dozfs"
+          ]
+          File.write("#{dir}/gentoo.conf", datas_gentoo.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/gentoo init=#{@init} dozfs\""
+          ]
+          File.write("#{file}", cmdline.join("\n"), mode: 'a')
+        end
+
+        private
+
+        def gen_uuid
+          @uuid_swap = `lsblk -o "UUID" #{@dev_swap} | tail -1`.chomp()
+          @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
+        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" : ''
+
+          [ boot_efi, swap ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+module Getch
+  module FileSystem
+    module Zfs
+      class Deps < Getch::FileSystem::Zfs::Device
+        def initialize
+          super
+          install_deps
+          zfs_mountpoint
+          auto_module_rebuild
+        end
+
+        def make
+          hostid
+          options_make
+          Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+        end
+
+        private
+        def install_deps
+          exec("euse -E libzfs") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /libzfs/)
+          exec("euse -E rootfs") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /rootfs/)
+          Getch::Garden.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!
+        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")
+          Helpers::sys("sed -Ei \"s|/mnt/?|/|\" #{MOUNTPOINT}/etc/zfs/zfs-list.cache/*")
+          exec("systemctl enable zfs-zed.service")
+          exec("systemctl enable zfs.target")
+        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
+          hostid_value=`hostid`.chomp
+          File.write("#{MOUNTPOINT}/etc/hostid", hostid_value, mode: 'w')
+        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')
+        end
+
+        def exec(cmd)
+          Getch::Chroot.new(cmd).run!
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Getch
+  module FileSystem
+    module Zfs
+      class Device
+        def initialize
+          @disk = DEFAULT_OPTIONS[:disk]
+          @user = DEFAULT_OPTIONS[:username]
+          @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
+          @dev_boot = Helpers::efi? ? nil : "/dev/#{@disk}2"
+          @dev_swap = Helpers::efi? ? "/dev/#{@disk}2" : "/dev/#{@disk}3"
+          @dev_root = Helpers::efi? ? "/dev/#{@disk}3" : "/dev/#{@disk}4"
+          @boot_pool_name = 'bpool'
+          @pool_name = 'zpool'
+          @zfs_home = @user ? true : false
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+      end
+    end
+  end
+end
+
+require_relative 'encrypt/device'
+require_relative 'encrypt/partition'
+require_relative 'encrypt/format'
+require_relative 'encrypt/mount'
+require_relative 'encrypt/config'
+require_relative 'encrypt/deps'

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

@@ -0,0 +1,67 @@
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Config < Getch::FileSystem::Zfs::Encrypt::Device
+          def initialize
+            super
+            gen_uuid
+            @root_dir = MOUNTPOINT
+            @init = '/usr/lib/systemd/systemd'
+            crypttab
+          end
+
+          def fstab
+            file = "#{@root_dir}/etc/fstab"
+            datas = data_fstab
+            File.write(file, datas.join("\n"))
+          end
+
+          def systemd_boot
+            return if ! Helpers::efi? 
+            esp = '/boot/efi'
+            dir = "#{@root_dir}/#{esp}/loader/entries/"
+            datas_gentoo = [
+              'title Gentoo Linux',
+              'linux /vmlinuz',
+              'initrd /initramfs',
+              "options root=ZFS=#{@pool_name}/ROOT/gentoo init=#{@init} dozfs keymap=#{DEFAULT_OPTIONS[:keymap]}"
+            ]
+            File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
+          end
+
+          def crypttab
+            datas = [
+              "cryptswap UUID=#{@uuid_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=256"
+            ]
+            File.write("#{@root_dir}/etc/crypttab", 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=\"root=ZFS=#{@pool_name}/ROOT/gentoo init=#{@init} dozfs keymap=#{DEFAULT_OPTIONS[:keymap]}\""
+            ]
+            File.write("#{file}", cmdline.join("\n"), mode: 'a')
+          end
+
+          private
+
+          def gen_uuid
+            @uuid_swap = `lsblk -o "UUID" #{@dev_swap} | tail -1`.chomp()
+            @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
+          end
+
+          def data_fstab
+            boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+            swap = @dev_swap ? "/dev/mapper/cryptswap none swap discard 0 0" : ''
+
+            [ boot_efi, swap ]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Deps < Getch::FileSystem::Zfs::Encrypt::Device
+          def initialize
+            super
+            install_deps
+            zfs_mountpoint
+            auto_module_rebuild
+          end
+
+          def make
+            hostid
+            options_make
+            Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+          end
+
+          private
+          def install_deps
+            exec("euse -E libzfs") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /libzfs/)
+            exec("euse -E rootfs") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /rootfs/)
+            exec("euse -E cryptsetup") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /cryptsetup/)
+            Getch::Garden.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 sys-apps/systemd sys-fs/cryptsetup').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")
+            Helpers::sys("sed -Ei \"s|/mnt/?|/|\" #{MOUNTPOINT}/etc/zfs/zfs-list.cache/*")
+            exec("systemctl enable zfs-zed.service")
+            exec("systemctl enable zfs.target")
+          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
+            hostid_value=`hostid`.chomp
+            File.write("#{MOUNTPOINT}/etc/hostid", hostid_value, mode: 'w')
+          end
+
+          def options_make
+            bootloader = Helpers::efi? ? 'BOOTLOADER="no"' : 'BOOTLOADER="grub2"'
+            datas = [
+              '',
+              bootloader,
+              'INSTALL="yes"',
+              'MENUCONFIG="no"',
+              'CLEAN="yes"',
+              'KEYMAP="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')
+          end
+
+          def exec(cmd)
+            Getch::Chroot.new(cmd).run!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Device
+          def initialize
+            @disk = DEFAULT_OPTIONS[:disk]
+            @user = DEFAULT_OPTIONS[:username]
+            @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
+            @dev_boot = Helpers::efi? ? nil : "/dev/#{@disk}2"
+            @dev_swap = Helpers::efi? ? "/dev/#{@disk}2" : "/dev/#{@disk}3"
+            @dev_root = Helpers::efi? ? "/dev/#{@disk}3" : "/dev/#{@disk}4"
+            @boot_pool_name = 'bpool'
+            @pool_name = 'zpool'
+            @zfs_home = @user ? true : false
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Format < Getch::FileSystem::Zfs::Encrypt::Device
+          def initialize
+            super
+            @state = Getch::States.new()
+            format
+          end
+
+          def format
+            return if STATES[:format]
+            system("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
+            system("mkswap -f #{@dev_swap}")
+            @state.format
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+require 'fileutils'
+
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Mount < Getch::FileSystem::Zfs::Encrypt::Device
+          def initialize
+            super
+            @root_dir = MOUNTPOINT
+            @boot_dir = "#{@root_dir}/boot"
+            @boot_efi_dir = "#{@root_dir}/boot/efi"
+            @state = Getch::States.new()
+            @log = Getch::Log.new
+          end
+
+          def run
+            return if STATES[:mount]
+            exec("zpool export -a")
+            exec("rm -rf #{MOUNTPOINT}/*")
+            exec("zpool import -N -R #{MOUNTPOINT} #{@pool_name}")
+            exec("zpool import -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
+            exec("zfs load-key -a")
+            mount_swap
+            mount_root
+            mount_boot
+            mount_boot_efi
+            exec("zfs mount -a")
+            @state.mount
+          end
+
+          private
+
+          def mount_swap
+            if Helpers::grep?('/proc/swaps', /^\/dev/)
+              exec("swapoff #{@dev_swap}")
+            end
+
+            exec("swapon #{@dev_swap}")
+          end
+
+          def mount_root
+            Helpers::mkdir(@root_dir)
+            exec("zfs mount #{@pool_name}/ROOT/gentoo")
+          end
+
+          def mount_boot_efi
+            return if ! @dev_boot_efi
+            Helpers::mkdir(@boot_efi_dir)
+            exec("mount #{@dev_boot_efi} #{@boot_efi_dir}")
+          end
+
+          def mount_boot
+            return if ! @dev_boot
+            Helpers::mkdir(@boot_dir)
+            exec("zfs mount #{@boot_pool_name}/BOOT/gentoo")
+          end
+
+          def exec(cmd)
+            @log.info("==> #{cmd}")
+            Helpers::sys(cmd)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,151 @@
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Partition < Getch::FileSystem::Zfs::Encrypt::Device
+          def initialize
+            super
+            @state = Getch::States.new()
+            @log = Getch::Log.new()
+            run_partition
+          end
+
+          def run_partition
+            return if STATES[:partition ]
+            clear_struct
+            cleaning
+            partition
+            zfs
+            @state.partition
+          end
+
+          private
+
+          def clear_struct
+            oldvg = `vgdisplay | grep #{@vg}`.chomp
+            oldzpool = `zpool status | grep pool:`.gsub(/pool: /, '').delete(' ').split("\n")
+            if oldzpool[0] != "" and $?.success?
+              oldzpool.each { |p| exec("zpool destroy #{p}") if p }
+            end
+            exec("vgremove -f #{@vg}") if oldvg != '' # remove older volume group
+            exec("pvremove -f #{@dev_root}") if oldvg != '' and File.exist? @dev_root # remove older volume group
+
+            exec("sgdisk -Z /dev/#{@disk}")
+            exec("wipefs -a /dev/#{@disk}")
+          end
+
+          # See https://wiki.archlinux.org/index.php/Solid_state_drive/Memory_cell_clearing
+          # for SSD
+          def cleaning
+            @bloc=`blockdev --getbsz /dev/#{@disk}`.chomp
+            puts
+            print "Cleaning data on #{@disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? (n,y) "
+            case gets.chomp
+            when /^y|^Y/
+              exec("dd if=/dev/urandom of=/dev/#{@disk} bs=#{@bloc} status=progress")
+            else
+              return
+            end
+          end
+
+          def partition
+            mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+            if Helpers::efi?
+              exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
+              exec("sgdisk -n2:0:+#{mem} -t2:8200 /dev/#{@disk}")
+              exec("sgdisk -n3:0:+0 -t3:BF00 /dev/#{@disk}")
+            else
+              exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
+              exec("sgdisk -n2:0:+2G -t2:BE00 /dev/#{@disk}") # boot pool GRUB
+              exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
+              exec("sgdisk -n4:0:+0 -t4:BF00 /dev/#{@disk}")
+            end
+          end
+
+          def zfs
+            ashift = case @bloc
+                     when 8096
+                       13
+                     when 4096
+                       12
+                     else # 512
+                       9
+                     end
+
+            Helpers::mkdir(MOUNTPOINT)
+
+            @log.debug("ashift found for #{@bloc} - #{ashift}")
+            if ! Helpers::efi? 
+              # https://openzfs.github.io/openzfs-docs/Getting%20Started/Ubuntu/Ubuntu%2020.04%20Root%20on%20ZFS.html
+              @log.info("Creating boot pool on #{@pool_name}")
+              exec("zpool create -f \\
+                -o ashift=#{ashift} -d \\
+                -o feature@async_destroy=enabled \\
+                -o feature@bookmarks=enabled \\
+                -o feature@embedded_data=enabled \\
+                -o feature@empty_bpobj=enabled \\
+                -o feature@enabled_txg=enabled \\
+                -o feature@extensible_dataset=enabled \\
+                -o feature@filesystem_limits=enabled \\
+                -o feature@hole_birth=enabled \\
+                -o feature@large_blocks=enabled \\
+                -o feature@lz4_compress=enabled \\
+                -o feature@spacemap_histogram=enabled \\
+                -O acltype=posixacl -O canmount=off -O compression=lz4 \\
+                -O devices=off -O normalization=formD -O atime=off -O xattr=sa \\
+                -O mountpoint=/boot -R #{MOUNTPOINT} \\
+                #{@boot_pool_name} #{@dev_boot}
+              ")
+            end
+
+            exec("zpool create -f -o ashift=#{ashift} \\
+              -O encryption=aes-256-gcm \\
+              -O keylocation=prompt -O keyformat=passphrase \\
+              -O acltype=posixacl -O canmount=off -O compression=lz4 \\
+              -O dnodesize=auto -O normalization=formD -O atime=off \\
+              -O xattr=sa -O mountpoint=/ -R #{MOUNTPOINT} \\
+              #{@pool_name} #{@dev_root}
+            ")
+
+            add_datasets
+          end
+
+          def add_datasets
+            exec("zfs create -o canmount=off -o mountpoint=none #{@pool_name}/ROOT")
+            exec("zfs create -o canmount=off -o mountpoint=none #{@boot_pool_name}/BOOT") if @dev_boot
+
+            exec("zfs create -o canmount=noauto -o mountpoint=/ #{@pool_name}/ROOT/gentoo")
+            # set bootfs
+            #exec("zpool set bootfs=#{@pool_name}/ROOT/gentoo #{@pool_name}")
+            exec("zfs create -o canmount=noauto -o mountpoint=/boot #{@boot_pool_name}/BOOT/gentoo") if @dev_boot
+
+            exec("zfs create -o canmount=off #{@pool_name}/ROOT/gentoo/usr")
+            exec("zfs create #{@pool_name}/ROOT/gentoo/usr/src")
+            exec("zfs create -o canmount=off #{@pool_name}/ROOT/gentoo/var")
+            exec("zfs create #{@pool_name}/ROOT/gentoo/var/log")
+            exec("zfs create #{@pool_name}/ROOT/gentoo/var/db")
+            exec("zfs create #{@pool_name}/ROOT/gentoo/var/tmp")
+
+            exec("zfs create -o canmount=off -o mountpoint=/ #{@pool_name}/USERDATA")
+            exec("zfs create -o canmount=on -o mountpoint=/root #{@pool_name}/USERDATA/root")
+            exec("zfs create -o canmount=on -o mountpoint=/home/#{@user} #{@pool_name}/USERDATA/#{@user}") if @user
+          end
+
+          # Follow https://wiki.archlinux.org/index.php/Partitioning
+          # Partition_efi
+          # /boot/efi - EFI system partition - 260MB
+          # /         - Root
+
+          # Partition_bios
+          # None      - Bios Boot Partition - 1MiB
+          # /boot     - Boot - 8300
+          # /         - Root
+
+          def exec(cmd)
+            Helpers::sys(cmd)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Getch
+  module FileSystem
+    module Zfs
+      class Format < Getch::FileSystem::Zfs::Device
+        def initialize
+          super
+          @state = Getch::States.new()
+          format
+        end
+
+        def format
+          return if STATES[:format]
+          system("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
+          system("mkswap -f #{@dev_swap}")
+          @state.format
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+require 'fileutils'
+
+module Getch
+  module FileSystem
+    module Zfs
+      class Mount < Getch::FileSystem::Zfs::Device
+        def initialize
+          super
+          @root_dir = MOUNTPOINT
+          @boot_dir = "#{@root_dir}/boot"
+          @boot_efi_dir = "#{@root_dir}/boot/efi"
+          @state = Getch::States.new()
+          @log = Getch::Log.new
+        end
+
+        def run
+          return if STATES[:mount]
+          exec("zpool export -a")
+          exec("rm -rf #{MOUNTPOINT}/*")
+          exec("zpool import -N -R #{MOUNTPOINT} #{@pool_name}")
+          exec("zpool import -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
+          mount_swap
+          mount_root
+          mount_boot
+          mount_boot_efi
+          exec("zfs mount -a")
+          @state.mount
+        end
+
+        private
+
+        def mount_swap
+          if Helpers::grep?('/proc/swaps', /^\/dev/)
+            exec("swapoff #{@dev_swap}")
+          end
+
+          exec("swapon #{@dev_swap}")
+        end
+
+        def mount_root
+          Helpers::mkdir(@root_dir)
+          exec("zfs mount #{@pool_name}/ROOT/gentoo")
+        end
+
+        def mount_boot_efi
+          return if ! @dev_boot_efi
+          Helpers::mkdir(@boot_efi_dir)
+          exec("mount #{@dev_boot_efi} #{@boot_efi_dir}")
+        end
+
+        def mount_boot
+          return if ! @dev_boot
+          Helpers::mkdir(@boot_dir)
+          exec("zfs mount #{@boot_pool_name}/BOOT/gentoo")
+        end
+
+        def exec(cmd)
+          @log.info("==> #{cmd}")
+          system(cmd)
+          unless $?.success?
+            raise "Error with #{cmd}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,147 @@
+module Getch
+  module FileSystem
+    module Zfs
+      class Partition < Getch::FileSystem::Zfs::Device
+        def initialize
+          super
+          @state = Getch::States.new()
+          @log = Getch::Log.new()
+          run_partition
+        end
+
+        def run_partition
+          return if STATES[:partition ]
+          clear_struct
+          cleaning
+          partition
+          zfs
+          @state.partition
+        end
+
+        private
+
+        def clear_struct
+          oldvg = `vgdisplay | grep #{@vg}`.chomp
+          oldzpool = `zpool status | grep pool:`.gsub(/pool: /, '').delete(' ').split("\n")
+          if oldzpool[0] != "" and $?.success?
+            oldzpool.each { |p| exec("zpool destroy #{p}") if p }
+          end
+          exec("vgremove -f #{@vg}") if oldvg != '' # remove older volume group
+          exec("pvremove -f #{@dev_root}") if oldvg != '' and File.exist? @dev_root # remove older volume group
+
+          exec("sgdisk -Z /dev/#{@disk}")
+          exec("wipefs -a /dev/#{@disk}")
+        end
+
+        # See https://wiki.archlinux.org/index.php/Solid_state_drive/Memory_cell_clearing
+        # for SSD
+        def cleaning
+          @bloc=`blockdev --getbsz /dev/#{@disk}`.chomp
+          puts
+          print "Cleaning data on #{@disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? (n,y) "
+          case gets.chomp
+          when /^y|^Y/
+            exec("dd if=/dev/urandom of=/dev/#{@disk} bs=#{@bloc} status=progress")
+          else
+            return
+          end
+        end
+
+        def partition
+          mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+          if Helpers::efi?
+            exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
+            exec("sgdisk -n2:0:+#{mem} -t2:8200 /dev/#{@disk}")
+            exec("sgdisk -n3:0:+0 -t3:BF00 /dev/#{@disk}")
+          else
+            exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
+            exec("sgdisk -n2:0:+2G -t2:BE00 /dev/#{@disk}") # boot pool GRUB
+            exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
+            exec("sgdisk -n4:0:+0 -t4:BF00 /dev/#{@disk}")
+          end
+        end
+
+        def zfs
+          ashift = case @bloc
+            when 8096
+              13
+            when 4096
+              12
+            else # 512
+              9
+            end
+
+          Helpers::mkdir(MOUNTPOINT)
+            
+          @log.debug("ashift found for #{@bloc} - #{ashift}")
+          if ! Helpers::efi? 
+            # https://openzfs.github.io/openzfs-docs/Getting%20Started/Ubuntu/Ubuntu%2020.04%20Root%20on%20ZFS.html
+            @log.info("Creating boot pool on #{@pool_name}")
+            exec("zpool create -f \\
+              -o ashift=#{ashift} -d \\
+              -o feature@async_destroy=enabled \\
+              -o feature@bookmarks=enabled \\
+              -o feature@embedded_data=enabled \\
+              -o feature@empty_bpobj=enabled \\
+              -o feature@enabled_txg=enabled \\
+              -o feature@extensible_dataset=enabled \\
+              -o feature@filesystem_limits=enabled \\
+              -o feature@hole_birth=enabled \\
+              -o feature@large_blocks=enabled \\
+              -o feature@lz4_compress=enabled \\
+              -o feature@spacemap_histogram=enabled \\
+              -O acltype=posixacl -O canmount=off -O compression=lz4 \\
+              -O devices=off -O normalization=formD -O atime=off -O xattr=sa \\
+              -O mountpoint=/boot -R #{MOUNTPOINT} \\
+              #{@boot_pool_name} #{@dev_boot}
+            ")
+          end
+
+          exec("zpool create -f -o ashift=#{ashift} \\
+            -O acltype=posixacl -O canmount=off -O compression=lz4 \\
+            -O dnodesize=auto -O normalization=formD -O atime=off \\
+            -O xattr=sa -O mountpoint=/ -R #{MOUNTPOINT} \\
+            #{@pool_name} #{@dev_root}
+          ")
+
+          add_datasets
+        end
+
+        def add_datasets
+          exec("zfs create -o canmount=off -o mountpoint=none #{@pool_name}/ROOT")
+          exec("zfs create -o canmount=off -o mountpoint=none #{@boot_pool_name}/BOOT") if @dev_boot
+
+          exec("zfs create -o canmount=noauto -o mountpoint=/ #{@pool_name}/ROOT/gentoo")
+          # set bootfs
+          #exec("zpool set bootfs=#{@pool_name}/ROOT/gentoo #{@pool_name}")
+          exec("zfs create -o canmount=noauto -o mountpoint=/boot #{@boot_pool_name}/BOOT/gentoo") if @dev_boot
+
+          exec("zfs create -o canmount=off #{@pool_name}/ROOT/gentoo/usr")
+          exec("zfs create #{@pool_name}/ROOT/gentoo/usr/src")
+          exec("zfs create -o canmount=off #{@pool_name}/ROOT/gentoo/var")
+          exec("zfs create #{@pool_name}/ROOT/gentoo/var/log")
+          exec("zfs create #{@pool_name}/ROOT/gentoo/var/db")
+          exec("zfs create #{@pool_name}/ROOT/gentoo/var/tmp")
+
+          exec("zfs create -o canmount=off -o mountpoint=/ #{@pool_name}/USERDATA")
+          exec("zfs create -o canmount=on -o mountpoint=/root #{@pool_name}/USERDATA/root")
+          exec("zfs create -o canmount=on -o mountpoint=/home/#{@user} #{@pool_name}/USERDATA/#{@user}") if @user
+        end
+
+        # Follow https://wiki.archlinux.org/index.php/Partitioning
+        # Partition_efi
+        # /boot/efi - EFI system partition - 260MB
+        # /         - Root
+
+        # Partition_bios
+        # None      - Bios Boot Partition - 1MiB
+        # /boot     - Boot - 8300
+        # /         - Root
+
+        def exec(cmd)
+          Getch::Command.new(cmd).run!
+        end
+      end
+    end
+  end
+end

data/lib/getch/gentoo/boot.rb

@@ -13,7 +13,8 @@ module Getch
         @config.fstab
         bootloader
         password
-        umount
+        cleanup
+        the_end
       end
 
       def bootloader
@@ -74,13 +75,25 @@ module Getch
         end
       end
 
-      def umount
-        Helpers::exec_or_die("umount -l /mnt/gentoo/dev{/shm,/pts,}")
-        Helpers::exec_or_die("umount -R #{MOUNTPOINT}")
-        puts "Reboot when you have done"
+      private
+
+      def cleanup
+        Getch::Emerge.new("emerge --depclean").run!
       end
 
-      private
+      def the_end
+        #Helpers::exec_or_die("umount -l /mnt/gentoo/dev{/shm,/pts,}")
+        #Helpers::exec_or_die("umount -R #{MOUNTPOINT}")
+        puts
+        puts "getch has finish, before reboot, you can:"
+        puts "  +  Chroot on your system with: chroot #{MOUNTPOINT} /bin/bash"
+        puts "  +  Install more packages like networkmanager or emacs"
+        puts
+        puts "  +  Add more modules for your kernel (graphic, wifi card) and recompile it with:"
+        puts "  genkernel --kernel-config=/usr/src/linux/.config all  "
+        puts
+        puts "Reboot the system when you have done !"
+      end
 
       def exec_chroot(cmd)
         script = "chroot #{MOUNTPOINT} /bin/bash -c \"

data/lib/getch/gentoo/sources.rb

@@ -7,7 +7,6 @@ module Getch
       end
 
       def build_others
-        install_zfs if ismatch?('zfs')
         virtualbox_guest
         qemu_guest
         install_wifi
@@ -20,10 +19,10 @@ module Getch
       end
 
       def make
-        if DEFAULT_OPTIONS[:fs] == 'lvm' or DEFAULT_OPTIONS[:encrypt]
+        if DEFAULT_OPTIONS[:fs] == 'lvm' || DEFAULT_OPTIONS[:fs] == 'zfs' || DEFAULT_OPTIONS[:encrypt]
           @filesystem.make
         else
-          just_make
+          make_kernel
         end
       end
 
@@ -33,11 +32,7 @@ module Getch
 
       private
 
-      def only_make
-        Getch::Make.new("make -j$(nproc)").run!
-      end
-
-      def just_make
+      def make_kernel
         puts "Compiling kernel sources"
         cmd = "make -j$(nproc) && make modules_install && make install"
         Getch::Make.new(cmd).run!
@@ -46,7 +41,8 @@ module Getch
       end
 
       def virtualbox_guest
-        return if ! ismatch?('vmwgfx')
+        systemd=`systemd-detect-virt`.chomp
+        return if ! ismatch?('vmwgfx') || systemd.match(/none/)
         garden("-a virtualbox-guest")
         Getch::Emerge.new("app-emulation/virtualbox-guest-additions").pkg!
       end
@@ -76,13 +72,6 @@ module Getch
         garden("-a sound")
       end
 
-      def install_zfs
-        return if ! DEFAULT_OPTIONS[:fs] == 'zfs'
-        garden("-a zfs")
-        only_make # a first 'make' is necessary before emerge zfs
-        Getch::Emerge.new("sys-fs/zfs").pkg!
-      end
-
       def wifi_drivers
         garden("-a ath9k-driver") if ismatch?('ath9k')
       end

data/lib/getch/helpers.rb

@@ -1,7 +1,6 @@
 require 'open-uri'
 require 'open3'
 require 'fileutils'
-require_relative 'command'
 
 module Helpers
   def self.efi?
@@ -31,20 +30,12 @@ module Helpers
     File.write path, content if ! File.exist? path
   end
 
-  def self.emerge(pkgs, path)
-    cmd = "chroot #{path} /bin/bash -c \"
-      source /etc/profile
-      emerge --changed-use #{pkgs}
-    \""
-    Getch::Command.new(cmd).run!
+  def self.mkdir(dir)
+    FileUtils.mkdir_p dir if ! Dir.exist? dir
   end
 
-  def self.run_chroot(cmd, path)
-    script = "chroot #{path} /bin/bash -c \"
-      source /etc/profile
-      #{cmd}
-    \""
-    Getch::Command.new(script).run!
+  def self.touch(file)
+    File.write file, '' if ! File.exist? file
   end
 
   def self.grep?(file, regex)

data/lib/getch/version.rb

@@ -1,3 +1,3 @@
 module Getch
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -83,6 +83,20 @@ files:
 - lib/getch/filesystem/lvm/format.rb
 - lib/getch/filesystem/lvm/mount.rb
 - lib/getch/filesystem/lvm/partition.rb
+- lib/getch/filesystem/zfs.rb
+- lib/getch/filesystem/zfs/config.rb
+- lib/getch/filesystem/zfs/deps.rb
+- lib/getch/filesystem/zfs/device.rb
+- lib/getch/filesystem/zfs/encrypt.rb
+- lib/getch/filesystem/zfs/encrypt/config.rb
+- lib/getch/filesystem/zfs/encrypt/deps.rb
+- lib/getch/filesystem/zfs/encrypt/device.rb
+- lib/getch/filesystem/zfs/encrypt/format.rb
+- lib/getch/filesystem/zfs/encrypt/mount.rb
+- lib/getch/filesystem/zfs/encrypt/partition.rb
+- lib/getch/filesystem/zfs/format.rb
+- lib/getch/filesystem/zfs/mount.rb
+- lib/getch/filesystem/zfs/partition.rb
 - lib/getch/gentoo.rb
 - lib/getch/gentoo/boot.rb
 - lib/getch/gentoo/chroot.rb
@@ -116,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A CLI tool to install Gentoo