getch 0.1.5 → 0.1.6

data/lib/getch/filesystem/zfs/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/zfs/encrypt/config.rb

@@ -2,7 +2,7 @@ module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Config < Getch::FileSystem::Zfs::Encrypt::Device
+        class Config < Device
           def initialize
             super
             gen_uuid
@@ -25,14 +25,14 @@ module Getch
               'title Gentoo Linux',
               'linux /vmlinuz',
               'initrd /initramfs',
-              "options root=ZFS=#{@pool_name}/ROOT/gentoo init=#{@init} dozfs keymap=#{DEFAULT_OPTIONS[:keymap]}"
+              "options root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs keymap=#{Getch::OPTIONS[:keymap]}"
             ]
             File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
           end
 
           def crypttab
             datas = [
-              "cryptswap PARTUUID=#{@partuuid_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=512"
+              "cryptswap PARTUUID=#{@partuuid_swap} /dev/urandom swap,discard,cipher=aes-xts-plain64:sha256,size=512"
             ]
             File.write("#{@root_dir}/etc/crypttab", datas.join("\n"))
           end
@@ -42,7 +42,7 @@ module Getch
             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]}\""
+              "GRUB_CMDLINE_LINUX=\"root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs keymap=#{Getch::OPTIONS[:keymap]}\""
             ]
             File.write("#{file}", cmdline.join("\n"), mode: 'a')
           end
@@ -56,7 +56,7 @@ module Getch
 
           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

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

@@ -2,7 +2,7 @@ module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Deps < Getch::FileSystem::Zfs::Encrypt::Device
+        class Deps < Device
           def make
             unstable_zfs
             install_deps
@@ -11,6 +11,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/encrypt/device.rb

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

@@ -2,7 +2,7 @@ module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Format < Getch::FileSystem::Zfs::Encrypt::Device
+        class Format < Device
           def initialize
             super
             @log = Getch::Log.new()
@@ -22,7 +22,6 @@ module Getch
             return if STATES[:format]
             raise "Error, no id found for #{@dev_root}." if ! @id
             system("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
-            system("mkswap -f #{@dev_swap}")
             zfs
             datasets
             @state.format
@@ -79,15 +78,15 @@ module Getch
             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")
-            exec("zfs create -o canmount=noauto -o mountpoint=/boot #{@boot_pool_name}/BOOT/gentoo") if @dev_boot
+            exec("zfs create -o canmount=noauto -o mountpoint=/ #{@pool_name}/ROOT/#{@n}")
+            exec("zfs create -o canmount=noauto -o mountpoint=/boot #{@boot_pool_name}/BOOT/#{@n}") 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 #{@pool_name}/ROOT/#{@n}/usr")
+            exec("zfs create #{@pool_name}/ROOT/#{@n}/usr/src")
+            exec("zfs create -o canmount=off #{@pool_name}/ROOT/#{@n}/var")
+            exec("zfs create #{@pool_name}/ROOT/#{@n}/var/log")
+            exec("zfs create #{@pool_name}/ROOT/#{@n}/var/db")
+            exec("zfs create #{@pool_name}/ROOT/#{@n}/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")

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

@@ -1,13 +1,10 @@
-require 'fileutils'
-
 module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Mount < Getch::FileSystem::Zfs::Encrypt::Device
+        class Mount < Device
           def initialize
             super
-            @root_dir = MOUNTPOINT
             @mount = Getch::FileSystem::Mount.new
             @state = Getch::States.new
             @log = Getch::Log.new
@@ -18,9 +15,8 @@ module Getch
             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("zpool import -f -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
             exec("zfs load-key -a")
-            @mount.swap(@dev_swap)
             mount_root
             mount_boot
             @mount.esp(@dev_esp)
@@ -31,13 +27,13 @@ module Getch
           private
 
           def mount_root
-            Helpers::mkdir(@root_dir)
-            exec("zfs mount #{@pool_name}/ROOT/gentoo")
+            Helpers::mkdir(MOUNTPOINT)
+            exec("zfs mount #{@pool_name}/ROOT/#{@n}")
           end
 
           def mount_boot
             return if ! @dev_boot
-            exec("zfs mount #{@boot_pool_name}/BOOT/gentoo")
+            exec("zfs mount #{@boot_pool_name}/BOOT/#{@n}")
           end
 
           def exec(cmd)

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

@@ -2,7 +2,7 @@ module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Partition < Getch::FileSystem::Zfs::Encrypt::Device
+        class Partition < Device
           def initialize
             super
             @state = Getch::States.new()
@@ -28,6 +28,7 @@ module Getch
           def partition
             if Helpers::efi?
               @partition.efi(@dev_esp)
+              @partition.boot(@dev_boot) if Getch::OPTIONS[:os] == 'void'
               @partition.swap(@dev_swap) if !@cache_disk
               @partition.root(@dev_root, "BF00") if @root_part != 1
             else
@@ -57,6 +58,7 @@ module Getch
           # /         - Root
 
           def exec(cmd)
+            @log.info("===> #{cmd}")
             Helpers::sys(cmd)
           end
         end

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

@@ -0,0 +1,96 @@
+require_relative '../../../helpers'
+
+module Getch
+  module FileSystem
+    module Zfs
+      module Encrypt
+        class Void < Device
+          include Helpers::Void
+          attr_reader :boot_disk
+
+          def initialize
+            super
+            hostid
+            zfs_zed # mountpoint for zfs
+          end
+
+          # Fstab contain:
+          # > /efi noauto
+          # > swap
+          # > /boot zfs-legacy
+          # > /tmp
+          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
+            add_line(conf, "/dev/mapper/cryptswap none swap sw 0 0")
+            add_line(conf, "##{@boot_pool_name}/BOOT/#{@n} /boot zfs defaults 0 0") if @dev_boot
+            add_line(conf, "tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0")
+          end
+
+          def config_dracut
+            conf = "#{MOUNTPOINT}/etc/dracut.conf.d/zfs.conf"
+            # dracut: value+= should be surrounding by white space
+            content = [
+              "hostonly=\"yes\"",
+              "omit_dracutmodules+=\" btrfs lvm \"",
+              "install_items+=\" /etc/crypttab \"",
+              ""
+            ]
+            File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
+          end
+
+          def kernel_cmdline_dracut
+            #command "zfs set mountpoint=legacy #{@boot_pool_name}/BOOT/#{@n}"
+          end
+
+          def config_grub
+            grub_cmdline("root=zfs:#{@pool_name}/ROOT/#{@n}", "zfs_force=1")
+          end
+
+          def finish
+            zed_update_path
+            puts "+ Enter in your system: chroot /mnt /bin/bash"
+            puts "+ Reboot with: shutdown -r now"
+          end
+
+          def crypttab
+            line_crypttab("cryptswap", @dev_swap, "/dev/urandom", "swap,discard,cipher=aes-xts-plain64:sha256,size=512")
+          end
+
+          private
+
+          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
+
+          def zfs_zed
+            service_dir = "/etc/runit/runsvdir/default/"
+
+            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}")
+            fork { command "/etc/sv/zed/run" }
+            command "ln -fs /etc/sv/zed #{service_dir}"
+          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 hostid
+            command "zgenhostid $(hostid)"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Getch
   module FileSystem
     module Zfs
-      class Format < Getch::FileSystem::Zfs::Device
+      class Format < Device
         def initialize
           super
           @log = Getch::Log.new
@@ -87,15 +87,15 @@ module Getch
           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")
-          exec("zfs create -o canmount=noauto -o mountpoint=/boot #{@boot_pool_name}/BOOT/gentoo") if @dev_boot
+          exec("zfs create -o canmount=noauto -o mountpoint=/ #{@pool_name}/ROOT/#{@n}")
+          exec("zfs create -o canmount=noauto -o mountpoint=/boot #{@boot_pool_name}/BOOT/#{@n}") 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 #{@pool_name}/ROOT/#{@n}/usr")
+          exec("zfs create #{@pool_name}/ROOT/#{@n}/usr/src")
+          exec("zfs create -o canmount=off #{@pool_name}/ROOT/#{@n}/var")
+          exec("zfs create #{@pool_name}/ROOT/#{@n}/var/log")
+          exec("zfs create #{@pool_name}/ROOT/#{@n}/var/db")
+          exec("zfs create #{@pool_name}/ROOT/#{@n}/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")

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

@@ -1,12 +1,9 @@
-require 'fileutils'
-
 module Getch
   module FileSystem
     module Zfs
-      class Mount < Getch::FileSystem::Zfs::Device
+      class Mount < Device
         def initialize
           super
-          @root_dir = MOUNTPOINT
           @mount = Getch::FileSystem::Mount.new
           @state = Getch::States.new
           @log = Getch::Log.new
@@ -17,7 +14,7 @@ module Getch
           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("zpool import -f -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
           @mount.swap(@dev_swap)
           mount_root
           mount_boot
@@ -29,13 +26,13 @@ module Getch
         private
 
         def mount_root
-          Helpers::mkdir(@root_dir)
-          exec("zfs mount #{@pool_name}/ROOT/gentoo")
+          Helpers::mkdir(MOUNTPOINT)
+          exec("zfs mount #{@pool_name}/ROOT/#{@n}")
         end
 
         def mount_boot
           return if ! @dev_boot
-          exec("zfs mount #{@boot_pool_name}/BOOT/gentoo")
+          exec("zfs mount #{@boot_pool_name}/BOOT/#{@n}")
         end
 
         def exec(cmd)

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

@@ -1,7 +1,7 @@
 module Getch
   module FileSystem
     module Zfs
-      class Partition < Getch::FileSystem::Zfs::Device
+      class Partition < Device
         def initialize
           super
           @clean = Getch::FileSystem::Clean
@@ -27,6 +27,7 @@ module Getch
         def partition
           if @efi
             @partition.efi(@dev_esp)
+            @partition.boot(@dev_boot) if Getch::OPTIONS[:os] == 'void'
             @partition.swap(@dev_swap) if !@cache_disk
             @partition.root(@dev_root, "BF00") if @root_part != 1
           else

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

@@ -0,0 +1,81 @@
+require_relative '../../helpers'
+
+module Getch
+  module FileSystem
+    module Zfs
+      class Void < Device
+        include Helpers::Void
+        attr_reader :boot_disk
+
+        def initialize
+          super
+          hostid
+          zfs_zed # mountpoint for zfs
+        end
+
+        # Fstab contain:
+        # > /efi noauto
+        # > swap
+        # > /boot zfs-legacy
+        # > /tmp
+        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
+          #add_line(conf, "#{@boot_pool_name}/BOOT/#{@n} /boot zfs defaults 0 0") if @dev_boot
+          add_line(conf, "tmpfs /tmp tmpfs defaults,nosuid,nodev 0 0")
+        end
+
+        def config_dracut
+          conf = "#{MOUNTPOINT}/etc/dracut.conf.d/zfs.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
+          #command "zfs set mountpoint=legacy #{@boot_pool_name}/BOOT/#{@n}"
+        end
+
+        def config_grub
+          grub_cmdline("root=zfs:#{@pool_name}/ROOT/#{@n}", "zfs_force=1")
+        end
+
+        def finish
+          zed_update_path
+          puts "+ Enter in your system: chroot /mnt /bin/bash"
+          puts "+ Reboot with: shutdown -r now"
+        end
+
+        private
+
+        def zfs_zed
+          service_dir = "/etc/runit/runsvdir/default/"
+
+          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}")
+          fork { command "/etc/sv/zed/run" }
+          command "ln -fs /etc/sv/zed #{service_dir}"
+        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 hostid
+          command "zgenhostid $(hostid)"
+        end
+      end
+    end
+  end
+end