getch 0.1.0 → 0.1.1

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

@@ -17,7 +17,7 @@ module Getch
 
         def systemd_boot
           return if ! Helpers::efi? 
-          esp = '/boot/efi'
+          esp = '/efi'
           dir = "#{@root_dir}/#{esp}/loader/entries/"
           datas_gentoo = [
             'title Gentoo Linux',
@@ -42,15 +42,14 @@ module Getch
 
         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
+          @uuid_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
         end
 
         def data_fstab
-          boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+          efi = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
           swap = @dev_swap ? "UUID=#{@uuid_swap} none swap discard 0 0" : ''
 
-          [ boot_efi, swap ]
+          [ efi, swap ]
         end
       end
     end

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

@@ -2,24 +2,21 @@ module Getch
   module FileSystem
     module Zfs
       class Deps < Getch::FileSystem::Zfs::Device
-        def initialize
-          super
+        def make
           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::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!

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

@@ -1,18 +1,39 @@
 module Getch
   module FileSystem
     module Zfs
-      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
         end
+        
+        private
+
+        def search_boot
+          if @boot_disk
+            @dev_gpt = @efi ? nil : "/dev/#{@boot_disk}1"
+            @dev_boot = @efi ? nil : "/dev/#{@boot_disk}2"
+            @dev_esp  = @efi ? "/dev/#{@boot_disk}1" : nil
+          else
+            @dev_gpt = @efi ? nil : "/dev/#{@disk}#{@root_part}"
+            @dev_esp = @efi ? "/dev/#{@disk}#{@root_part}" : nil
+            @boot_disk = @disk # used by grub
+            @root_part += 1
+            @dev_boot = @efi ? nil : "/dev/#{@disk}#{@root_part}"
+            @root_part += 1 if ! @efi
+          end
+        end
+
+        def search_root
+          if @root_part == 1
+            @dev_root = "/dev/#{@disk}"
+          else
+            @dev_root = "/dev/#{@disk}#{@root_part}"
+          end
+        end
       end
     end
   end

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

@@ -18,8 +18,8 @@ module Getch
           end
 
           def systemd_boot
-            return if ! Helpers::efi? 
-            esp = '/boot/efi'
+            return if ! @efi
+            esp = '/efi'
             dir = "#{@root_dir}/#{esp}/loader/entries/"
             datas_gentoo = [
               'title Gentoo Linux',
@@ -32,14 +32,14 @@ module Getch
 
           def crypttab
             datas = [
-              "cryptswap UUID=#{@uuid_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=256"
+              "cryptswap PARTUUID=#{@partuuid_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?
+            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]}\""
@@ -50,12 +50,12 @@ module Getch
           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
+            @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_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+            boot_efi = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
             swap = @dev_swap ? "/dev/mapper/cryptswap none swap discard 0 0" : ''
 
             [ boot_efi, swap ]

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

@@ -3,14 +3,10 @@ module Getch
     module Zfs
       module Encrypt
         class Deps < Getch::FileSystem::Zfs::Encrypt::Device
-          def initialize
-            super
+          def make
             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!
@@ -21,7 +17,7 @@ module Getch
             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!

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

@@ -2,18 +2,39 @@ 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
           end
+
+          private
+
+          def search_boot
+            if @boot_disk
+              @dev_gpt = @efi ? nil : "/dev/#{@boot_disk}1"
+              @dev_boot = @efi ? nil : "/dev/#{@boot_disk}2"
+              @dev_esp  = @efi ? "/dev/#{@boot_disk}1" : nil
+            else
+              @dev_gpt = @efi ? nil : "/dev/#{@disk}#{@root_part}"
+              @dev_esp = @efi ? "/dev/#{@disk}#{@root_part}" : nil
+              @boot_disk = @disk # used by grub
+              @root_part += 1
+              @dev_boot = @efi ? nil : "/dev/#{@disk}#{@root_part}"
+              @root_part += 1 if ! @efi
+            end
+          end
+
+          def search_root
+            if @root_part == 1
+              @dev_root = "/dev/#{@disk}"
+            else
+              @dev_root = "/dev/#{@disk}#{@root_part}"
+            end
+          end
         end
       end
     end

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

@@ -5,16 +5,99 @@ module Getch
         class Format < Getch::FileSystem::Zfs::Encrypt::Device
           def initialize
             super
+            @log = Getch::Log.new()
             @state = Getch::States.new()
+            if ! @id
+              @log.info "Research pool id for #{@dev_root}..."
+              sleep 2 until Helpers::pool_id(@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
+            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
           end
+
+          def zfs
+            bloc=`blockdev --getbsz #{@dev_root}`.chomp
+            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} -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}
+            ")
+          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/gentoo")
+            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
+
+          def exec(cmd)
+            Helpers::sys(cmd)
+          end
         end
       end
     end

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

@@ -8,9 +8,8 @@ module Getch
           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
 
@@ -21,38 +20,23 @@ module Getch
             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.swap(@dev_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}")
-          end
-
           def mount_boot
             return if ! @dev_boot
-            Helpers::mkdir(@boot_dir)
             exec("zfs mount #{@boot_pool_name}/BOOT/gentoo")
           end
 

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

@@ -6,134 +6,38 @@ module Getch
           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.struct(@disk, @cache_disk, @home_disk)
+            @clean.hdd(@disk, @cache_disk, @home_disk)
             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}")
+              @partition.efi(@dev_esp)
+              @partition.swap(@dev_swap)
+              @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}")
-            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}
-              ")
+              @partition.gpt(@dev_gpt)
+              @partition.boot(@dev_boot)
+              @partition.swap(@dev_swap)
+              @partition.root(@dev_root, "BF00") if @root_part != 1
             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