Management of grub-pc-bin and xorriso

diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp
index 4645cbb82def4ea45a18dddd637ea6e3c8289a5d..f1c96e4cfff57da7ce324a92348c83a8929e3376 100644 (file)
--- a/manifests/utils/development/system.pp
+++ b/manifests/utils/development/system.pp
@@ -1,9 +1,10 @@
 class nodo::utils::development::system (
   $ensure = 'installed',
 ) {
+  include nodo::utils::storage::iso
+
   package { [
     'debirf',
-    'xorriso',
     'kpartx',
     'openocd',
     'live-build',

diff --git a/manifests/utils/grub.pp b/manifests/utils/grub.pp
index 7cadc6b48df5629076c102d0962608e3b4fabec3..d6e141b88df51de8eeba5717019a6d81d3f7c3b7 100644 (file)
--- a/manifests/utils/grub.pp
+++ b/manifests/utils/grub.pp
@@ -1,8 +1,15 @@
 class nodo::utils::grub (
   $ensure = 'installed',
 ) {
+  # Include this classe as xorriso is a dependency for grub-mkrescue, see
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589532
+  include nodo::utils::storage::iso
+
   package { [
     'grub2',
+
+    # This allows grub-mkrescue image generation with PC BIOS-compatible images
+    'grub-pc-bin',
   ]:
     ensure => $ensure,
   }

diff --git a/manifests/utils/storage/iso.pp b/manifests/utils/storage/iso.pp
index 5f841ce1f59cb45890a5da5e405b41bdb9fdb7e3..2684f33fdb7ded2019fa632339d33dc37f3a1bda 100644 (file)
--- a/manifests/utils/storage/iso.pp
+++ b/manifests/utils/storage/iso.pp
@@ -2,7 +2,8 @@ class nodo::utils::storage::iso (
   $ensure = 'installed',
 ) {
   package { [
-    'syslinux',
+    #'syslinux',
+    'xorriso',
   ]:
     ensure => $::architecture ? {
       'amd64' => $ensure,