getch 0.1.6 → 0.1.9

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

@@ -1,10 +1,11 @@
-require_relative '../../helpers'
+# frozen_string_literal: true
 
 module Getch
   module FileSystem
     module Zfs
       class Void < Device
         include Helpers::Void
+
         attr_reader :boot_disk
 
         def initialize
@@ -21,19 +22,18 @@ module Getch
         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_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")
+          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 \"",
-            ""
+            'hostonly="yes"',
+            'omit_dracutmodules+=" btrfs lvm "',
           ]
           File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
         end
@@ -43,37 +43,37 @@ module Getch
         end
 
         def config_grub
-          grub_cmdline("root=zfs:#{@pool_name}/ROOT/#{@n}", "zfs_force=1")
+          grub_cmdline("root=zfs:#{@pool_name}/ROOT/#{@n}", 'zfs_force=1', 'zfs.zfs_arc_max=536870912')
         end
 
         def finish
           zed_update_path
-          puts "+ Enter in your system: chroot /mnt /bin/bash"
-          puts "+ Reboot with: shutdown -r now"
+          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/"
+          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" }
+          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"
+          Dir.glob("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/*").each do |f|
+            unless system('sed', '-Ei', "s|#{MOUNTPOINT}/?|/|", f)
+              raise 'System exec sed'
             end
-          }
+          end
         end
 
         def hostid
-          command "zgenhostid $(hostid)"
+          command 'zgenhostid $(hostid)'
         end
       end
     end

data/lib/getch/filesystem/zfs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs

data/lib/getch/filesystem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
   end

data/lib/getch/gentoo/boot.rb

@@ -1,19 +1,15 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Getch
   module Gentoo
     class Boot
       def initialize
-        @disk = Getch::OPTIONS[:boot_disk] ?
-          Getch::OPTIONS[:boot_disk] :
-          Getch::OPTIONS[:disk]
         @user = Getch::OPTIONS[:username]
-        @class_fs = Getch::select_fs
-        @config = @class_fs::Config.new
       end
 
       def start
-        @config.fstab
         bootloader
         password
         permission
@@ -21,63 +17,22 @@ module Getch
       end
 
       def bootloader
-        # Ensure than systemd is build with all our flags
-        Getch::Emerge.new("@world").pkg!
-
-        if Helpers::efi?
-          bootctl
-        else
-          grub
-        end
-      end
-
-      # bootctl is alrealy installed with the stage3-amd64-systemd
-      def bootctl
-        bootctl_dep
-        puts "Configuring systemd-boot."
-        # ref: https://forums.gentoo.org/viewtopic-p-8118822.html
-        esp = '/efi'
-        Getch::Chroot.new("bootctl --path #{esp} install").run!
-        datas_loader = [
-          'default gentoo',
-          'timeout 3',
-          'editor 0'
-        ]
-        @config.systemd_boot
-        File.write("#{MOUNTPOINT}/#{esp}/loader/loader.conf", datas_loader.join("\n"))
-
-        FileUtils.cp("#{MOUNTPOINT}/usr/src/linux/arch/x86/boot/bzImage", "#{MOUNTPOINT}/#{esp}/vmlinuz", preserve: true)
-
-        initramfs = Dir.glob("#{MOUNTPOINT}/boot/initramfs-*.img")
-        FileUtils.cp("#{initramfs[0]}", "#{MOUNTPOINT}/#{esp}/initramfs", preserve: true) if initramfs != []
-
-        Getch::Chroot.new("bootctl --path #{esp} update").run!
-      end
-
-      def bootctl_dep
-        puts 'Installing systemd-boot...'
-        Getch::Emerge.new("efivar").pkg!
-      end
-
-      def grub
-        puts 'Installing GRUB...'
-        Getch::Emerge.new("sys-boot/grub:2").pkg!
-        @config.grub
-        Getch::Chroot.new("grub-install /dev/#{@disk}").run!
-        Getch::Chroot.new("grub-mkconfig -o /boot/grub/grub.cfg").run!
+        # Ensure all packages are build
+        Getch::Emerge.new('@world').pkg!
+        bootloader = Getch::Gentoo::Bootloader.new
+        bootloader.setup
+        bootloader.update
       end
 
       def password
         puts 'Password for root'
-        cmd = "chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile && passwd\""
-        system(cmd)
-        if @user
-          puts "Creating user #{@user}"
-          Getch::Chroot.new("useradd -m -G users,wheel,audio,video #{@user}").run!
-          puts "Password for your user #{@user}"
-          cmd = "chroot #{MOUNTPOINT} /bin/bash -c \"source /etc/profile && passwd #{@user}\""
-          system(cmd)
-        end
+        chroot "passwd"
+        return unless @user
+
+        puts "Creating user #{@user}"
+        Getch::Chroot.new("useradd -m -G users,wheel,audio,video #{@user}").run!
+        puts "Password for your user #{@user}"
+        chroot "passwd #{@user}"
       end
 
       private
@@ -90,25 +45,19 @@ module Getch
       end
 
       def the_end
-        #Helpers::exec_or_die("umount -l /mnt/gentoo/dev{/shm,/pts,}")
-        #Helpers::exec_or_die("umount -R #{MOUNTPOINT}")
         puts
-        puts "getch has finish, before reboot, you can:"
+        puts 'getch has finish, before reboot, you can:'
         puts "  +  Chroot on your system with: chroot #{MOUNTPOINT} /bin/bash"
-        puts "  +  Install more packages like networkmanager or emacs"
+        puts '  +  Install more packages like networkmanager or emacs'
         puts
-        puts "  +  Add more modules for your kernel (graphic, wifi card) and recompile it with:"
-        puts "  genkernel --kernel-config=/usr/src/linux/.config all  "
+        puts '  +  Add more modules for your kernel (graphic, wifi card) and recompile it with:'
+        puts '  genkernel --kernel-config=/usr/src/linux/.config all  '
         puts
-        puts "Reboot the system when you have done !"
+        puts 'Reboot the system when you have done !'
       end
 
-      def exec_chroot(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          #{cmd}
-        \""
-        Getch::Command.new(script).run!
+      def chroot(cmd)
+        system('chroot', MOUNTPOINT, '/bin/bash', '-c', cmd)
       end
     end
   end

data/lib/getch/gentoo/bootloader.rb

@@ -0,0 +1,68 @@
+# frozen_strin_literal: true
+
+module Getch
+  module Gentoo
+    class Bootloader
+      def initialize
+        @pkgs = []
+        @class_fs = Getch.select_fs
+        @config = @class_fs::Config.new
+        @disk = Getch::OPTIONS[:boot_disk] ?
+          Getch::OPTIONS[:boot_disk] :
+          Getch::OPTIONS[:disk]
+        @esp = '/efi'
+      end
+
+      def start
+        @config.fstab
+        config_useflag
+        dependencies
+        install
+        @config.cmdline
+      end
+
+      def config_useflag
+      end
+
+      # Dracut is used by sys-kernel/gentoo-kernel
+      def dependencies
+        @pkgs << 'app-shells/dash'
+        @pkgs << 'sys-kernel/dracut'
+        if Helpers.efi?
+          @pkgs << 'efivar'
+          @pkgs << 'sys-kernel/installkernel-systemd-boot'
+        else
+          @pkgs << 'sys-boot/grub:2'
+          @pkgs << 'sys-kernel/installkernel-gentoo' # for Grub
+        end
+      end
+
+      def install
+        all_pkgs = @pkgs.join(' ')
+        Getch::Emerge.new(all_pkgs).pkg!
+      end
+
+      def setup
+        if Helpers.efi?
+          Getch::Chroot.new("bootctl --path #{@esp} install").run!
+        else
+          Getch::Chroot.new("grub-install /dev/#{@disk}").run!
+        end
+      end
+
+      def update
+        Getch::Emerge.new('--config sys-kernel/gentoo-kernel').pkg!
+        if Helpers.efi?
+          puts ' => Updating systemd-boot...'
+          Getch::Chroot.new("bootctl --path #{@esp} update").run!
+        else
+          puts ' => Updating grub...'
+          Getch::Chroot.new('grub-mkconfig -o /boot/grub/grub.cfg').run!
+        end
+      end
+
+      def config
+      end
+    end
+  end
+end

data/lib/getch/gentoo/chroot.rb

@@ -1,75 +1,68 @@
+# frozen_string_literal: true
+
 module Getch
   module Gentoo
     class Chroot
       def initialize
-        @state = Getch::States.new()
         @pkgs = []
         mount
       end
 
       def cpuflags
-        Getch::Emerge.new("app-portage/cpuid2cpuflags").pkg!
+        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..."
-        Helpers::create_dir("#{MOUNTPOINT}/var/db/repos/gentoo")
-        cmd = "emaint sync --auto"
+
+        puts 'Downloading the last ebuilds for Gentoo...'
+        Helpers.create_dir("#{MOUNTPOINT}/var/db/repos/gentoo")
+        cmd = 'emaint sync --auto'
         exec_chroot(cmd)
       end
 
       def world
         return if STATES[:gentoo_update]
-        puts "Update Gentoo world"
-        Getch::Emerge.new("emerge --update --deep --changed-use --newuse @world").run!
-        @state.update
+
+        puts 'Update Gentoo world'
+        Getch::Emerge.new('emerge --update --deep --changed-use --newuse @world').run!
       end
 
       def systemd
-        puts "Updating locale, keymap..."
-        cmd = "locale-gen; emerge --config sys-libs/timezone-data"
+        puts 'Updating locale, keymap...'
+        cmd = 'locale-gen; emerge --config sys-libs/timezone-data'
         exec_chroot(cmd)
       end
 
-      def kernel
+      def kernel_license
         return if Dir.exist? "#{MOUNTPOINT}/usr/src/linux"
+
         license = "#{MOUNTPOINT}/etc/portage/package.license"
         File.write(license, "sys-kernel/linux-firmware linux-fw-redistributable no-source-code\n")
-        @pkgs << "sys-kernel/gentoo-sources"
-      end
-
-      def kernel_deps
-        @pkgs << "sys-apps/kmod"
       end
 
       def install_pkgs
-        @pkgs << "app-portage/gentoolkit"
-        @pkgs << "app-admin/sudo"
-        @pkgs << "app-editors/vim"
-        @pkgs << "sys-kernel/linux-firmware"
-        all_pkgs = @pkgs.join(" ")
+        @pkgs << 'app-portage/gentoolkit'
+        @pkgs << 'app-admin/sudo'
+        @pkgs << 'app-editors/vim'
+        @pkgs << 'net-firewall/iptables'
+        @pkgs << 'sys-fs/dosftools' if Helpers.efi?
+        all_pkgs = @pkgs.join(' ')
         puts "Installing #{all_pkgs}..."
         Getch::Emerge.new(all_pkgs).pkg!
       end
 
-      # create a symbolic link for /usr/src/linux
-      def kernel_link
-        cmd = "eselect kernel set 1"
-        exec_chroot(cmd)
-      end
-
       private
 
       def mount
-        puts "Populate /proc, /sys and /dev."
-        Helpers::exec_or_die("mount --types proc /proc \"#{MOUNTPOINT}/proc\"")
-        Helpers::exec_or_die("mount --rbind /sys \"#{MOUNTPOINT}/sys\"")
-        Helpers::exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/sys\"")
-        Helpers::exec_or_die("mount --rbind /dev \"#{MOUNTPOINT}/dev\"")
-        Helpers::exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/dev\"")
+        puts 'Populate /proc, /sys and /dev.'
+        Helpers.exec_or_die("mount --types proc /proc \"#{MOUNTPOINT}/proc\"")
+        Helpers.exec_or_die("mount --rbind /sys \"#{MOUNTPOINT}/sys\"")
+        Helpers.exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/sys\"")
+        Helpers.exec_or_die("mount --rbind /dev \"#{MOUNTPOINT}/dev\"")
+        Helpers.exec_or_die("mount --make-rslave \"#{MOUNTPOINT}/dev\"")
         # Maybe add /dev/shm like describe here:
         # https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Base
       end

data/lib/getch/gentoo/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'tempfile'
 require 'securerandom'
@@ -11,12 +13,13 @@ module Getch
       end
 
       def portage
-        grub_pc = Helpers::efi? ? '' : 'GRUB_PLATFORMS="pc"'
+        grub_pc = Helpers.efi? ? '' : 'GRUB_PLATFORMS="pc"'
         nproc = `nproc`.chomp()
 
         # 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 == ""
+        raise 'Error, no cpu found' unless cpu || cpu == ''
+
         @log.debug "CPU found ==> #{cpu}"
 
         tmp = Tempfile.new('make.conf')
@@ -29,7 +32,7 @@ module Getch
           end
         }
 
-        FileUtils.copy_file(tmp, @make, preserve = true)
+        FileUtils.copy_file(tmp, @make)
 
         # Add the rest
         data = [
@@ -37,16 +40,17 @@ module Getch
           "MAKEOPTS=\"-j#{nproc}\"",
           'ACCEPT_KEYWORDS="amd64"',
           'INPUT_DEVICES="libinput"',
+          'USE="${USE} audit"',
           grub_pc
         ]
-        File.write(@make, data.join("\n"), mode: "a")
+        File.write(@make, data.join("\n"), mode: 'a')
       end
 
       # Write a repos.conf/gentoo.conf with the gpg verification
       def repo
         src = "#{MOUNTPOINT}/usr/share/portage/config/repos.conf"
         dest = "#{MOUNTPOINT}/etc/portage/repos.conf"
-        FileUtils.mkdir dest, mode: 0644 if ! Dir.exist?(dest)
+        FileUtils.mkdir dest, mode: 0644 unless Dir.exist?(dest)
         tmp = Tempfile.new('gentoo.conf')
         line_count = 0
 
@@ -60,20 +64,20 @@ module Getch
           line_count += 1
         }
 
-        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf", preserve = true)
+        FileUtils.copy_file(tmp, "#{dest}/gentoo.conf")
       end
 
       def network
         src = '/etc/resolv.conf'
         dest = "#{MOUNTPOINT}/etc/resolv.conf"
-        FileUtils.copy_file(src, dest, preserve = true)
+        FileUtils.copy_file(src, dest)
       end
 
       def systemd
         control_options
-        File.write("#{MOUNTPOINT}/etc/locale.gen", @utf8)
-        File.write("#{MOUNTPOINT}/etc/locale.conf", "LANG=#{@lang}\n")
-        File.write("#{MOUNTPOINT}/etc/locale.conf", 'LC_COLLATE=C', mode: 'a')
+        Helpers.echo "#{MOUNTPOINT}/etc/locale.gen", @utf8
+        Helpers.echo "#{MOUNTPOINT}/etc/locale.conf", "LANG=#{@lang}"
+        Helpers.echo_a "#{MOUNTPOINT}/etc/locale.conf", 'LC_COLLATE=C'
         File.write("#{MOUNTPOINT}/etc/timezone", "#{Getch::OPTIONS[:zoneinfo]}\n")
         File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{Getch::OPTIONS[:keymap]}\n")
       end
@@ -85,19 +89,19 @@ module Getch
 
       def portage_fs
         portage = "#{MOUNTPOINT}/etc/portage"
-        Helpers::create_dir("#{portage}/package.use")
-        Helpers::create_dir("#{portage}/package.accept_keywords")
-        Helpers::create_dir("#{portage}/package.unmask")
+        Helpers.mkdir("#{portage}/package.use")
+        Helpers.mkdir("#{portage}/package.accept_keywords")
+        Helpers.mkdir("#{portage}/package.unmask")
 
-        Helpers::add_file("#{portage}/package.use/zzz_via_autounmask")
-        Helpers::add_file("#{portage}/package.accept_keywords/zzz_via_autounmask")
-        Helpers::add_file("#{portage}/package.unmask/zzz_via_autounmask")
+        Helpers.add_file("#{portage}/package.use/zzz_via_autounmask")
+        Helpers.add_file("#{portage}/package.accept_keywords/zzz_via_autounmask")
+        Helpers.add_file("#{portage}/package.unmask/zzz_via_autounmask")
       end
 
+      # https://wiki.gentoo.org/wiki/Signed_kernel_module_support
       def portage_bashrc
         conf = "#{MOUNTPOINT}/etc/portage/bashrc"
         content = %q{
-# https://wiki.gentoo.org/wiki/Signed_kernel_module_support
 function pre_pkg_preinst() {
     # This hook signs any out-of-tree kernel modules.
     if [[ "$(type -t linux-mod_pkg_preinst)" != "function" ]]; then
@@ -122,9 +126,9 @@ function pre_pkg_preinst() {
 }
         }
 
-        f = File.new(conf, "w")
+        f = File.new(conf, 'w')
         f.write("#{content}\n")
-        f.chmod(0644)
+        f.chmod(0700)
         f.close
       end
 
@@ -141,22 +145,22 @@ function pre_pkg_preinst() {
         Dir.glob("#{MOUNTPOINT}/usr/share/keymaps/**/#{keys}.map.gz") { |f|
           @keymap = f
         }
-        raise ArgumentError, "No keymap #{@keymap} found" if ! @keymap
+        raise ArgumentError, "No keymap #{@keymap} found" unless @keymap
       end
 
       def search_zone(zone)
-        if !File.exist?("#{MOUNTPOINT}/usr/share/zoneinfo/#{zone}")
+        unless File.exist? "#{MOUNTPOINT}/usr/share/zoneinfo/#{zone}"
           raise ArgumentError, "Zoneinfo #{zone} doesn\'t exist."
         end
       end
 
       def search_utf8(lang)
         @utf8, @lang = nil, nil
-        File.open("#{MOUNTPOINT}/usr/share/i18n/SUPPORTED").each { |l|
-          @utf8 = $~[0] if l.match(/^#{lang}[. ]+[utf\-8 ]+/i)
-          @lang = $~[0] if l.match(/^#{lang}[. ]+utf\-8/i)
-        }
-        raise ArgumentError, "Lang #{lang} no found" if ! @utf8
+        File.open("#{MOUNTPOINT}/usr/share/i18n/SUPPORTED").each do |l|
+          @utf8 = l if l.match(/^#{lang}[. ]+utf-8 /i)
+          @lang = $~[0] if l.match(/^#{lang}[. ]+utf-8/i)
+        end
+        raise ArgumentError, "Lang #{lang} no found" unless @utf8
       end
     end
   end