diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2022-06-12 15:39:48 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2022-06-12 15:39:48 -0300 |
| commit | e73ca7308f237a2edfd7c56b23bad3e7970118ea (patch) | |
| tree | 70ac420d6a21b83dc0b953bafe2e0d896fa40afe | |
| parent | 50d174faffe55cd5c8394f94e339deb49c36e09c (diff) | |
| download | puppet-nodo-e73ca7308f237a2edfd7c56b23bad3e7970118ea.tar.gz puppet-nodo-e73ca7308f237a2edfd7c56b23bad3e7970118ea.tar.bz2 | |
Management of grub-pc-bin and xorriso
| -rw-r--r-- | manifests/utils/development/system.pp | 3 | ||||
| -rw-r--r-- | manifests/utils/grub.pp | 7 | ||||
| -rw-r--r-- | manifests/utils/storage/iso.pp | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/manifests/utils/development/system.pp b/manifests/utils/development/system.pp index 4645cbb..f1c96e4 100644 --- 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 7cadc6b..d6e141b 100644 --- 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 5f841ce..2684f33 100644 --- 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, |