Commit e94e6246 authored by James T. Lee's avatar James T. Lee
Browse files

Add plymouth back to the mix again

parent 6763ab82
...@@ -23,6 +23,7 @@ class nest::profile::base { ...@@ -23,6 +23,7 @@ class nest::profile::base {
contain '::nest::profile::base::mta' contain '::nest::profile::base::mta'
contain '::nest::profile::base::network' contain '::nest::profile::base::network'
contain '::nest::profile::base::openvpn' contain '::nest::profile::base::openvpn'
contain '::nest::profile::base::plymouth'
contain '::nest::profile::base::portage' contain '::nest::profile::base::portage'
contain '::nest::profile::base::sudo' contain '::nest::profile::base::sudo'
contain '::nest::profile::base::systemd' contain '::nest::profile::base::systemd'
...@@ -58,6 +59,10 @@ class nest::profile::base { ...@@ -58,6 +59,10 @@ class nest::profile::base {
-> Class['::nest::profile::base::zfs'] -> Class['::nest::profile::base::zfs']
~> Class['::nest::profile::base::dracut'] ~> Class['::nest::profile::base::dracut']
# Rebuild initramfs after plymouth changes
Class['::nest::profile::base::plymouth']
~> Class['::nest::profile::base::dracut']
# Sudo requires configured MTA # Sudo requires configured MTA
Class['::nest::profile::base::mta'] Class['::nest::profile::base::mta']
-> Class['::nest::profile::base::sudo'] -> Class['::nest::profile::base::sudo']
......
class nest::profile::base::dracut { class nest::profile::base::dracut {
# Password prompting in systemd seems to have improved in versions >=227
# XXX: Remove this after plymouth has been removed everywhere
package { 'sys-boot/plymouth':
ensure => absent,
notify => Exec['dracut'],
}
package { [ package { [
'sys-kernel/dracut', 'sys-kernel/dracut',
'sys-firmware/intel-microcode', 'sys-firmware/intel-microcode',
......
class nest::profile::base::plymouth {
package { 'sys-boot/plymouth':
ensure => installed,
}
$plymouthd_conf_contents = @(PLYMOUTH_CONF)
[Daemon]
Theme=details
| PLYMOUTH_CONF
file { '/etc/plymouth/plymouthd.conf':
mode => '0644',
owner => 'root',
group => 'root',
content => $plymouthd_conf_contents,
require => Package['sys-boot/plymouth'],
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment