root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

util-iso-cal: prepare to use plymouthcfg module

Browse source
This commit is contained in:
udeved 2016-09-03 10:46:50 +02:00
parent 61c33cebcd
commit e7e09aa1bd
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/util-iso-calamares.sh
View file

@ -237,6 +237,7 @@ write_settings_conf(){
fi fi
echo " - grubcfg" >> "$conf" echo " - grubcfg" >> "$conf"
echo " - bootloader" >> "$conf" echo " - bootloader" >> "$conf"
echo " - plymouthcfg" >> "$conf"
echo " - postcfg" >> "$conf" echo " - postcfg" >> "$conf"
echo " - umount" >> "$conf" echo " - umount" >> "$conf"
echo "- show:" >> "$conf" echo "- show:" >> "$conf"
@ -346,10 +347,13 @@ write_grubcfg_conf(){
echo " GRUB_DISABLE_SUBMENU: true" >> "$conf" echo " GRUB_DISABLE_SUBMENU: true" >> "$conf"
echo ' GRUB_TERMINAL_OUTPUT: "console"' >> "$conf" echo ' GRUB_TERMINAL_OUTPUT: "console"' >> "$conf"
echo " GRUB_DISABLE_RECOVERY: true" >> "$conf" echo " GRUB_DISABLE_RECOVERY: true" >> "$conf"
if ${plymouth_boot};then }
echo '' >> "$conf"
write_plymouthcfg_conf(){
local conf="$1/etc/calamares/modules/plymouthcfg.conf"
msg2 "Writing %s ..." "${conf##*/}"
echo "---" > "$conf"
echo "plymouth_theme: ${plymouth_theme}" >> "$conf" echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
fi
} }
configure_calamares(){ configure_calamares(){
@ -379,6 +383,8 @@ configure_calamares(){
${netinstall} && write_netinstall_conf "$1" ${netinstall} && write_netinstall_conf "$1"
${plymouth_boot} && write_plymouthcfg_conf "$1"
write_chrootcfg_conf "$1" write_chrootcfg_conf "$1"
write_postcfg_conf "$1" write_postcfg_conf "$1"