getch 0.1.0 → 0.1.1

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

@@ -4,16 +4,98 @@ module Getch
       class Format < Getch::FileSystem::Zfs::Device
         def initialize
           super
-          @state = Getch::States.new()
+          @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
+          @log.info "Create #{@id} for #{@pool_name}"
+          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 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)
+          Getch::Command.new(cmd).run!
+        end
       end
     end
   end

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

@@ -7,9 +7,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
 
@@ -19,47 +18,29 @@ module Getch
           exec("rm -rf #{MOUNTPOINT}/*")
           exec("zpool import -N -R #{MOUNTPOINT} #{@pool_name}")
           exec("zpool import -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
-          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
 
         def exec(cmd)
           @log.info("==> #{cmd}")
-          system(cmd)
-          unless $?.success?
-            raise "Error with #{cmd}"
-          end
+          Helpers::sys(cmd)
         end
       end
     end

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

@@ -4,6 +4,8 @@ module Getch
       class Partition < Getch::FileSystem::Zfs::Device
         def initialize
           super
+          @clean = Getch::FileSystem::Clean
+          @partition = Getch::FileSystem::Partition.new
           @state = Getch::States.new()
           @log = Getch::Log.new()
           run_partition
@@ -11,126 +13,31 @@ module Getch
 
         def run_partition
           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}")
+          if @efi
+            @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}")
+            @partition.gpt(@dev_gpt)
+            # Boot pool for GRUB2
+            @partition.boot(@dev_boot)
+            @partition.swap(@dev_swap)
+            @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}
-            ")
-          end
-
-          exec("zpool create -f -o ashift=#{ashift} \\
-            -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

data/lib/getch/gentoo.rb

@@ -39,6 +39,7 @@ module Getch
       def chroot
         chroot = Getch::Gentoo::Chroot.new()
         chroot.update
+        chroot.cpuflags
         chroot.systemd
         chroot.world
         return if STATES[:gentoo_kernel]
@@ -52,8 +53,8 @@ module Getch
         source = Getch::Gentoo::Sources.new()
         new
         source.build_kspp
-        source.init_config
         source.build_others
+        source.localmodconfig
         source.make
         @state.kernel
       end

data/lib/getch/gentoo/boot.rb

@@ -30,7 +30,7 @@ module Getch
         bootctl_dep
         puts "Configuring systemd-boot."
         # ref: https://forums.gentoo.org/viewtopic-p-8118822.html
-        esp = '/boot/efi'
+        esp = '/efi'
         exec_chroot("bootctl --path #{esp} install")
         datas_loader = [
           'default gentoo',
@@ -66,7 +66,7 @@ module Getch
         puts 'Password for root'
         cmd = "chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile && passwd\""
         system(cmd)
-        if @user != nil
+        if @user
           puts "Creating user #{@user}"
           exec_chroot("useradd -m -G users,wheel,audio,video #{@user}")
           puts "Password for your user #{@user}"

data/lib/getch/gentoo/chroot.rb

@@ -7,6 +7,12 @@ module Getch
         mount
       end
 
+      def cpuflags
+        Getch::Emerge.new("app-portage/cpuid2cpuflags").pkg!
+        cpuflags = `chroot #{MOUNTPOINT} /bin/bash -c "source /etc/profile; cpuid2cpuflags"`.chomp
+        File.write("#{MOUNTPOINT}/etc/portage/package.use/00cpuflags", "*/* #{cpuflags}")
+      end
+
       def update
         return if STATES[:gentoo_update]
         puts "Downloading the last ebuilds for Gentoo..."
@@ -37,9 +43,9 @@ module Getch
       end
 
       def kernel_deps
-        puts "Installing Garden..."
-        get_garden
-        garden_dep
+        Getch::Emerge.new("gentoolkit").pkg!
+        exec_chroot("euse -p sys-apps/kmod -E lzma")
+        @pkgs << "sys-apps/kmod"
       end
 
       def install_pkgs
@@ -52,22 +58,6 @@ module Getch
 
       private
 
-      def get_garden
-        return if Dir.exist? "#{MOUNTPOINT}/root/garden-master"
-        url = 'https://github.com/szorfein/garden/archive/master.tar.gz'
-        file = 'garden-master.tar.gz'
-
-        Dir.chdir("#{MOUNTPOINT}/root")
-        Helpers::get_file_online(url, file)
-        Getch::Command.new("tar xzf #{file}").run! if ! Dir.exist? 'garden-master'
-      end
-
-      def garden_dep
-        Getch::Emerge.new("gentoolkit").pkg!
-        exec_chroot("euse -p sys-apps/kmod -E lzma")
-        @pkgs << "sys-apps/kmod"
-      end
-
       def mount
         puts "Populate /proc, /sys and /dev."
         Helpers::exec_or_die("mount --types proc /proc \"#{MOUNTPOINT}/proc\"")
@@ -80,11 +70,7 @@ module Getch
       end
 
       def exec_chroot(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          #{cmd}
-        \""
-        Getch::Command.new(script).run!
+        Getch::Chroot.new(cmd).run!
       end
     end
   end

data/lib/getch/gentoo/config.rb

@@ -7,12 +7,32 @@ module Getch
     class Config
       def initialize
         @make = "#{MOUNTPOINT}/etc/portage/make.conf"
+        @log = Getch::Log.new
       end
 
       def portage
         nproc = `nproc`.chomp()
         grub_pc = Helpers::efi? ? '' : 'GRUB_PLATFORMS="pc"'
         quiet = DEFAULT_OPTIONS[:verbose] ? '' : "EMERGE_DEFAULT_OPTS=\"--jobs=#{nproc} --load-average=#{nproc}\""
+
+        # Add cpu name
+        cpu=`chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile ; gcc -c -Q -march=native --help=target | grep march\" | awk '{print $2}' | head -1`.chomp
+        raise "Error, no cpu found" if ! cpu or cpu == ""
+        @log.debug "CPU found ==> #{cpu}"
+
+        tmp = Tempfile.new('make.conf')
+
+        File.open(@make).each { |l|
+          if l.match(/^COMMON_FLAGS/)
+            File.write(tmp, "COMMON_FLAGS=\"-march=#{cpu} -O2 -pipe\"\n", mode: 'a')
+          else
+            File.write(tmp, l, mode: 'a')
+          end
+        }
+
+        FileUtils.copy_file(tmp, @make, preserve = true)
+
+        # Add the rest
         data = [
           '',
           'ACCEPT_KEYWORDS="amd64"',
@@ -42,13 +62,13 @@ module Getch
           line_count += 1
         }
 
-        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf", preserve = false)
+        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf", preserve = true)
       end
 
       def network
         src = '/etc/resolv.conf'
         dest = "#{MOUNTPOINT}/etc/resolv.conf"
-        FileUtils.copy_file(src, dest, preserve = false)
+        FileUtils.copy_file(src, dest, preserve = true)
       end
 
       def systemd(options)