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

util-iso-cal: add write_grubcfg_conf()

Browse source
This commit is contained in:
udeved 2016-08-19 22:27:59 +02:00
parent 473dca601a
commit f5ab3c54b5
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,10 +240,6 @@ write_settings_conf(){
write_mhwdcfg_conf(){
local conf="$1/etc/calamares/modules/mhwdcfg.conf"
echo "---" > "$conf"
echo "bus:" >> "$conf"
echo " - pci" >> "$conf"
echo " - usb" >> "$conf"
echo '' >> "$conf"
echo "identifier:" >> "$conf"
echo " net:" >> "$conf"
echo " - 200" >> "$conf"
@ -251,6 +247,10 @@ write_mhwdcfg_conf(){
echo " video:" >> "$conf"
echo " - 300" >> "$conf"
echo '' >> "$conf"
echo "bus:" >> "$conf"
echo " - pci" >> "$conf"
echo " - usb" >> "$conf"
echo '' >> "$conf"
if ${nonfree_xorg};then
echo "driver: nonfree" >> "$conf"
else
@ -266,6 +266,8 @@ write_mhwdcfg_conf(){
else
echo "local: true" >> "$conf"
fi
echo '' >> "$conf"
echo 'repo: /opt/pacman-mhwd.conf' >> "$conf"
}
write_chrootcfg_conf(){
@ -280,12 +282,10 @@ write_chrootcfg_conf(){
write_postcfg_conf(){
local conf="$1/etc/calamares/modules/postcfg.conf"
echo '' >> "$conf"
echo "---" > "$conf"
echo "keyrings:" >> "$conf"
echo " - archlinux" >> "$conf"
echo " - manjaro" >> "$conf"
echo '' >> "$conf"
echo "plymouth_theme: ${plymouth_theme}" >> "$conf"
}
write_netinstall_conf(){
@ -296,6 +296,23 @@ write_netinstall_conf(){
echo "groupsUrl: ${netgroups}/${yaml}" >> "$conf"
}
write_grubcfg_conf(){
local conf="$1/etc/calamares/modules/grubcfg.conf"
echo "---" > "$conf"
echo "overwrite: false" >> "$conf"
echo '' >> "$conf"
echo "defaults:" >> "$conf"
echo " GRUB_TIMEOUT: 5" >> "$conf"
echo ' GRUB_DEFAULT: "saved"' >> "$conf"
echo " GRUB_DISABLE_SUBMENU: true" >> "$conf"
echo ' GRUB_TERMINAL_OUTPUT: "console"' >> "$conf"
echo " GRUB_DISABLE_RECOVERY: true" >> "$conf"
if ${plymouth_boot};then
echo '' >> "$conf"
echo "plymouth_theme: ${plymouth_theme}"
fi
}
configure_calamares(){
msg2 "Configuring Calamares ..."
@ -327,6 +344,8 @@ configure_calamares(){
write_postcfg_conf "$1"
write_grubcfg_conf "$1"
write_services_conf "$1"
write_users_conf "$1"
}