buildiso/check-yaml: remove plymouth theme setting

This commit is contained in:
udeved 2017-01-31 23:42:50 +01:00
parent a80dee0c18
commit 9d37573dea
7 changed files with 7 additions and 31 deletions

View file

@ -31,7 +31,6 @@ show_profile(){
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
msg2 "pxe_boot: %s" "${pxe_boot}"
msg2 "plymouth_boot: %s" "${plymouth_boot}"
${plymouth_boot} && msg2 "plymouth_theme: %s" "${plymouth_theme}"
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"

View file

@ -28,7 +28,6 @@ show_profile(){
msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
msg2 "pxe_boot: %s" "${pxe_boot}"
msg2 "plymouth_boot: %s" "${plymouth_boot}"
${plymouth_boot} && msg2 "plymouth_theme: %s" "${plymouth_theme}"
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"

View file

@ -46,9 +46,6 @@
# use geoip
# geoip="true"
# unset defaults to given value
# plymouth_theme=manjaro-elegant
# unset defaults to given values
# names must match systemd service names
# enable_systemd=('bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep')

View file

@ -132,15 +132,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>plymouth_theme=</varname></term>
<listitem><para>Takes the name of the plymouth
theme. It should be the directory of a valid
plymouth theme installed in /usr/share/plymouth/themes/
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>enable_systemd=</varname></term>

View file

@ -48,13 +48,6 @@ umount_img() {
# fi
# }
configure_plymouth(){
if [[ -f "$1"/usr/bin/plymouth ]];then
msg2 "Configuring plymouth: %s" "${plymouth_theme}"
local conf=$1/etc/plymouth/plymouthd.conf
sed -i -e "s/^.*Theme=.*/Theme=${plymouth_theme}/" "${conf}"
fi
}
add_svc_rc(){
if [[ -f $1/etc/init.d/$2 ]];then

View file

@ -257,12 +257,12 @@ write_netinstall_conf(){
echo "groupsUrl: ${netgroups}/$(get_yaml)" >> "$conf"
}
write_plymouthcfg_conf(){
local conf="${modules_dir}/plymouthcfg.conf"
msg2 "Writing %s ..." "${conf##*/}"
echo "---" > "$conf"
echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
}
# write_plymouthcfg_conf(){
# local conf="${modules_dir}/plymouthcfg.conf"
# msg2 "Writing %s ..." "${conf##*/}"
# echo "---" > "$conf"
# echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
# }
write_locale_conf(){
local conf="${modules_dir}/locale.conf"
@ -317,7 +317,7 @@ write_settings_conf(){
echo " - localecfg" >> "$conf"
echo " - luksopenswaphookcfg" >> "$conf"
echo " - luksbootkeyfile" >> "$conf"
echo " - plymouthcfg" >> "$conf" && write_plymouthcfg_conf
# echo " - plymouthcfg" >> "$conf" && write_plymouthcfg_conf
echo " - initcpiocfg" >> "$conf"
echo " - initcpio" >> "$conf" && write_initcpio_conf
echo " - users" >> "$conf"

View file

@ -411,8 +411,6 @@ load_profile_config(){
[[ -z ${username} ]] && username="manjaro"
[[ -z ${plymouth_theme} ]] && plymouth_theme="manjaro-elegant"
[[ -z ${password} ]] && password="manjaro"
[[ -z ${login_shell} ]] && login_shell='/bin/bash'
@ -501,7 +499,6 @@ reset_profile(){
unset netgroups
unset geoip
unset plymouth_boot
unset plymouth_theme
}
check_profile(){