getch 0.1.2 → 0.1.9

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm
       class Partition < Getch::FileSystem::Lvm::Device
         def initialize
           super
-          @state = Getch::States.new()
+          @state = Getch::States.new
           @partition = Getch::FileSystem::Partition.new
           @clean = Getch::FileSystem::Clean
           run_partition
@@ -12,9 +14,10 @@ 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
@@ -23,13 +26,13 @@ module Getch
         private
 
         def partition
-          if Helpers::efi?
+          if Helpers.efi?
             @partition.efi(@dev_esp)
-            @partition.root(@dev_root, "8e00")
+            @partition.root(@dev_root, '8e00')
           else
             @partition.gpt(@dev_gpt)
             @partition.boot(@dev_boot)
-            @partition.root(@dev_root, "8e00")
+            @partition.root(@dev_root, '8e00')
           end
         end
 
@@ -47,7 +50,7 @@ module Getch
             exec("lvcreate -y -Wy -Zy -l 100%FREE -n root #{@vg}")
           end
 
-          exec("vgchange --available y")
+          exec('vgchange --available y')
         end
 
         # Follow https://wiki.archlinux.org/index.php/Partitioning

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Getch
+  module FileSystem
+    module Lvm
+      class Void < Device
+        include Helpers::Void
+
+        attr_reader :boot_disk
+
+        def fstab
+          conf = "#{MOUNTPOINT}/etc/fstab"
+          File.write(conf, "\n", mode: 'w', chmod: 0644)
+          line_fstab(@dev_esp, '/efi vfat noauto,rw,relatime 0 0') if @dev_esp
+          line_fstab(@dev_boot, '/boot ext4 noauto,rw,relatime 0 0') if @dev_boot
+          add_line(conf, "#{@lv_swap} swap swap rw,noatime,discard 0 0") if @lv_swap
+          add_line(conf, "#{@lv_home} /home/#{@user} ext4 rw,noatime,discard 0 2") if @lv_home
+          add_line(conf, "#{@lv_root} / ext4 rw,relatime 0 1")
+          add_line(conf, 'tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0')
+        end
+
+        def config_dracut
+          conf = "#{MOUNTPOINT}/etc/dracut.conf.d/lvm.conf"
+          # dracut: value+= should be surrounding by white space
+          content = [
+            "hostonly=\"yes\"",
+            "omit_dracutmodules+=\" btrfs \"",
+            ""
+          ]
+          File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
+        end
+
+        def kernel_cmdline_dracut
+          conf = "#{MOUNTPOINT}/etc/dracut.conf.d/cmdline.conf"
+          c="kernel_cmdline=\"rd.lvm.vg=#{@vg} rootflags=rw,relatime\""
+          File.write(conf, "#{c}\n", mode: 'w', chmod: 0644)
+        end
+
+        def finish
+          puts '+ Enter in your system: chroot /mnt /bin/bash'
+          puts '+ Reboot with: shutdown -r now'
+        end
+      end
+    end
+  end
+end

data/lib/getch/filesystem/lvm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Lvm
@@ -11,4 +13,5 @@ require_relative 'lvm/format'
 require_relative 'lvm/mount'
 require_relative 'lvm/config'
 require_relative 'lvm/deps'
+require_relative 'lvm/void'
 require_relative 'lvm/encrypt'

data/lib/getch/filesystem/mount.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Getch
@@ -8,13 +10,14 @@ module Getch
         @boot_dir = "#{@root_dir}/boot"
         @boot_efi_dir = "#{@root_dir}/efi"
         @home_dir = "#{@root_dir}/home"
-        @state = Getch::States.new()
+        @state = Getch::States.new
         @log = Getch::Log.new
       end
 
       def swap(dev)
-        return if ! dev
-        if Helpers::grep?('/proc/swaps', /^\/dev/)
+        return unless dev
+
+        if Helpers.grep?('/proc/swaps', /^\/dev/)
           exec("swapoff #{dev}")
         end
 
@@ -22,26 +25,30 @@ module Getch
       end
 
       def root(dev)
-        return if ! dev
-        Helpers::mkdir(@root_dir)
+        return unless dev
+
+        Helpers.mkdir(@root_dir)
         exec("mount #{dev} #{@root_dir}")
       end
 
       def esp(dev)
-        return if ! dev
-        Helpers::mkdir(@boot_efi_dir)
+        return unless dev
+
+        Helpers.mkdir(@boot_efi_dir)
         exec("mount #{dev} #{@boot_efi_dir}")
       end
 
       def boot(dev)
-        return if ! dev
-        Helpers::mkdir(@boot_dir)
+        return unless dev
+
+        Helpers.mkdir(@boot_dir)
         exec("mount #{dev} #{@boot_dir}")
       end
 
       def home(dev)
-        return if ! dev
-        Helpers::mkdir(@home_dir)
+        return unless dev
+
+        Helpers.mkdir(@home_dir)
         exec("mount #{dev} #{@home_dir}")
       end
 
@@ -49,7 +56,7 @@ module Getch
 
       def exec(cmd)
         @log.info("==> #{cmd}")
-        Helpers::sys(cmd)
+        Helpers.sys(cmd)
       end
     end
   end

data/lib/getch/filesystem/partition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     class Partition
@@ -6,17 +8,19 @@ module Getch
       end
 
       def gpt(dev)
-        return if ! dev
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
         exec("sgdisk -n#{part}:1MiB:+1MiB -t#{part}:EF02 #{disk}")
       end
 
       def boot(dev)
-        return if ! dev
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
-        if DEFAULT_OPTIONS[:fs] == "zfs"
+        if Getch::OPTIONS[:fs] == 'zfs'
           exec("sgdisk -n#{part}:0:+2G -t#{part}:BE00 #{disk}")
         else
           exec("sgdisk -n#{part}:0:+128MiB -t#{part}:8300 #{disk}")
@@ -24,17 +28,19 @@ module Getch
       end
 
       def efi(dev)
-        return if ! dev
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
         exec("sgdisk -n#{part}:1M:+260M -t#{part}:EF00 #{disk}")
       end
 
       def swap(dev)
-        return if ! dev
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
-        if DEFAULT_OPTIONS[:cache_disk]
+        if Getch::OPTIONS[:cache_disk]
           exec("sgdisk -n#{part}:0:0 -t#{part}:8200 #{disk}")
         else
           mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
@@ -43,17 +49,19 @@ module Getch
       end
 
       def root(dev, code)
-        return if ! dev
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
         exec("sgdisk -n#{part}:0:0 -t#{part}:#{code} #{disk}")
       end
 
       def home(dev, code)
-        return if ! dev
+        return unless dev
+
         disk = disk_name(dev)
         part = dev.match(/[0-9]/)
-        if DEFAULT_OPTIONS[:home_disk]
+        if Getch::OPTIONS[:home_disk]
           exec("sgdisk -n#{part}:0:0 -t#{part}:#{code} #{disk}")
         end
       end
@@ -66,8 +74,8 @@ module Getch
 
       def exec(cmd)
         @log.debug "Partition disk with #{cmd}"
-        if DEFAULT_OPTIONS[:encrypt]
-          Helpers::sys(cmd)
+        if Getch::OPTIONS[:encrypt]
+          Helpers.sys(cmd)
         else
           Getch::Command.new(cmd).run!
         end

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

@@ -1,41 +1,27 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
-      class Config < Getch::FileSystem::Zfs::Device
+      class Config < Device
         def initialize
           super
           gen_uuid
-          @root_dir = MOUNTPOINT
           @init = '/usr/lib/systemd/systemd'
         end
 
         def fstab
-          file = "#{@root_dir}/etc/fstab"
+          file = "#{MOUNTPOINT}/etc/fstab"
           datas = data_fstab
-          File.write(file, datas.join("\n"))
-        end
-
-        def systemd_boot
-          return if ! Helpers::efi? 
-          esp = '/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"))
+          File.write file, 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=\"resume=UUID=#{@uuid_swap} root=ZFS=#{@pool_name}/ROOT/gentoo init=#{@init} dozfs\""
-          ]
-          File.write("#{file}", cmdline.join("\n"), mode: 'a')
+        # https://github.com/openzfs/zfs/blob/master/contrib/dracut/README.dracut.markdown
+        def cmdline
+          src = "#{MOUNTPOINT}/etc/dracut.conf.d/cmdline.conf"
+          line = "kernel_cmdline=\"resume=UUID=#{@uuid_swap} root=zfs:#{@pool_name}/ROOT/#{@n} init=#{@init} zfs.force=1 zfs.zfs_arc_max=536870912\""
+          Helpers.echo src, line
         end
 
         private

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

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
-      class Deps < Getch::FileSystem::Zfs::Device
+      class Deps < Device
         def make
           unstable_zfs
           install_deps
           zfs_mountpoint
-          auto_module_rebuild
           hostid
-          options_make
-          Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+          config_dracut
+          zed_update_path
         end
 
         private
@@ -17,75 +18,44 @@ module Getch
         def unstable_zfs
           conf = "#{MOUNTPOINT}/etc/portage/package.accept_keywords/zfs"
           data = [
-            "sys-fs/zfs-kmod",
-            "sys-fs/zfs"
+            'sys-fs/zfs-kmod',
+            'sys-fs/zfs'
           ]
-          File.write(conf, data.join("\n"), mode: "w")
+          File.write(conf, data.join("\n"), mode: 'w')
         end
 
         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::Bask.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!
+          Getch::Emerge.new('sys-kernel/gentoo-kernel').pkg!
+          Getch::Emerge.new('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")
+          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')
+          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)
+        def zed_update_path
+          Dir.glob("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/*").each { |f|
+            unless system('sed', '-Ei', "s|#{MOUNTPOINT}/?|/|", f)
+              raise 'system exec sed'
+            end
+          }
         end
 
         def hostid
-          hostid_value=`hostid`.chomp
-          File.write("#{MOUNTPOINT}/etc/hostid", hostid_value, mode: 'w')
+          exec 'zgenhostid $(hostid)'
         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')
+        def config_dracut
+          conf = "#{MOUNTPOINT}/etc/dracut.conf.d/zfs.conf"
+          content = 'hostonly="yes"'
+          Helpers.echo conf, content
         end
 
         def exec(cmd)

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

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
       class Device < Getch::FileSystem::Device
         def initialize
           super
-          @id = Helpers::pool_id(@dev_root)
+          @id = Helpers.pool_id(@dev_root)
           @boot_pool_name = "bpool-#{@id}"
           @pool_name = "rpool-#{@id}"
           @zfs_home = @user ? true : false
+          @n = Getch::OPTIONS[:os]
         end
         
         private
@@ -16,9 +19,14 @@ module Getch
           if @efi
             if @boot_disk
               @dev_esp = "/dev/#{@boot_disk}1"
+              @dev_boot = "/dev/#{@boot_disk}2" if Getch::OPTIONS[:os] == 'void'
             else
               @dev_esp = "/dev/#{@disk}1"
               @root_part += 1
+              if Getch::OPTIONS[:os] == 'void'
+                @dev_boot = "/dev/#{@disk}#{@root_part}"
+                @root_part += 1
+              end
             end
           else
             if @boot_disk

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

@@ -1,62 +1,46 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Config < Getch::FileSystem::Zfs::Encrypt::Device
+        class Config < Device
           def initialize
             super
             gen_uuid
-            @root_dir = MOUNTPOINT
             @init = '/usr/lib/systemd/systemd'
             crypttab
           end
 
           def fstab
-            file = "#{@root_dir}/etc/fstab"
+            file = "#{MOUNTPOINT}/etc/fstab"
             datas = data_fstab
             File.write(file, datas.join("\n"))
           end
 
-          def systemd_boot
-            return if ! @efi
-            esp = '/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"))
+          def cmdline
+            src = "#{MOUNTPOINT}/etc/dracut.conf.d/cmdline.conf"
+            line = "kernel_cmdline=\"root=zfs:#{@pool_name}/ROOT/#{@n} init=#{@init} rd.vconsole.keymap=#{Getch::OPTIONS[:keymap]} zfs.force=1 zfs.zfs_arc_max=536870912\""
+            Helpers.echo src, line
           end
 
           def crypttab
             datas = [
-              "cryptswap PARTUUID=#{@partuuid_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=512"
-            ]
-            File.write("#{@root_dir}/etc/crypttab", datas.join("\n"))
-          end
-
-          # See https://wiki.gentoo.org/wiki/ZFS#ZFS_root
-          def grub
-            return if @efi
-            file = "#{@root_dir}/etc/default/grub"
-            cmdline = [ 
-              "GRUB_CMDLINE_LINUX=\"root=ZFS=#{@pool_name}/ROOT/gentoo init=#{@init} dozfs keymap=#{DEFAULT_OPTIONS[:keymap]}\""
+              "cryptswap PARTUUID=#{@partuuid_swap} /dev/urandom swap,discard,cipher=aes-xts-plain64:sha256,size=512"
             ]
-            File.write("#{file}", cmdline.join("\n"), mode: 'a')
+            File.write("#{MOUNTPOINT}/etc/crypttab", datas.join("\n"))
           end
 
           private
 
           def gen_uuid
-            @partuuid_swap = Helpers::partuuid(@dev_swap)
+            @partuuid_swap = Helpers.partuuid(@dev_swap)
             @uuid_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
           end
 
           def data_fstab
             boot_efi = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
-            swap = @dev_swap ? "/dev/mapper/cryptswap none swap discard 0 0" : ''
+            swap = @dev_swap ? '/dev/mapper/cryptswap none swap sw 0 0' : ''
 
             [ boot_efi, swap ]
           end