getch 0.1.0 → 0.1.6

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

@@ -2,29 +2,33 @@ module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Deps < Getch::FileSystem::Zfs::Encrypt::Device
-          def initialize
-            super
+        class Deps < Device
+          def make
+            unstable_zfs
             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!
+            zed_update_path
           end
 
           private
+          def unstable_zfs
+            conf = "#{MOUNTPOINT}/etc/portage/package.accept_keywords/zfs"
+            data = [
+              "sys-fs/zfs-kmod",
+              "sys-fs/zfs"
+            ]
+            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/)
-            exec("euse -E cryptsetup") if ! Helpers::grep?("#{MOUNTPOINT}/etc/portage/make.conf", /cryptsetup/)
-            Getch::Garden.new('-a zfs').run!
+            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 sys-apps/systemd sys-fs/cryptsetup').pkg!
+            Getch::Emerge.new('genkernel sys-fs/zfs').pkg!
           end
 
           # See: https://wiki.archlinux.org/index.php/ZFS#Using_zfs-mount-generator
@@ -34,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)
@@ -61,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

@@ -2,17 +2,62 @@ module Getch
   module FileSystem
     module Zfs
       module Encrypt
-        class Device
+        class Device < Getch::FileSystem::Device
           def initialize
-            @disk = DEFAULT_OPTIONS[:disk]
-            @user = DEFAULT_OPTIONS[:username]
-            @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
-            @dev_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'
+            super
+            @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
+
+          def search_boot
+            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
+                @dev_gpt = "/dev/#{@boot_disk}1"
+                @dev_boot = "/dev/#{@boot_disk}2"
+                @dev_grub = "/dev/#{@boot_disk}"
+              else
+                @dev_gpt = "/dev/#{@disk}1"
+                @dev_boot = "/dev/#{@disk}2"
+                @dev_grub = "/dev/#{@disk}"
+                @root_part += 2
+              end
+            end
+          end
+
+          def search_swap
+            if @cache_disk
+              @dev_swap = "/dev/#{@cache_disk}1"
+              @dev_log = "/dev/#{@cache_disk}2"
+              @dev_cache = "/dev/#{@cache_disk}3"
+            else
+              @dev_swap = "/dev/#{@disk}#{@root_part}"
+              @root_part += 1
+            end
+          end
+
+          def search_root
+            if @root_part == 1
+              @dev_root = "/dev/#{@disk}"
+            else
+              @dev_root = "/dev/#{@disk}#{@root_part}"
+            end
           end
         end
       end

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

@@ -2,19 +2,100 @@ 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()
             @state = Getch::States.new()
+            if ! @id
+              @log.info "Research pool id for #{@dev_root}..."
+              @id = Helpers::pool_id(@dev_root)
+              @boot_pool_name = "bpool-#{@id}"
+              @pool_name = "rpool-#{@id}"
+            end
             format
           end
 
+          private
+
           def format
             return if STATES[:format]
-            system("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
-            system("mkswap -f #{@dev_swap}")
+            raise "Error, no id found for #{@dev_root}." if ! @id
+            system("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
+            zfs
+            datasets
             @state.format
           end
+
+          def zfs
+            bloc=`blockdev --getpbsz #{@dev_root}`
+            ashift = case bloc
+              when /8096/
+                13
+              when /4096/
+                12
+              else # 512
+                9
+              end
+
+            Helpers::mkdir(MOUNTPOINT)
+
+            @log.debug("ashift found for #{bloc} - #{ashift}")
+            if @dev_boot
+              # 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} -o autotrim=on -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 autotrim=on \\
+              -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}
+            ")
+          end
+
+          def 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/#{@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/#{@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")
+            exec("zfs create -o canmount=on -o mountpoint=/home/#{@user} #{@pool_name}/USERDATA/#{@user}") if @user
+          end
+
+          def exec(cmd)
+            Helpers::sys(cmd)
+          end
         end
       end
     end

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

@@ -1,16 +1,12 @@
-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
-            @boot_dir = "#{@root_dir}/boot"
-            @boot_efi_dir = "#{@root_dir}/boot/efi"
-            @state = Getch::States.new()
+            @mount = Getch::FileSystem::Mount.new
+            @state = Getch::States.new
             @log = Getch::Log.new
           end
 
@@ -19,41 +15,25 @@ 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
             mount_root
             mount_boot
-            mount_boot_efi
+            @mount.esp(@dev_esp)
             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}")
+            Helpers::mkdir(MOUNTPOINT)
+            exec("zfs mount #{@pool_name}/ROOT/#{@n}")
           end
 
           def mount_boot
             return if ! @dev_boot
-            Helpers::mkdir(@boot_dir)
-            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,138 +2,54 @@ 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()
+            @clean = Getch::FileSystem::Clean
+            @partition = Getch::FileSystem::Partition.new
             @log = Getch::Log.new()
-            run_partition
+            run
           end
 
-          def run_partition
+          def run
             return if STATES[:partition ]
-            clear_struct
-            cleaning
+            @clean.old_zpool
+            @clean.hdd(@disk)
+            @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
+
             partition
-            zfs
+            cache
             @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}")
+              @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
-              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}")
+              @partition.gpt(@dev_gpt)
+              @partition.boot(@dev_boot)
+              @partition.swap(@dev_swap) if !@cache_disk
+              @partition.root(@dev_root, "BF00") if @root_part != 1
             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}
-              ")
+          def cache
+            if @cache_disk
+              mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+              exec("sgdisk -n1:0:+#{mem} -t1:8200 /dev/#{@cache_disk}")
+              exec("sgdisk -n2:0:+4G -t2:BF07 /dev/#{@cache_disk}")
+              exec("sgdisk -n3:0:0 -t3:BF08 /dev/#{@cache_disk}")
             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
+          # /efi      - EFI system partition - 260MB
           # /         - Root
 
           # Partition_bios
@@ -142,6 +58,7 @@ module Getch
           # /         - Root
 
           def exec(cmd)
+            @log.info("===> #{cmd}")
             Helpers::sys(cmd)
           end
         end