diff options
| -rw-r--r-- | manifests/kvm/images.pp | 49 | ||||
| -rw-r--r-- | manifests/kvm/packages.pp | 10 |
2 files changed, 34 insertions, 25 deletions
diff --git a/manifests/kvm/images.pp b/manifests/kvm/images.pp index b5d88e7..1e7236c 100644 --- a/manifests/kvm/images.pp +++ b/manifests/kvm/images.pp @@ -31,29 +31,32 @@ class virtual::kvm::images { require => [ File["/usr/local/share/iso/${lsbdistcodename}/installer/profiles/kvm-unencrypted.preseed"], Package['simple-cdd'] ], } - exec { "debirf-make-profile-rescue-${lsbdistcodename}": - command => 'tar xzf /usr/share/doc/debirf/example-profiles/rescue.tgz', - user => 'iso', - cwd => "/usr/local/share/iso/${lsbdistcodename}", - creates => "/usr/local/share/iso/${lsbdistcodename}/rescue", - require => [ File["/usr/local/share/iso/${lsbdistcodename}"], Package['debirf'] ], - } + # Commented as debirf is currently not available (as of 2024-07-03) + #exec { "debirf-make-profile-rescue-${lsbdistcodename}": + # command => 'tar xzf /usr/share/doc/debirf/example-profiles/rescue.tgz', + # user => 'iso', + # cwd => "/usr/local/share/iso/${lsbdistcodename}", + # creates => "/usr/local/share/iso/${lsbdistcodename}/rescue", + # require => [ File["/usr/local/share/iso/${lsbdistcodename}"], Package['debirf'] ], + #} - exec { "debirf-make-rescue-${lsbdistcodename}": - command => '/usr/bin/debirf make -n rescue', - user => 'iso', - timeout => 0, - creates => "/usr/local/share/iso/${lsbdistcodename}/rescue/vmlinuz-${kernelrelease}", - cwd => "/usr/local/share/iso/${lsbdistcodename}", - require => Exec["debirf-make-profile-rescue-${lsbdistcodename}"], - } + # Commented as debirf is currently not available (as of 2024-07-03) + #exec { "debirf-make-rescue-${lsbdistcodename}": + # command => '/usr/bin/debirf make -n rescue', + # user => 'iso', + # timeout => 0, + # creates => "/usr/local/share/iso/${lsbdistcodename}/rescue/vmlinuz-${kernelrelease}", + # cwd => "/usr/local/share/iso/${lsbdistcodename}", + # require => Exec["debirf-make-profile-rescue-${lsbdistcodename}"], + #} - exec { "debirf-makeiso-rescue-${lsbdistcodename}": - command => '/usr/bin/debirf makeiso rescue', - user => 'iso', - timeout => 0, - creates => "/usr/local/share/iso/${lsbdistcodename}/rescue/debirf-rescue_${lsbdistcodename}_${kernelrelease}.iso", - cwd => "/usr/local/share/iso/${lsbdistcodename}", - require => Exec["debirf-make-rescue-${lsbdistcodename}"], - } + # Commented as debirf is currently not available (as of 2024-07-03) + #exec { "debirf-makeiso-rescue-${lsbdistcodename}": + # command => '/usr/bin/debirf makeiso rescue', + # user => 'iso', + # timeout => 0, + # creates => "/usr/local/share/iso/${lsbdistcodename}/rescue/debirf-rescue_${lsbdistcodename}_${kernelrelease}.iso", + # cwd => "/usr/local/share/iso/${lsbdistcodename}", + # require => Exec["debirf-make-rescue-${lsbdistcodename}"], + #} } diff --git a/manifests/kvm/packages.pp b/manifests/kvm/packages.pp index 2470d59..aad2664 100644 --- a/manifests/kvm/packages.pp +++ b/manifests/kvm/packages.pp @@ -3,7 +3,6 @@ class virtual::kvm::packages { 'qemu-kvm', 'socat', 'fakeroot', - 'debirf', 'simple-cdd', ]: ensure => present, @@ -18,7 +17,14 @@ class virtual::kvm::packages { } # Provide a netboot image for VM installs - package { "debian-installer-9-netboot-${::architecture}": + package { "debian-installer-12-netboot-${::architecture}": ensure => present, } + + # Not available (as of 2024-07-03) + package { [ + 'debirf', + ]: + ensure => absent, + } } |