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

buildiso: rename nonfree_xorg --> nonfree_mhwd

Browse source 
should make it more clear
This commit is contained in:
udeved 2016-08-21 00:58:06 +02:00
parent 7e94bdb1b7
commit d708f2ff68
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -27,7 +27,7 @@ show_profile(){
msg2 "iso_dir: %s" "${iso_dir}" msg2 "iso_dir: %s" "${iso_dir}"
msg2 "iso_file: %s" "${iso_file}" msg2 "iso_file: %s" "${iso_file}"
msg2 "autologin: %s" "${autologin}" msg2 "autologin: %s" "${autologin}"
msg2 "nonfree_xorg: %s" "${nonfree_xorg}" msg2 "nonfree_mhwd: %s" "${nonfree_mhwd}"
msg2 "pxe_boot: %s" "${pxe_boot}" msg2 "pxe_boot: %s" "${pxe_boot}"
msg2 "plymouth_boot: %s" "${plymouth_boot}" msg2 "plymouth_boot: %s" "${plymouth_boot}"
${plymouth_boot} && msg2 "plymouth_theme: %s" "${plymouth_theme}" ${plymouth_boot} && msg2 "plymouth_theme: %s" "${plymouth_theme}"

2
data/profile.conf.example
View file

@ -13,7 +13,7 @@
# multilib="true" # multilib="true"
# nonfree xorg drivers # nonfree xorg drivers
# nonfree_xorg="true" # nonfree_mhwd="true"
# use plymouth # use plymouth
# plymouth_boot="true" # plymouth_boot="true"

4
lib/util-iso-boot.sh
View file

@ -227,7 +227,7 @@ write_isolinux_cfg(){
echo " append ${initrd_arg} misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free ${boot_args[@]} showopts" >> ${conf} echo " append ${initrd_arg} misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free ${boot_args[@]} showopts" >> ${conf}
echo '' >> ${conf} echo '' >> ${conf}
if ${nonfree_xorg};then if ${nonfree_mhwd};then
echo "label nonfree" >> ${conf} echo "label nonfree" >> ${conf}
echo " kernel /${iso_name}/boot/${target_arch}/${iso_name}" >> ${conf} echo " kernel /${iso_name}/boot/${target_arch}/${iso_name}" >> ${conf}
echo " append ${initrd_arg} misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree ${boot_args[@]} showopts" >> ${conf} echo " append ${initrd_arg} misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree ${boot_args[@]} showopts" >> ${conf}
@ -255,7 +255,7 @@ write_isolinux_msg(){
echo '' >> ${conf} echo '' >> ${conf}
echo "Available boot options:" >> ${conf} echo "Available boot options:" >> ${conf}
echo "start - Start ${dist_name} Live System" >> ${conf} echo "start - Start ${dist_name} Live System" >> ${conf}
if ${nonfree_xorg};then if ${nonfree_mhwd};then
echo "nonfree - Start with proprietary drivers" >> ${conf} echo "nonfree - Start with proprietary drivers" >> ${conf}
fi fi
echo "harddisk - Boot from local hard disk" >> ${conf} echo "harddisk - Boot from local hard disk" >> ${conf}

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

@ -251,7 +251,7 @@ write_mhwdcfg_conf(){
echo " - pci" >> "$conf" echo " - pci" >> "$conf"
echo " - usb" >> "$conf" echo " - usb" >> "$conf"
echo '' >> "$conf" echo '' >> "$conf"
if ${nonfree_xorg};then if ${nonfree_mhwd};then
echo "driver: nonfree" >> "$conf" echo "driver: nonfree" >> "$conf"
else else
echo "driver: free" >> "$conf" echo "driver: free" >> "$conf"

8
lib/util-iso.sh
View file

@ -442,7 +442,7 @@ load_pkgs(){
_multi="s|>multilib.*||g" _multi="s|>multilib.*||g"
_nonfree_multi="s|>nonfree_multilib.*||g" _nonfree_multi="s|>nonfree_multilib.*||g"
_nonfree_x86_64="s|>nonfree_x86_64.*||g" _nonfree_x86_64="s|>nonfree_x86_64.*||g"
if ${nonfree_xorg};then if ${nonfree_mhwd};then
_nonfree_default="s|>nonfree_default||g" _nonfree_default="s|>nonfree_default||g"
_nonfree_i686="s|>nonfree_i686||g" _nonfree_i686="s|>nonfree_i686||g"
@ -456,7 +456,7 @@ load_pkgs(){
_nonfree_i686="s|>nonfree_i686.*||g" _nonfree_i686="s|>nonfree_i686.*||g"
if ${multilib};then if ${multilib};then
_multi="s|>multilib||g" _multi="s|>multilib||g"
if ${nonfree_xorg};then if ${nonfree_mhwd};then
_nonfree_default="s|>nonfree_default||g" _nonfree_default="s|>nonfree_default||g"
_nonfree_x86_64="s|>nonfree_x86_64||g" _nonfree_x86_64="s|>nonfree_x86_64||g"
_nonfree_multi="s|>nonfree_multilib||g" _nonfree_multi="s|>nonfree_multilib||g"
@ -467,7 +467,7 @@ load_pkgs(){
fi fi
else else
_multi="s|>multilib.*||g" _multi="s|>multilib.*||g"
if ${nonfree_xorg};then if ${nonfree_mhwd};then
_nonfree_default="s|>nonfree_default||g" _nonfree_default="s|>nonfree_default||g"
_nonfree_x86_64="s|>nonfree_x86_64||g" _nonfree_x86_64="s|>nonfree_x86_64||g"
_nonfree_multi="s|>nonfree_multilib.*||g" _nonfree_multi="s|>nonfree_multilib.*||g"
@ -657,7 +657,7 @@ reset_profile(){
unset multilib unset multilib
unset pxe_boot unset pxe_boot
unset plymouth_boot unset plymouth_boot
unset nonfree_xorg unset nonfree_mhwd
unset efi_boot_loader unset efi_boot_loader
unset hostname unset hostname
unset username unset username

6
lib/util.sh
View file

@ -358,8 +358,8 @@ check_profile_vars(){
if ! is_valid_bool "${multilib}";then if ! is_valid_bool "${multilib}";then
die "multilib only accepts true/false value!" die "multilib only accepts true/false value!"
fi fi
if ! is_valid_bool "${nonfree_xorg}";then if ! is_valid_bool "${nonfree_mhwd}";then
die "nonfree_xorg only accepts true/false value!" die "nonfree_mhwd only accepts true/false value!"
fi fi
if ! is_valid_bool "${plymouth_boot}";then if ! is_valid_bool "${plymouth_boot}";then
die "plymouth_boot only accepts true/false value!" die "plymouth_boot only accepts true/false value!"
@ -404,7 +404,7 @@ load_profile_config(){
[[ -z ${plymouth_boot} ]] && plymouth_boot="true" [[ -z ${plymouth_boot} ]] && plymouth_boot="true"
[[ ${initsys} == 'openrc' ]] && plymouth_boot="false" [[ ${initsys} == 'openrc' ]] && plymouth_boot="false"
[[ -z ${nonfree_xorg} ]] && nonfree_xorg="true" [[ -z ${nonfree_mhwd} ]] && nonfree_mhwd="true"
[[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub" [[ -z ${efi_boot_loader} ]] && efi_boot_loader="grub"