zfs: Decouple main and kmod packages

Closes #32

manifests/base.pp

@@ -27,6 +27,7 @@ class nest::base {
       contain '::nest::base::sudo'
       contain '::nest::base::systemd'
       contain '::nest::base::timesyncd'
+      contain '::nest::base::zfs'
 
       if $facts['build'] in [undef, 'stage2', 'stage3', 'kernel'] {
         contain '::nest::base::dracut'
@@ -34,7 +35,6 @@ class nest::base {
         contain '::nest::base::fstab'
         contain '::nest::base::kernel'
         contain '::nest::base::plymouth'
-        contain '::nest::base::zfs'
 
         # Rebuild initramfs and reconfigure bootloader after kernel changes
         Class['::nest::base::kernel']
@@ -46,23 +46,22 @@ class nest::base {
         -> Class['::nest::base::firmware']
         ~> Class['::nest::base::dracut']
 
-        # Rebuild initramfs after ZFS changes
-        Class['::nest::base::kernel']
-        -> Class['::nest::base::zfs']
+        # Dracut liveimg depends on dhcp, pulled in by network class
+        Class['::nest::base::network']
+        -> Class['::nest::base::dracut']
+
+        # Rebuild initramfs after plymouth changes
+        Class['::nest::base::plymouth']
         ~> Class['::nest::base::dracut']
 
         # Dracut depends on systemd/console setup
         Class['::nest::base::systemd']
         ~> Class['::nest::base::dracut']
 
-        # Rebuild initramfs after plymouth changes
-        Class['::nest::base::plymouth']
+        # Rebuild initramfs after ZFS changes
+        Class['::nest::base::zfs']
         ~> Class['::nest::base::dracut']
 
-        # Dracut liveimg depends on dhcp, pulled in by network class
-        Class['::nest::base::network']
-        -> Class['::nest::base::dracut']
-
         # Bootloaders are host-specific
         if $facts['build'] in [undef, 'stage3', 'kernel'] {
           contain '::nest::base::bootloader'

manifests/base/kernel.pp

@@ -64,11 +64,15 @@ class nest::base::kernel {
   }
   ~>
   exec { 'module-rebuild':
-    command     => "/usr/bin/emerge --oneshot --usepkg n --jobs ${::nest::concurrency} --load-average ${::nest::base::portage::loadlimit} zfs-kmod",
-    environment => 'FEATURES=-buildpkg',
+    command     => "/usr/bin/emerge --buildpkg n --usepkg n @module-rebuild",
     timeout     => 0,
     refreshonly => true,
   }
+  ->
+  nest::lib::package { 'sys-fs/zfs-kmod':
+    ensure => installed,
+    binpkg => false,
+  }
 
   Exec['kernel-defconfig']
   -> Nest::Lib::Kconfig <| config == '/usr/src/linux/.config' |>

manifests/base/portage.pp

@@ -130,6 +130,14 @@ class nest::base::portage {
   #
   # Package environments and properties
   #
+
+  file { '/etc/portage/env/no-buildpkg.conf':
+    mode    => '0644',
+    owner   => 'root',
+    group   => 'root',
+    content => "FEATURES=\"-buildpkg\"\n",
+  }
+
   # xvid incorrectly passes `-mcpu` as `-mtune` which doesn't accept `+crypto`
   $cflags_no_crypto = regsubst($facts['portage_cflags'], '\+crypto', '')
   if $cflags_no_crypto != $facts['portage_cflags'] {

manifests/base/zfs.pp

 class nest::base::zfs {
-  package { 'sys-fs/zfs':
+  nest::lib::package { 'sys-fs/zfs':
     ensure => installed,
+    use    => 'kernel-builtin'
+  }
+
+  if defined(Class['nest::base::kernel']) {
   }
 
   $zfs_mount_override = @(EOF)
@@ -26,6 +30,8 @@ class nest::base::zfs {
     ;
   }
 
+  nest::lib::systemd_reload { 'zfs': }
+
   unless $facts['is_container'] or $facts['running_live'] {
     exec { 'zgenhostid':
       command => '/sbin/zgenhostid `hostid`',

manifests/lib/package.pp

 define nest::lib::package (
+  Boolean                  $binpkg  = true,
   String                   $ensure  = 'installed',
   String                   $package = $name,
   Optional[Nest::UseFlags] $use     = undef,
   Boolean                  $world   = true,
 ) {
+  unless $binpkg {
+    package_env { $name:
+      name   => $package,
+      env    => 'no-buildpkg.conf',
+      before => Package[$name],
+    }
+
+    $install_options = [{ '--usepkg' => 'n' }]
+  }
+
   $use_ensure = $use ? {
     undef   => 'absent',
     default => 'present',
@@ -16,8 +27,9 @@ define nest::lib::package (
   }
 
   package { $name:
-    ensure => $ensure,
-    name   => $package,
+    ensure          => $ensure,
+    install_options => $install_options,
+    name            => $package,
   }
 
   if $world {

manifests/tool/buildah.pp

 class nest::tool::buildah {
-  nest::lib::package_use { 'sys-fs/zfs':
-    use => 'kernel-builtin',
-  }
-
-  # Can be used as a storage backend when /dev/zfs
-  # and CAP_SYS_ADMIN are added to the container
-  package { 'sys-fs/zfs':
-    ensure => installed,
-  }
-
   package_accept_keywords { 'app-emulation/skopeo':
     version => '=1.1.1',
   }