getch 0.1.5 → 0.1.6

data/lib/getch/gentoo.rb

@@ -8,42 +8,40 @@ require_relative 'gentoo/use_flag'
 
 module Getch
   module Gentoo
-    class << self
-      def new
+    class Main
+      def initialize
         @state = Getch::States.new()
       end
 
       def stage3
         return if STATES[:gentoo_base]
-        new
-        stage = Getch::Gentoo::Stage.new()
+        stage = Getch::Gentoo::Stage.new
         stage.get_stage3
         stage.control_files
         stage.checksum
         @state.stage3
       end
 
-      def config(options)
+      def config
         return if STATES[:gentoo_config]
-        new
-        config = Getch::Gentoo::Config.new()
+        config = Getch::Gentoo::Config.new
         config.portage
         config.portage_fs
         config.portage_bashrc
         config.repo
         config.network
-        config.systemd(options)
+        config.systemd
         config.hostname
         @state.config
       end
 
-      def chroot(options)
-        chroot = Getch::Gentoo::Chroot.new()
+      def chroot
+        chroot = Getch::Gentoo::Chroot.new
         chroot.update
         chroot.cpuflags
         chroot.systemd
 
-        flags = Getch::Gentoo::UseFlag.new(options)
+        flags = Getch::Gentoo::UseFlag.new
         flags.apply
 
         chroot.world
@@ -56,8 +54,7 @@ module Getch
 
       def kernel
         return if STATES[:gentoo_kernel]
-        source = Getch::Gentoo::Sources.new()
-        new
+        source = Getch::Gentoo::Sources.new
         source.build_kspp
         source.build_others
         source.firewall
@@ -65,8 +62,8 @@ module Getch
         @state.kernel
       end
 
-      def boot(options)
-        boot = Getch::Gentoo::Boot.new(options)
+      def boot
+        boot = Getch::Gentoo::Boot.new
         boot.start
       end
     end

data/lib/getch/gentoo/boot.rb

@@ -3,10 +3,13 @@ require 'fileutils'
 module Getch
   module Gentoo
     class Boot
-      def initialize(opts)
-        @disk = opts.boot_disk ? opts.boot_disk : opts.disk
-        @user = opts.username
-        @config = Getch.class_fs::Config.new()
+      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

data/lib/getch/gentoo/config.rb

@@ -69,13 +69,13 @@ module Getch
         FileUtils.copy_file(src, dest, preserve = true)
       end
 
-      def systemd(options)
-        control_options(options)
+      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')
-        File.write("#{MOUNTPOINT}/etc/timezone", "#{options.zoneinfo}")
-        File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{options.keymap}")
+        File.write("#{MOUNTPOINT}/etc/timezone", "#{Getch::OPTIONS[:zoneinfo]}\n")
+        File.write("#{MOUNTPOINT}/etc/vconsole.conf", "KEYMAP=#{Getch::OPTIONS[:keymap]}\n")
       end
 
       def hostname
@@ -130,10 +130,10 @@ function pre_pkg_preinst() {
 
       private
 
-      def control_options(options)
-        search_zone(options.zoneinfo)
-        search_utf8(options.language)
-        search_key(options.keymap)
+      def control_options
+        search_zone(Getch::OPTIONS[:zoneinfo])
+        search_utf8(Getch::OPTIONS[:language])
+        search_key(Getch::OPTIONS[:keymap])
       end
 
       def search_key(keys)

data/lib/getch/gentoo/sources.rb

@@ -3,7 +3,8 @@ module Getch
     class Sources
       def initialize
         @lsmod = `lsmod`.chomp
-        @filesystem = Getch.class_fs::Deps.new()
+        @class_fs = Getch::select_fs
+        @filesystem = @class_fs::Deps.new
       end
 
       def build_others
@@ -21,7 +22,9 @@ module Getch
       end
 
       def make
-        if DEFAULT_OPTIONS[:fs] == 'lvm' || DEFAULT_OPTIONS[:fs] == 'zfs' || DEFAULT_OPTIONS[:encrypt]
+        if Getch::OPTIONS[:fs] == 'lvm' ||
+            Getch::OPTIONS[:fs] == 'zfs' ||
+            Getch::OPTIONS[:encrypt]
           @filesystem.make
         else
           make_kernel
@@ -44,7 +47,7 @@ module Getch
       end
 
       def cryptsetup
-        return unless DEFAULT_OPTIONS[:encrypt]
+        return unless Getch::OPTIONS[:encrypt]
         make_conf = "#{MOUNTPOINT}/etc/portage/make.conf"
 
         puts "Adding support for cryptsetup."

data/lib/getch/gentoo/stage.rb

@@ -4,7 +4,6 @@ require 'open3'
 module Getch
   module Gentoo
     class Stage
-
       def initialize
         @mirror = "https://mirrors.soeasyto.com/distfiles.gentoo.org"
         @release = release

data/lib/getch/gentoo/use_flag.rb

@@ -2,9 +2,8 @@
 
 module Getch::Gentoo
   class UseFlag
-    def initialize(options)
+    def initialize
       @efi = Helpers::efi?
-      @o = options
     end
 
     def apply
@@ -36,13 +35,13 @@ module Getch::Gentoo
       flags = []
       use = Getch::Gentoo::Use.new('sys-boot/grub')
       flags << '-grub_platforms_efi-64'
-      flags << 'libzfs' if @o.fs == 'zfs'
-      flags << 'device-mapper' if @o.fs == 'lvm'
+      flags << 'libzfs' if Getch::OPTIONS[:fs] == 'zfs'
+      flags << 'device-mapper' if Getch::OPTIONS[:fs] == 'lvm'
       use.add(flags)
     end
 
     def zfs
-      return unless @o.fs == 'zfs'
+      return unless Getch::OPTIONS[:fs] == 'zfs'
       use = Getch::Gentoo::Use.new('sys-fs/zfs-kmod')
       use.add('rootfs')
       use = Getch::Gentoo::Use.new('sys-fs/zfs')
@@ -50,13 +49,13 @@ module Getch::Gentoo
     end
 
     def lvm
-      return unless @o.fs == 'lvm'
+      return unless Getch::OPTIONS[:fs] == 'lvm'
       use = Getch::Gentoo::Use.new
       use.add_global('lvm', 'device-mapper')
     end
 
     def cryptsetup
-      return unless @o.encrypt
+      return unless Getch::OPTIONS[:encrypt]
       use = Getch::Gentoo::Use.new
       use.add_global('cryptsetup')
     end

data/lib/getch/guard.rb

@@ -24,7 +24,8 @@ module Getch::Guard
   def self.format(name)
     raise InvalidFormat, "No format specified." unless name
     raise InvalidFormat, "Format #{name} not yet available." if name.match(/btrfs/)
-    raise InvalidFormat, "Format #{name} not supported." unless name.match(/zfs|lvm|zfs/)
+    raise InvalidFormat, "Format #{name} not supported." unless name.match(/zfs|lvm|ext4/)
+    name
   rescue InvalidFormat => e
     puts "#{e.class} => #{e}"
     exit 1
@@ -34,6 +35,7 @@ module Getch::Guard
     raise InvalidZone, "No zoneinfo specified." unless name
     raise InvalidZone, "Directory /usr/share/zoneinfo/ no found on this system..." unless Dir.exist? "/usr/share/zoneinfo/"
     raise InvalidZone, "Zoneinfo #{name} is no found in /usr/share/zoneinfo/." unless File.exist? "/usr/share/zoneinfo/#{name}"
+    name
   rescue InvalidZone => e
     puts "#{e.class} => #{e}"
     exit 1

data/lib/getch/helpers.rb

@@ -38,6 +38,11 @@ module Helpers
     File.write file, '' if ! File.exist? file
   end
 
+  def self.cp(src, dest)
+    raise "Src file #{src} no found" unless File.exist? src
+    FileUtils.cp(src, dest)
+  end
+
   def self.grep?(file, regex)
     is_found = false
     return is_found if ! File.exist? file
@@ -61,7 +66,11 @@ module Helpers
   end
 
   def self.uuid(dev)
-    `lsblk -do UUID #{dev}`.match(/[\w]+-[\w]+-[\w]+-[\w]+-[\w]+/)
+    Dir.glob("/dev/disk/by-uuid/*").each { |f|
+      if File.readlink(f).match(/#{dev}/)
+        return f.delete_prefix("/dev/disk/by-uuid/")
+      end
+    }
   end
 
   # Used with ZFS for the pool name
@@ -82,4 +91,101 @@ module Helpers
       end
     end
   end
+
+  module Void
+    def command(args)
+      print " => Exec: #{args}..."
+      cmd = "chroot #{Getch::MOUNTPOINT} /bin/bash -c \"#{args}\""
+      _, stderr, status = Open3.capture3(cmd)
+      if status.success? then
+        puts "\s[OK]"
+        return
+      end
+      raise "\n[-] Fail cmd #{args} - #{stderr}."
+    end
+
+    def command_output(args)
+      print " => Exec: #{args}..."
+      cmd = "chroot #{Getch::MOUNTPOINT} /bin/bash -c \"#{args}\""
+      Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
+        puts
+        while line = stdout_err.gets
+          puts line
+        end
+
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          raise "\n[-] Fail cmd #{args} - #{stdout_err}."
+        end
+      end
+    end
+
+    def add_line(file, line)
+      raise "No file #{file} found !" unless File.exist? file
+      File.write(file, "#{line}\n", mode: 'a')
+    end
+
+    def search(file, text)
+      File.open(file).each { |line|
+        return true if line.match(/#{text}/)
+      }
+      return false
+    end
+
+    # Used only when need password
+    def chroot(cmd)
+      if !system("chroot", Getch::MOUNTPOINT, "/bin/bash", "-c", cmd)
+        raise "[-] Error with: #{cmd}"
+      end
+    end
+
+    def s_uuid(dev)
+      device = dev.delete_prefix("/dev/")
+      Dir.glob("/dev/disk/by-partuuid/*").each { |f|
+        link = File.readlink(f)
+        return f.delete_prefix("/dev/disk/by-partuuid/") if link.match(/#{device}$/)
+      }
+    end
+
+    def line_fstab(dev, rest)
+      conf = "#{Getch::MOUNTPOINT}/etc/fstab"
+      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, "PARTUUID=#{device} #{rest}")
+    end
+
+    def grub_cmdline(*args)
+      conf = "#{Getch::MOUNTPOINT}/etc/default/grub"
+      list = args.join(" ")
+      secs = "GRUB_CMDLINE_LINUX=\"#{list} init_on_alloc=1 init_on_free=1"
+      secs += " slab_nomerge pti=on slub_debug=ZF vsyscall=none\""
+      raise "No default/grub found" unless File.exist? conf
+      unless search(conf, "GRUB_CMDLINE_LINUX=")
+        File.write(conf, "#{secs}\n", mode: 'a')
+      end
+    end
+  end
+
+  module Cryptsetup
+    def encrypt(dev)
+      raise "No device #{dev}" unless File.exist? dev
+      puts " => Encrypting device #{dev}..."
+      if Helpers::efi? && Getch::OPTIONS[:os] == 'gentoo'
+        Helpers::sys("cryptsetup luksFormat --type luks #{dev}")
+      else
+        Helpers::sys("cryptsetup luksFormat --type luks1 #{dev}")
+      end
+    end
+
+    def open_crypt(dev, map_name)
+      raise "No device #{dev}" unless File.exist? dev
+      puts " => Opening encrypted device #{dev}..."
+      if Helpers::efi? && Getch::OPTIONS[:os] == 'gentoo'
+        Helpers::sys("cryptsetup open --type luks #{dev} #{map_name}")
+      else
+        Helpers::sys("cryptsetup open --type luks1 #{dev} #{map_name}")
+      end
+    end
+  end
 end

data/lib/getch/log.rb

@@ -2,8 +2,9 @@ require 'logger'
 
 module Getch
   class Log
-    def initialize
+    def initialize(verbose = false)
       @log_file = '/tmp/log_install.txt'
+      @verbose = verbose
       check_file
       init_log
       init_log_text
@@ -37,7 +38,7 @@ module Getch
 
     def init_log
       @logger = Logger.new(STDOUT)
-      @logger.level = DEFAULT_OPTIONS[:verbose] ? Logger::DEBUG : Logger::INFO
+      @logger.level = @verbose ? Logger::DEBUG : Logger::INFO
       @logger.formatter = proc { |severity, datetime, progname, msg|
         "#{severity}, #{msg}\n" 
       }

data/lib/getch/options.rb

@@ -2,20 +2,7 @@ require 'optparse'
 
 module Getch
   class Options
-    attr_reader :language, :zoneinfo, :keymap, :disk, :fs, :username, :boot_disk, :cache_disk, :home_disk, :encrypt, :verbose
-
     def initialize(argv)
-      @language = DEFAULT_OPTIONS[:language]
-      @zoneinfo = DEFAULT_OPTIONS[:zoneinfo]
-      @keymap = DEFAULT_OPTIONS[:keymap]
-      @disk = DEFAULT_OPTIONS[:disk]
-      @fs = DEFAULT_OPTIONS[:fs]
-      @username = DEFAULT_OPTIONS[:username]
-      @boot_disk = DEFAULT_OPTIONS[:boot_disk]
-      @cache_disk = DEFAULT_OPTIONS[:cache_disk]
-      @home_disk = DEFAULT_OPTIONS[:home_disk]
-      @encrypt = DEFAULT_OPTIONS[:encrypt]
-      @verbose = DEFAULT_OPTIONS[:verbose]
       parse(argv)
     end
 
@@ -23,48 +10,68 @@ module Getch
 
     def parse(argv)
       OptionParser.new do |opts|
+        opts.version = VERSION
+
         opts.on("-l", "--language LANG", "Default is en_US") do |lang|
-          @language = lang
+          OPTIONS[:language] = lang
         end
+
         opts.on("-z", "--zoneinfo ZONE", "Default is US/Eastern") do |zone|
-          @zoneinfo = Getch::Guard.zone(zone)
+          OPTIONS[:zoneinfo] = Getch::Guard.zone(zone)
         end
+
         opts.on("-k", "--keymap KEY", "Default is us") do |key|
-          @keymap = Getch::Guard.keymap(key)
+          OPTIONS[:keymap] = Getch::Guard.keymap(key)
         end
-        opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb), default use #{@disk}") do |disk|
-          @disk = Getch::Guard.disk(disk)
+
+        opts.on("-d", "--disk DISK", "Root Disk where install the system (sda,sdb)") do |disk|
+          OPTIONS[:disk] = Getch::Guard.disk(disk)
         end
+
         opts.on("-f", "--format FS", "Can be ext4, lvm or zfs. Default use ext4") do |fs|
-          @fs = Getch::Guard.format(fs)
-          DEFAULT_OPTIONS[:fs] = fs # dont known why, but it should be enforce
+          OPTIONS[:fs] = Getch::Guard.format(fs)
         end
+
         opts.on("-u", "--username USERNAME", "Create a new user /home/USERNAME with password.") do |user|
-          @username = user
+          OPTIONS[:username] = user
         end
-        opts.on("--separate-boot DISK", "Disk for the boot/efi partition, default use #{@disk}") do |boot|
-          @boot_disk = Getch::Guard.disk(boot)
-          DEFAULT_OPTIONS[:boot_disk] = boot
+
+        opts.on("-o", "--os NAME", /gentoo|void/, "Instal distro NAME, can be gentoo or void.") do |name|
+          OPTIONS[:os] = name
         end
-        opts.on("--separate-cache DISK", "Disk for the swap partition, add ZIL/L2ARC for ZFS when set, default use #{@disk}") do |swap|
-          @cache_disk = Getch::Guard.disk(swap)
-          DEFAULT_OPTIONS[:cache_disk] = swap
+
+        opts.on("--separate-boot DISK", "Use a different DISK for the /boot or /efi partition.") do |boot|
+          OPTIONS[:boot_disk] = Getch::Guard.disk(boot)
         end
-        opts.on("--separate-home DISK", "Disk for the /home partition, default is nil") do |home|
-          @home_disk = Getch::Guard.disk(home)
-          DEFAULT_OPTIONS[:home_disk] = home
+
+        opts.on("--separate-cache DISK", "Use a different DISK for the swap partition, add ZIL/L2ARC for ZFS when set.") do |swap|
+          OPTIONS[:cache_disk] = Getch::Guard.disk(swap)
+        end
+
+        opts.on("--separate-home DISK", "Use a different DISK for the /home partition.") do |home|
+          OPTIONS[:home_disk] = Getch::Guard.disk(home)
         end
-        opts.on("--encrypt", "Encrypt your system.") do
-          @encrypt = true
+
+        opts.on("--encrypt", "Encrypt your system, use LUKS or native encryption for ZFS.") do
+          OPTIONS[:encrypt] = true
         end
+
         opts.on("--verbose", "Write more messages to the standard output.") do
-          @verbose = true
+          OPTIONS[:verbose] = true
         end
+
         opts.on("-h", "--help", "Display this") do
           puts opts
           exit
         end
-      end.parse!(into: DEFAULT_OPTIONS)
+
+        begin
+          opts.parse!(argv)
+        rescue OptionParser::ParseError => e
+          STDERR.puts e.message, "\n", opts
+          exit 1
+        end
+      end
     end
   end
 end