getch 0.1.5 → 0.1.6

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

@@ -0,0 +1,43 @@
+require_relative '../../helpers'
+
+module Getch
+  module FileSystem
+    module Ext4
+      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_swap, "swap swap rw,noatime,discard 0 0") if @dev_swap
+          line_fstab(@dev_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/ext4.conf"
+          # dracut: value+= should be surrounding by white space
+          content = [
+            "hostonly=\"yes\"",
+            "omit_dracutmodules+=\" btrfs lvm \"",
+            ""
+          ]
+          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=\"root=#{@dev_root} rootfstype=ext4 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

@@ -11,4 +11,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/lvm/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/lvm/encrypt/config.rb

@@ -25,7 +25,7 @@ module Getch
               'title Gentoo Linux',
               'linux /vmlinuz',
               'initrd /initramfs',
-              "options crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root real_root=#{@lv_root} init=#{@init} keymap=#{DEFAULT_OPTIONS[:keymap]} dolvm rw"
+              "options crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root real_root=#{@lv_root} init=#{@init} keymap=#{Getch::OPTIONS[:keymap]} dolvm rw"
             ]
             File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
           end
@@ -41,7 +41,7 @@ module Getch
             return if Helpers::efi?
             file = "#{@root_dir}/etc/default/grub"
             cmdline = [ 
-              "GRUB_CMDLINE_LINUX=\"crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root real_root=#{@lv_root} init=#{@init} dolvm 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 real_root=#{@lv_root} init=#{@init} dolvm 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')

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

@@ -2,7 +2,7 @@ module Getch
   module FileSystem
     module Lvm
       module Encrypt
-        class Format < Getch::FileSystem::Lvm::Encrypt::Device
+        class Format < Device
           def initialize
             super
             @fs = 'ext4'
@@ -15,7 +15,6 @@ module Getch
             puts "Format #{@disk}"
             exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
             exec("mkfs.#{@fs} -F #{@dev_boot}") if @dev_boot
-            exec("mkswap -f #{@lv_swap}")
             exec("mkfs.#{@fs} -F #{@lv_root}")
             exec("mkfs.#{@fs} -F #{@lv_home}") if @lv_home
             @state.format

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

@@ -2,7 +2,7 @@ module Getch
   module FileSystem
     module Lvm
       module Encrypt
-        class Mount < Getch::FileSystem::Lvm::Encrypt::Device
+        class Mount < Device
           def initialize
             super
             @mount = Getch::FileSystem::Mount.new
@@ -11,7 +11,6 @@ module Getch
 
           def run
             return if STATES[:mount]
-            @mount.swap(@lv_swap)
             @mount.root(@lv_root)
             @mount.boot(@dev_boot)
             @mount.esp(@dev_esp)

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

@@ -1,8 +1,12 @@
+require_relative '../../../helpers'
+
 module Getch
   module FileSystem
     module Lvm
       module Encrypt
-        class Partition < Getch::FileSystem::Lvm::Encrypt::Device
+        class Partition < Device
+          include Helpers::Cryptsetup
+
           def initialize
             super
             @state = Getch::States.new()
@@ -19,7 +23,7 @@ module Getch
             @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
 
             partition
-            encrypt
+            encrypting
             lvm
             @state.partition
           end
@@ -37,11 +41,10 @@ module Getch
             end
           end
 
-          def encrypt
-            @log.info("Format root")
-            Helpers::sys("cryptsetup luksFormat #{@dev_root}")
-            @log.debug("Opening root")
-            Helpers::sys("cryptsetup open --type luks #{@dev_root} cryptroot")
+          def encrypting
+            @log.info("Cryptsetup")
+            encrypt(@dev_root)
+            open_crypt(@dev_root, "cryptroot")
           end
 
           def lvm

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

@@ -0,0 +1,100 @@
+require_relative '../../../helpers'
+
+module Getch
+  module FileSystem
+    module Lvm
+      module Encrypt
+        class Void < Device
+          include Helpers::Void
+          attr_reader :boot_disk
+
+          # Create key to avoid enter password twice
+          def create_key
+            add_key("volume.key", @dev_root)
+            add_key("home.key", @dev_home) if @home_disk
+          end
+
+          # Key need to be added in dracut.conf.d and crypttab
+          def add_key(name, dev)
+            command "dd bs=1 count=64 if=/dev/urandom of=/boot/#{name}"
+            puts " => Creating a key for #{dev}, password required:"
+            chroot "cryptsetup luksAddKey #{dev} /boot/#{name}"
+            command "chmod 000 /boot/#{name}"
+            #command "chmod -R g-rwx,o-rwx /boot"
+          end
+
+          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, "/dev/mapper/cryptswap none swap sw 0 0")
+            add_line(conf, "#{@lv_home} /home ext4 rw,discard 0 0") if @home_disk
+            add_line(conf, "#{@lv_root} / ext4 rw,relatime 0 1")
+            add_line(conf, "tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0")
+          end
+
+          def crypttab
+            conf = "#{MOUNTPOINT}/etc/crypttab"
+            File.write(conf, "\n", mode: 'w', chmod: 0644)
+            add_line(conf, "cryptswap #{@lv_swap} /dev/urandom swap,discard,cipher=aes-xts-plain64:sha256,size=512")
+            line_crypttab(@vg, @dev_root, "/boot/volume.key", "luks")
+            line_crypttab("crypthome", @dev_home, "/boot/home.key", "luks") if @home_disk
+          end
+
+          def config_grub
+            conf = "#{MOUNTPOINT}/etc/default/grub"
+            content = "GRUB_ENABLE_CRYPTODISK=y"
+            unless search(conf, content)
+              File.write(conf, "#{content}\n", mode: 'a')
+            end
+          end
+
+          def config_dracut
+            conf = "#{MOUNTPOINT}/etc/dracut.conf.d/lvm.conf"
+            content = [
+              "hostonly=\"yes\"",
+              "omit_dracutmodules+=\" btrfs \"",
+              "install_items+=\" /boot/volume.key /etc/crypttab \"",
+              ""
+            ]
+            File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
+            #add_line(conf, "install_items+=\" /boot/home.key \"") if @home_disk
+          end
+
+          def kernel_cmdline_dracut
+            conf = "#{MOUNTPOINT}/etc/dracut.conf.d/cmdline.conf"
+            root_uuid = b_uuid(@dev_root)
+            args = "rd.lvm.vg=#{@vg} rd.luks.uuid=#{root_uuid} rootflags=rw,relatime"
+            line = "kernel_cmdline=\"#{args}\""
+            File.write(conf, "#{line}\n", mode: 'w', chmod: 0644)
+          end
+
+          def finish
+            puts "+ Enter in your system: chroot /mnt /bin/bash"
+            puts "+ Reboot with: shutdown -r now"
+          end
+
+          private
+
+          def b_uuid(dev)
+            device = dev.delete_prefix("/dev/")
+            Dir.glob("/dev/disk/by-uuid/*").each { |f|
+              link = File.readlink(f)
+              return f.delete_prefix("/dev/disk/by-uuid/") if link.match(/#{device}$/)
+            }
+          end
+
+          # line_crypttab("cryptswap", "sda2", "/dev/urandom", "luks")
+          def line_crypttab(mapname, dev, point, rest)
+            conf = "#{MOUNTPOINT}/etc/crypttab"
+            device = s_uuid(dev)
+            raise "No partuuid for #{dev} #{device}" if !device
+            raise "Bad partuuid for #{dev} #{device}" if device.kind_of? Array
+            add_line(conf, "#{mapname} PARTUUID=#{device} #{point} #{rest}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Getch
       class Format < Getch::FileSystem::Lvm::Device
         def initialize
           super
-          @state = Getch::States.new()
+          @state = Getch::States.new
           format
         end
 

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

@@ -0,0 +1,45 @@
+require_relative '../../helpers'
+
+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/partition.rb

@@ -16,7 +16,7 @@ module Getch
         return if ! 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}")
@@ -34,7 +34,7 @@ module Getch
         return if ! 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'
@@ -53,7 +53,7 @@ module Getch
         return if ! 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,7 +66,7 @@ module Getch
 
       def exec(cmd)
         @log.debug "Partition disk with #{cmd}"
-        if DEFAULT_OPTIONS[:encrypt]
+        if Getch::OPTIONS[:encrypt]
           Helpers::sys(cmd)
         else
           Getch::Command.new(cmd).run!

data/lib/getch/filesystem/zfs.rb

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

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

@@ -1,7 +1,7 @@
 module Getch
   module FileSystem
     module Zfs
-      class Config < Getch::FileSystem::Zfs::Device
+      class Config < Device
         def initialize
           super
           gen_uuid
@@ -23,7 +23,7 @@ module Getch
             'title Gentoo Linux',
             'linux /vmlinuz',
             'initrd /initramfs',
-            "options resume=UUID=#{@uuid_swap} root=ZFS=#{@pool_name}/ROOT/gentoo init=#{@init} dozfs"
+            "options resume=UUID=#{@uuid_swap} root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs"
           ]
           File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
         end
@@ -33,7 +33,7 @@ module Getch
           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\""
+            "GRUB_CMDLINE_LINUX=\"resume=UUID=#{@uuid_swap} root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs\""
           ]
           File.write("#{file}", cmdline.join("\n"), mode: 'a')
         end

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

@@ -1,7 +1,7 @@
 module Getch
   module FileSystem
     module Zfs
-      class Deps < Getch::FileSystem::Zfs::Device
+      class Deps < Device
         def make
           unstable_zfs
           install_deps
@@ -10,6 +10,7 @@ module Getch
           hostid
           options_make
           Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+          zed_update_path
         end
 
         private
@@ -37,11 +38,18 @@ module Getch
           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 zed_update_path
+          Dir.glob("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/*").each { |f|
+            if !system("sed", "-Ei", "s|#{MOUNTPOINT}/?|/|", f)
+              raise "system exec sed"
+            end
+          }
+        end
+
         def auto_module_rebuild
           g_dir="#{MOUNTPOINT}/etc/portage/env/sys-kernel"
           Helpers::mkdir(g_dir)
@@ -64,8 +72,7 @@ EOF
         end
 
         def hostid
-          hostid_value=`hostid`.chomp
-          File.write("#{MOUNTPOINT}/etc/hostid", hostid_value, mode: 'w')
+          exec "zgenhostid $(hostid)"
         end
 
         def options_make

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

@@ -8,6 +8,7 @@ module Getch
           @boot_pool_name = "bpool-#{@id}"
           @pool_name = "rpool-#{@id}"
           @zfs_home = @user ? true : false
+          @n = Getch::OPTIONS[:os]
         end
         
         private
@@ -16,9 +17,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