getch 0.1.6 → 0.1.9

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -6,57 +8,39 @@ module Getch
           def initialize
             super
             gen_uuid
-            @root_dir = MOUNTPOINT
             @init = '/usr/lib/systemd/systemd'
             crypttab
           end
 
           def fstab
-            file = "#{@root_dir}/etc/fstab"
+            file = "#{MOUNTPOINT}/etc/fstab"
             datas = data_fstab
             File.write(file, datas.join("\n"))
           end
 
-          def systemd_boot
-            return if ! @efi
-            esp = '/efi'
-            dir = "#{@root_dir}/#{esp}/loader/entries/"
-            datas_gentoo = [
-              'title Gentoo Linux',
-              'linux /vmlinuz',
-              'initrd /initramfs',
-              "options root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs keymap=#{Getch::OPTIONS[:keymap]}"
-            ]
-            File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
+          def cmdline
+            src = "#{MOUNTPOINT}/etc/dracut.conf.d/cmdline.conf"
+            line = "kernel_cmdline=\"root=zfs:#{@pool_name}/ROOT/#{@n} init=#{@init} rd.vconsole.keymap=#{Getch::OPTIONS[:keymap]} zfs.force=1 zfs.zfs_arc_max=536870912\""
+            Helpers.echo src, line
           end
 
           def crypttab
             datas = [
               "cryptswap PARTUUID=#{@partuuid_swap} /dev/urandom swap,discard,cipher=aes-xts-plain64:sha256,size=512"
             ]
-            File.write("#{@root_dir}/etc/crypttab", datas.join("\n"))
-          end
-
-          # See https://wiki.gentoo.org/wiki/ZFS#ZFS_root
-          def grub
-            return if @efi
-            file = "#{@root_dir}/etc/default/grub"
-            cmdline = [ 
-              "GRUB_CMDLINE_LINUX=\"root=ZFS=#{@pool_name}/ROOT/#{@n} init=#{@init} dozfs keymap=#{Getch::OPTIONS[:keymap]}\""
-            ]
-            File.write("#{file}", cmdline.join("\n"), mode: 'a')
+            File.write("#{MOUNTPOINT}/etc/crypttab", datas.join("\n"))
           end
 
           private
 
           def gen_uuid
-            @partuuid_swap = Helpers::partuuid(@dev_swap)
+            @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_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
-            swap = @dev_swap ? "/dev/mapper/cryptswap none swap sw 0 0" : ''
+            swap = @dev_swap ? '/dev/mapper/cryptswap none swap sw 0 0' : ''
 
             [ boot_efi, swap ]
           end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -7,91 +9,54 @@ module Getch
             unstable_zfs
             install_deps
             zfs_mountpoint
-            auto_module_rebuild
             hostid
-            options_make
-            Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+            config_dracut
             zed_update_path
           end
 
           private
+
           def unstable_zfs
             conf = "#{MOUNTPOINT}/etc/portage/package.accept_keywords/zfs"
             data = [
-              "sys-fs/zfs-kmod",
-              "sys-fs/zfs"
+              'sys-fs/zfs-kmod',
+              'sys-fs/zfs'
             ]
-            File.write(conf, data.join("\n"), mode: "w")
+            File.write(conf, data.join("\n"), mode: 'w')
           end
 
           def install_deps
-            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!
+            Getch::Emerge.new('sys-kernel/gentoo-kernel').pkg!
+            Getch::Emerge.new('sys-fs/zfs').pkg!
           end
 
           # See: https://wiki.archlinux.org/index.php/ZFS#Using_zfs-mount-generator
           def zfs_mountpoint
-            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}")
-            exec("ln -fs /usr/libexec/zfs/zed.d/history_event-zfs-list-cacher.sh /etc/zfs/zed.d/")
-            exec("systemctl start zfs-zed.service")
-            exec("systemctl enable zfs-zed.service")
-            exec("systemctl enable zfs.target")
+            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}")
+            exec('ln -fs /usr/libexec/zfs/zed.d/history_event-zfs-list-cacher.sh /etc/zfs/zed.d/')
+            exec('systemctl start zfs-zed.service')
+            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"
+            Dir.glob("#{MOUNTPOINT}/etc/zfs/zfs-list.cache/*").each do |f|
+              unless 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)
-            # See https://wiki.gentoo.org/wiki/Kernel/Upgrade#Automated_build_and_installation
-            content=<<EOF
-post_pkg_postinst() {
-  # BUG: reinstalls of a source will cause errors
-  CURRENT_KV=$(uname -r)
-  # Check to see if genkernel has been run previously for the running kernel and use that config
-  if [[ -f "${EROOT}/etc/kernels/kernel-config-${CURRENT_KV}" ]] ; then
-    genkernel --kernel-config="${EROOT}/etc/kernels/kernel-config-${CURRENT_KV}" all
-  elif [[ -f "${EROOT}/usr/src/linux-${CURRENT_KV}/.config" ]] ; then # Use latest kernel config from current kernel
-    genkernel --kernel-config="${EROOT}/usr/src/linux-${CURRENT_KV}/.config" all
-  else # No valid configs known
-    genkernel all
-  fi
-}
-EOF
-            File.write("#{g_dir}/gentoo-sources", content)
+            end
           end
 
           def hostid
-            exec "zgenhostid $(hostid)"
+            exec 'zgenhostid $(hostid)'
           end
 
-          def options_make
-            bootloader = Helpers::efi? ? 'BOOTLOADER="no"' : 'BOOTLOADER="grub2"'
-            datas = [
-              '',
-              bootloader,
-              'INSTALL="yes"',
-              'MENUCONFIG="no"',
-              'CLEAN="yes"',
-              'KEYMAP="yes"',
-              'SAVE_CONFIG="yes"',
-              'MOUNTBOOT="no"',
-              'MRPROPER="no"',
-              'ZFS="yes"',
-              'MODULEREBUILD="yes"'
-            ]
-            file = "#{MOUNTPOINT}/etc/genkernel.conf"
-            File.write(file, datas.join("\n"), mode: 'a')
+          def config_dracut
+            conf = "#{MOUNTPOINT}/etc/dracut.conf.d/zfs.conf"
+            content = 'hostonly="yes"'
+            Helpers.echo conf, content
           end
 
           def exec(cmd)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -5,7 +7,7 @@ module Getch
         class Device < Getch::FileSystem::Device
           def initialize
             super
-            @id = Helpers::pool_id(@dev_root)
+            @id = Helpers.pool_id(@dev_root)
             @boot_pool_name = "bpool-#{@id}"
             @pool_name = "rpool-#{@id}"
             @zfs_home = @user ? true : false

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -5,11 +7,11 @@ module Getch
         class Format < Device
           def initialize
             super
-            @log = Getch::Log.new()
-            @state = Getch::States.new()
-            if ! @id
+            @log = Getch::Log.new
+            @state = Getch::States.new
+            unless @id
               @log.info "Research pool id for #{@dev_root}..."
-              @id = Helpers::pool_id(@dev_root)
+              @id = Helpers.pool_id(@dev_root)
               @boot_pool_name = "bpool-#{@id}"
               @pool_name = "rpool-#{@id}"
             end
@@ -20,7 +22,8 @@ module Getch
 
           def format
             return if STATES[:format]
-            raise "Error, no id found for #{@dev_root}." if ! @id
+            raise "Error, no id found for #{@dev_root}." unless @id
+
             system("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
             zfs
             datasets
@@ -29,7 +32,8 @@ module Getch
 
           def zfs
             bloc=`blockdev --getpbsz #{@dev_root}`
-            ashift = case bloc
+            ashift =
+              case bloc
               when /8096/
                 13
               when /4096/
@@ -38,7 +42,7 @@ module Getch
                 9
               end
 
-            Helpers::mkdir(MOUNTPOINT)
+            Helpers.mkdir(MOUNTPOINT)
 
             @log.debug("ashift found for #{bloc} - #{ashift}")
             if @dev_boot
@@ -94,7 +98,7 @@ module Getch
           end
 
           def exec(cmd)
-            Helpers::sys(cmd)
+            Helpers.sys(cmd)
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -8,37 +10,40 @@ module Getch
             @mount = Getch::FileSystem::Mount.new
             @state = Getch::States.new
             @log = Getch::Log.new
+            @import = '/dev/disk/by-id'
           end
 
           def run
             return if STATES[:mount]
-            exec("zpool export -a")
+
+            exec('zpool export -a')
             exec("rm -rf #{MOUNTPOINT}/*")
-            exec("zpool import -N -R #{MOUNTPOINT} #{@pool_name}")
-            exec("zpool import -f -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
-            exec("zfs load-key -a")
+            exec("zpool import -N -d #{@import} -R #{MOUNTPOINT} #{@pool_name}")
+            exec("zpool import -f -N -d #{@import} -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
+            exec('zfs load-key -a')
             mount_root
             mount_boot
             @mount.esp(@dev_esp)
-            exec("zfs mount -a")
+            exec('zfs mount -a')
             @state.mount
           end
 
           private
 
           def mount_root
-            Helpers::mkdir(MOUNTPOINT)
+            Helpers.mkdir(MOUNTPOINT)
             exec("zfs mount #{@pool_name}/ROOT/#{@n}")
           end
 
           def mount_boot
-            return if ! @dev_boot
+            return unless @dev_boot
+
             exec("zfs mount #{@boot_pool_name}/BOOT/#{@n}")
           end
 
           def exec(cmd)
             @log.info("==> #{cmd}")
-            Helpers::sys(cmd)
+            Helpers.sys(cmd)
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -5,15 +7,16 @@ module Getch
         class Partition < Device
           def initialize
             super
-            @state = Getch::States.new()
+            @state = Getch::States.new
             @clean = Getch::FileSystem::Clean
             @partition = Getch::FileSystem::Partition.new
-            @log = Getch::Log.new()
+            @log = Getch::Log.new
             run
           end
 
           def run
-            return if STATES[:partition ]
+            return if STATES[:partition]
+
             @clean.old_zpool
             @clean.hdd(@disk)
             @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
@@ -26,26 +29,26 @@ module Getch
           private
 
           def partition
-            if Helpers::efi?
+            if Helpers.efi?
               @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
+              @partition.swap(@dev_swap) unless @cache_disk
+              @partition.root(@dev_root, 'BF00') if @root_part != 1
             else
               @partition.gpt(@dev_gpt)
               @partition.boot(@dev_boot)
-              @partition.swap(@dev_swap) if !@cache_disk
-              @partition.root(@dev_root, "BF00") if @root_part != 1
+              @partition.swap(@dev_swap) unless @cache_disk
+              @partition.root(@dev_root, 'BF00') if @root_part != 1
             end
           end
 
           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
+            return unless @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
 
           # Partition_efi
@@ -59,7 +62,7 @@ module Getch
 
           def exec(cmd)
             @log.info("===> #{cmd}")
-            Helpers::sys(cmd)
+            Helpers.sys(cmd)
           end
         end
       end

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

@@ -1,4 +1,4 @@
-require_relative '../../../helpers'
+# frozen_string_literal: true
 
 module Getch
   module FileSystem
@@ -6,6 +6,7 @@ module Getch
       module Encrypt
         class Void < Device
           include Helpers::Void
+
           attr_reader :boot_disk
 
           def initialize
@@ -23,19 +24,18 @@ module Getch
             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
-            add_line(conf, "/dev/mapper/cryptswap none swap sw 0 0")
+            add_line(conf, '/dev/mapper/cryptswap none swap sw 0 0')
             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 \"",
-              "install_items+=\" /etc/crypttab \"",
-              ""
+              'hostonly="yes"',
+              'omit_dracutmodules+=" btrfs lvm "',
+              'install_items+=" /etc/crypttab "',
             ]
             File.write(conf, content.join("\n"), mode: 'w', chmod: 0644)
           end
@@ -45,17 +45,17 @@ 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
 
           def crypttab
-            line_crypttab("cryptswap", @dev_swap, "/dev/urandom", "swap,discard,cipher=aes-xts-plain64:sha256,size=512")
+            line_crypttab('cryptswap', @dev_swap, '/dev/urandom', 'swap,discard,cipher=aes-xts-plain64:sha256,size=512')
           end
 
           private
@@ -63,31 +63,32 @@ module Getch
           def line_crypttab(mapname, dev, point, rest)
             conf = "#{MOUNTPOINT}/etc/crypttab"
             device = s_uuid(dev)
-            raise "No partuuid for #{dev} #{device}" if !device
+            raise "No partuuid for #{dev} #{device}" unless device
             raise "Bad partuuid for #{dev} #{device}" if device.kind_of? Array
+
             add_line(conf, "#{mapname} PARTUUID=#{device} #{point} #{rest}")
           end
 
           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/encrypt.rb

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -6,9 +8,9 @@ module Getch
           super
           @log = Getch::Log.new
           @state = Getch::States.new
-          if ! @id
+          unless @id
             @log.info "Research pool id for #{@dev_root}..."
-            @id = Helpers::pool_id(@dev_root)
+            @id = Helpers.pool_id(@dev_root)
             @boot_pool_name = "bpool-#{@id}"
             @pool_name = "rpool-#{@id}"
           end
@@ -19,7 +21,8 @@ module Getch
 
         def format
           return if STATES[:format]
-          raise "Error, no id found for #{@dev_root}." if ! @id
+          raise "Error, no id found for #{@dev_root}." unless @id
+
           @log.info "Create #{@id} for #{@pool_name}"
           system("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
           zfs
@@ -30,7 +33,8 @@ module Getch
 
         def zfs
           bloc=`blockdev --getpbsz #{@dev_root}`
-          ashift = case bloc
+          ashift =
+            case bloc
             when /8096/
               13
             when /4096/
@@ -39,7 +43,7 @@ module Getch
               9
             end
 
-          Helpers::mkdir(MOUNTPOINT)
+          Helpers.mkdir(MOUNTPOINT)
           @log.debug("ashift found for #{bloc} - #{ashift}")
 
           if @dev_boot

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

@@ -7,37 +7,39 @@ module Getch
           @mount = Getch::FileSystem::Mount.new
           @state = Getch::States.new
           @log = Getch::Log.new
+          @import = '/dev/disk/by-id'
         end
 
         def run
           return if STATES[:mount]
-          exec("zpool export -a")
+          exec('zpool export -a')
           exec("rm -rf #{MOUNTPOINT}/*")
-          exec("zpool import -N -R #{MOUNTPOINT} #{@pool_name}")
-          exec("zpool import -f -N -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
+          exec("zpool import -N -d #{@import} -R #{MOUNTPOINT} #{@pool_name}")
+          exec("zpool import -f -N -d #{@import} -R #{MOUNTPOINT} #{@boot_pool_name}") if @dev_boot
           @mount.swap(@dev_swap)
           mount_root
           mount_boot
           @mount.esp(@dev_esp)
-          exec("zfs mount -a")
+          exec('zfs mount -a')
           @state.mount
         end
 
         private
 
         def mount_root
-          Helpers::mkdir(MOUNTPOINT)
+          Helpers.mkdir(MOUNTPOINT)
           exec("zfs mount #{@pool_name}/ROOT/#{@n}")
         end
 
         def mount_boot
-          return if ! @dev_boot
+          return unless @dev_boot
+
           exec("zfs mount #{@boot_pool_name}/BOOT/#{@n}")
         end
 
         def exec(cmd)
           @log.info("==> #{cmd}")
-          Helpers::sys(cmd)
+          Helpers.sys(cmd)
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Getch
   module FileSystem
     module Zfs
@@ -6,13 +8,14 @@ module Getch
           super
           @clean = Getch::FileSystem::Clean
           @partition = Getch::FileSystem::Partition.new
-          @state = Getch::States.new()
-          @log = Getch::Log.new()
+          @state = Getch::States.new
+          @log = Getch::Log.new
           run_partition
         end
 
         def run_partition
           return if STATES[:partition ]
+
           @clean.old_zpool
           @clean.hdd(@disk)
           @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
@@ -28,24 +31,24 @@ module Getch
           if @efi
             @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
+            @partition.swap(@dev_swap) unless @cache_disk
+            @partition.root(@dev_root, 'BF00') if @root_part != 1
           else
             @partition.gpt(@dev_gpt)
             # Boot pool for GRUB2
             @partition.boot(@dev_boot)
-            @partition.swap(@dev_swap) if !@cache_disk
-            @partition.root(@dev_root, "BF00") if @root_part != 1
+            @partition.swap(@dev_swap) unless @cache_disk
+            @partition.root(@dev_root, 'BF00') if @root_part != 1
           end
         end
 
         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:BF00 /dev/#{@cache_disk}")
-          end
+          return unless @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:BF00 /dev/#{@cache_disk}")
         end
 
         # Partition_efi