forked from mirrored-repos/manjaro-tools
improve plymouth handling
This commit is contained in:
parent
0af221672a
commit
07772eedd5
2 changed files with 21 additions and 4 deletions
|
@ -40,8 +40,16 @@ umount_img() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
has_plymouth(){
|
||||||
|
If $(which plymouth);then
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
configure_plymouth(){
|
configure_plymouth(){
|
||||||
if ${plymouth_boot};then
|
if $(has_plymouth);then
|
||||||
msg2 "Configuring plymouth: %s" "${plymouth_theme}"
|
msg2 "Configuring plymouth: %s" "${plymouth_theme}"
|
||||||
local conf=$1/etc/plymouth/plymouthd.conf
|
local conf=$1/etc/plymouth/plymouthd.conf
|
||||||
sed -i -e "s/^.*Theme=.*/Theme=${plymouth_theme}/" "${conf}"
|
sed -i -e "s/^.*Theme=.*/Theme=${plymouth_theme}/" "${conf}"
|
||||||
|
|
13
lib/util.sh
13
lib/util.sh
|
@ -479,12 +479,10 @@ reset_profile(){
|
||||||
unset autologin
|
unset autologin
|
||||||
unset multilib
|
unset multilib
|
||||||
unset pxe_boot
|
unset pxe_boot
|
||||||
unset plymouth_boot
|
|
||||||
unset nonfree_mhwd
|
unset nonfree_mhwd
|
||||||
unset efi_boot_loader
|
unset efi_boot_loader
|
||||||
unset hostname
|
unset hostname
|
||||||
unset username
|
unset username
|
||||||
unset plymouth_theme
|
|
||||||
unset password
|
unset password
|
||||||
unset addgroups
|
unset addgroups
|
||||||
unset enable_systemd
|
unset enable_systemd
|
||||||
|
@ -502,6 +500,8 @@ reset_profile(){
|
||||||
unset chrootcfg
|
unset chrootcfg
|
||||||
unset netgroups
|
unset netgroups
|
||||||
unset geoip
|
unset geoip
|
||||||
|
unset plymouth_boot
|
||||||
|
unset plymouth_theme
|
||||||
}
|
}
|
||||||
|
|
||||||
check_profile(){
|
check_profile(){
|
||||||
|
@ -605,6 +605,13 @@ load_pkgs(){
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
local _plymouth _plymouth_rm
|
||||||
|
if ${plymouth_boot};then
|
||||||
|
_plymouth="s|>plymouth||g"
|
||||||
|
else
|
||||||
|
_plymouth_rm="s|>plymouth.*||g"
|
||||||
|
fi
|
||||||
|
|
||||||
local _edition _edition_rm
|
local _edition _edition_rm
|
||||||
case "${edition}" in
|
case "${edition}" in
|
||||||
'sonar')
|
'sonar')
|
||||||
|
@ -642,6 +649,8 @@ load_pkgs(){
|
||||||
| sed "$_kernel" \
|
| sed "$_kernel" \
|
||||||
| sed "$_edition" \
|
| sed "$_edition" \
|
||||||
| sed "$_edition_rm" \
|
| sed "$_edition_rm" \
|
||||||
|
| sed "$_plymouth" \
|
||||||
|
| sed "$_plymouth_rm" \
|
||||||
| sed "$_clean")
|
| sed "$_clean")
|
||||||
|
|
||||||
if [[ $1 == "${packages_mhwd}" ]]; then
|
if [[ $1 == "${packages_mhwd}" ]]; then
|
||||||
|
|
Loading…
Reference in a new issue