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

Merge branch 'master' into stable-0.13.x

Browse source
This commit is contained in:
Philip 2016-08-21 09:59:46 +02:00
commit 0990d44bf4
11 changed files with 130 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.project Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>manjaro-tools</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>

2
Makefile
View file

@ -76,7 +76,7 @@ LIBS_ISO = \
lib/util-publish.sh lib/util-publish.sh
SHARED_ISO = \ SHARED_ISO = \
data/pacman-gfx.conf \ data/pacman-mhwd.conf \
data/desktop.map \ data/desktop.map \
data/profile.conf.example data/profile.conf.example

7
bin/buildiso.in
View file

@ -27,15 +27,16 @@ 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}"
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}" [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
msg2 "cal_netinstall: %s" "${cal_netinstall}" msg2 "netinstall: %s" "${netinstall}"
msg2 "cal_unpackfs: %s" "${cal_unpackfs}" ${netinstall} && msg2 "netgroups: %s" "$(get_yaml)"
msg2 "unpackfs: %s" "${unpackfs}"
msg2 "efi_boot_loader: %s" "${efi_boot_loader}" msg2 "efi_boot_loader: %s" "${efi_boot_loader}"

4
data/pacman-gfx.conf → data/pacman-mhwd.conf
View file

@ -66,6 +66,6 @@ SigLevel = Never
# uncommented to enable the repo. # uncommented to enable the repo.
# #
[gfx-pkgs] [mhwd]
#SigLevel = Optional TrustAll #SigLevel = Optional TrustAll
Server = file:///opt/live/pkgs Server = file:///opt/pkg

8
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"
@ -35,13 +35,13 @@
# efi_boot_loader="grub" # efi_boot_loader="grub"
# configure calamares for netinstall # configure calamares for netinstall
# cal_netinstall="false" # netinstall="false"
# the default url for the netinstall.yaml # the default url for the netinstall.yaml
# cal_netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master" # netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall"
# configure calamares to use chrootcfg instead of unpackfs # configure calamares to use chrootcfg instead of unpackfs
# cal_unpackfs="true" # unpackfs="true"
# unset defaults to given value # unset defaults to given value
# plymouth_theme=manjaro-elegant # plymouth_theme=manjaro-elegant

6
docbook/profile.conf.xml
View file

@ -132,7 +132,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>cal_netinstall=</varname></term> <term><varname>netinstall=</varname></term>
<listitem><para>Accepts <listitem><para>Accepts
<option>true</option> (the default) <option>true</option> (the default)
@ -141,7 +141,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>cal_unpackfs=</varname></term> <term><varname>unpackfs=</varname></term>
<listitem><para>Accepts <listitem><para>Accepts
<option>true</option> (the default) <option>true</option> (the default)
@ -150,7 +150,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>cal_netgroups=</varname></term> <term><varname>netgroups=</varname></term>
<listitem><para>Default url for the netinstall.yaml. <listitem><para>Default url for the netinstall.yaml.
</para></listitem> </para></listitem>

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}

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

@ -120,7 +120,7 @@ write_unpack_conf(){
echo " - source: \"/bootmnt/${iso_name}/${target_arch}/root-image.sqfs\"" >> "$conf" echo " - source: \"/bootmnt/${iso_name}/${target_arch}/root-image.sqfs\"" >> "$conf"
echo " sourcefs: \"squashfs\"" >> "$conf" echo " sourcefs: \"squashfs\"" >> "$conf"
echo " destination: \"\"" >> "$conf" echo " destination: \"\"" >> "$conf"
if ! ${cal_netinstall};then if [[ -f "${packages_custom}" ]] ; then
echo " - source: \"/bootmnt/${iso_name}/${target_arch}/${profile}-image.sqfs\"" >> "$conf" echo " - source: \"/bootmnt/${iso_name}/${target_arch}/${profile}-image.sqfs\"" >> "$conf"
echo " sourcefs: \"squashfs\"" >> "$conf" echo " sourcefs: \"squashfs\"" >> "$conf"
echo " destination: \"\"" >> "$conf" echo " destination: \"\"" >> "$conf"
@ -168,7 +168,7 @@ write_welcome_conf(){
echo " - storage" >> "$conf" echo " - storage" >> "$conf"
echo " - ram" >> "$conf" echo " - ram" >> "$conf"
echo " - root" >> "$conf" echo " - root" >> "$conf"
if ${cal_netinstall};then if ${netinstall};then
echo " - internet" >> "$conf" echo " - internet" >> "$conf"
fi fi
} }
@ -183,7 +183,7 @@ write_settings_conf(){
echo "sequence:" >> "$conf" echo "sequence:" >> "$conf"
echo "- show:" >> "$conf" echo "- show:" >> "$conf"
echo " - welcome" >> "$conf" echo " - welcome" >> "$conf"
${cal_netinstall} && echo " - netinstall" >> "$conf" ${netinstall} && echo " - netinstall" >> "$conf"
echo " - locale" >> "$conf" echo " - locale" >> "$conf"
echo " - keyboard" >> "$conf" echo " - keyboard" >> "$conf"
echo " - partition" >> "$conf" echo " - partition" >> "$conf"
@ -192,13 +192,14 @@ write_settings_conf(){
echo "- exec:" >> "$conf" echo "- exec:" >> "$conf"
echo " - partition" >> "$conf" echo " - partition" >> "$conf"
echo " - mount" >> "$conf" echo " - mount" >> "$conf"
if ${cal_netinstall};then if ${netinstall};then
if ${cal_unpackfs};then if ${unpackfs};then
echo " - unpackfs" >> "$conf" echo " - unpackfs" >> "$conf"
echo " - networkcfg" >> "$conf" echo " - networkcfg" >> "$conf"
echo " - packages" >> "$conf" echo " - packages" >> "$conf"
else else
echo " - chrootcfg" >> "$conf" echo " - chrootcfg" >> "$conf"
echo " - networkcfg" >> "$conf"
fi fi
else else
echo " - unpackfs" >> "$conf" echo " - unpackfs" >> "$conf"
@ -216,7 +217,6 @@ write_settings_conf(){
echo " - users" >> "$conf" echo " - users" >> "$conf"
echo " - displaymanager" >> "$conf" echo " - displaymanager" >> "$conf"
echo " - mhwdcfg" >> "$conf" echo " - mhwdcfg" >> "$conf"
echo " - networkcfg" >> "$conf"
echo " - hwclock" >> "$conf" echo " - hwclock" >> "$conf"
if [[ ${initsys} == 'systemd' ]];then if [[ ${initsys} == 'systemd' ]];then
echo " - services" >> "$conf" echo " - services" >> "$conf"
@ -240,10 +240,6 @@ write_settings_conf(){
write_mhwdcfg_conf(){ write_mhwdcfg_conf(){
local conf="$1/etc/calamares/modules/mhwdcfg.conf" local conf="$1/etc/calamares/modules/mhwdcfg.conf"
echo "---" > "$conf" echo "---" > "$conf"
echo "bus:" >> "$conf"
echo " - pci" >> "$conf"
echo " - usb" >> "$conf"
echo '' >> "$conf"
echo "identifier:" >> "$conf" echo "identifier:" >> "$conf"
echo " net:" >> "$conf" echo " net:" >> "$conf"
echo " - 200" >> "$conf" echo " - 200" >> "$conf"
@ -251,14 +247,18 @@ write_mhwdcfg_conf(){
echo " video:" >> "$conf" echo " video:" >> "$conf"
echo " - 300" >> "$conf" echo " - 300" >> "$conf"
echo '' >> "$conf" echo '' >> "$conf"
if ${nonfree_xorg};then echo "bus:" >> "$conf"
echo " - pci" >> "$conf"
echo " - usb" >> "$conf"
echo '' >> "$conf"
if ${nonfree_mhwd};then
echo "driver: nonfree" >> "$conf" echo "driver: nonfree" >> "$conf"
else else
echo "driver: free" >> "$conf" echo "driver: free" >> "$conf"
fi fi
echo '' >> "$conf" echo '' >> "$conf"
if ${cal_netinstall};then if ${netinstall};then
if ${cal_unpackfs};then if ${unpackfs};then
echo "local: true" >> "$conf" echo "local: true" >> "$conf"
else else
echo "local: false" >> "$conf" echo "local: false" >> "$conf"
@ -266,12 +266,16 @@ write_mhwdcfg_conf(){
else else
echo "local: true" >> "$conf" echo "local: true" >> "$conf"
fi fi
echo '' >> "$conf"
echo 'repo: /opt/pacman-mhwd.conf' >> "$conf"
} }
write_chrootcfg_conf(){ write_chrootcfg_conf(){
local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"' local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"'
echo "---" > "$conf" echo "---" > "$conf"
echo "requirements:" >> "$conf" echo "requirements:" >> "$conf"
echo " - name: /etc" >> "$conf"
echo " mode: ${mode}" >> "$conf"
echo " - name: /var/cache/pacman/pkg" >> "$conf" echo " - name: /var/cache/pacman/pkg" >> "$conf"
echo " mode: ${mode}" >> "$conf" echo " mode: ${mode}" >> "$conf"
echo " - name: /var/lib/pacman" >> "$conf" echo " - name: /var/lib/pacman" >> "$conf"
@ -282,12 +286,50 @@ write_chrootcfg_conf(){
echo " - manjaro" >> "$conf" echo " - manjaro" >> "$conf"
} }
write_postcfg_conf(){
local conf="$1/etc/calamares/modules/postcfg.conf"
echo "---" > "$conf"
echo "keyrings:" >> "$conf"
echo " - archlinux" >> "$conf"
echo " - manjaro" >> "$conf"
}
get_yaml(){
local args=() ext="yaml" yaml
if ${unpackfs};then
args+=("hybrid")
else
args+=('netinstall')
fi
[[ ${initsys} == 'openrc' ]] && args+=("${initsys}")
[[ ${edition} == 'sonar' ]] && args+=("${edition}")
for arg in ${args[@]};do
yaml=${yaml:-}${yaml:+-}${arg}
done
echo "${yaml}.${ext}"
}
write_netinstall_conf(){ write_netinstall_conf(){
local conf="$1/etc/calamares/modules/netinstall.conf" local conf="$1/etc/calamares/modules/netinstall.conf"
local yaml="netinstall.yaml"
[[ ${initsys} == 'openrc' ]] && yaml="netinstall-${initsys}.yaml"
echo "---" > "$conf" echo "---" > "$conf"
echo "groupsUrl: ${cal_netgroups}/${yaml}" >> "$conf" echo "groupsUrl: ${netgroups}/$(get_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(){ configure_calamares(){
@ -315,10 +357,14 @@ configure_calamares(){
write_finished_conf "$1" write_finished_conf "$1"
write_netinstall_conf "$1" ${netinstall} && write_netinstall_conf "$1"
write_chrootcfg_conf "$1" write_chrootcfg_conf "$1"
write_postcfg_conf "$1"
write_grubcfg_conf "$1"
write_services_conf "$1" write_services_conf "$1"
write_users_conf "$1" write_users_conf "$1"
} }

25
lib/util-iso-image.sh
View file

@ -10,11 +10,13 @@
# GNU General Public License for more details. # GNU General Public License for more details.
copy_overlay(){ copy_overlay(){
msg2 "Copying [%s] ..." "${1##*/}" if [[ -e $1 ]];then
if [[ -L $1 ]];then msg2 "Copying [%s] ..." "${1##*/}"
cp -a --no-preserve=ownership $1/* $2 if [[ -L $1 ]];then
else cp -a --no-preserve=ownership $1/* $2
cp -LR $1/* $2 else
cp -LR $1/* $2
fi
fi fi
} }
@ -48,9 +50,8 @@ set_xdm(){
fi fi
} }
# $1: chroot
configure_mhwd_drivers(){ configure_mhwd_drivers(){
local path=$1/opt/live/pkgs/ \ local path=$1${mhwd_repo}/ \
drv_path=$1/var/lib/mhwd/db/pci/graphic_drivers drv_path=$1/var/lib/mhwd/db/pci/graphic_drivers
info "Configuring mwwd db ..." info "Configuring mwwd db ..."
if [ -z "$(ls $path | grep catalyst-utils 2> /dev/null)" ]; then if [ -z "$(ls $path | grep catalyst-utils 2> /dev/null)" ]; then
@ -101,8 +102,6 @@ chroot_clean(){
rm -rf --one-file-system "$1" rm -rf --one-file-system "$1"
} }
# $1: chroot
configure_lsb(){ configure_lsb(){
[[ -f $1/boot/grub/grub.cfg ]] && rm $1/boot/grub/grub.cfg [[ -f $1/boot/grub/grub.cfg ]] && rm $1/boot/grub/grub.cfg
if [ -e $1/etc/lsb-release ] ; then if [ -e $1/etc/lsb-release ] ; then
@ -264,11 +263,9 @@ configure_live_image(){
} }
make_repo(){ make_repo(){
repo-add $1/opt/live/pkgs/gfx-pkgs.db.tar.gz $1/opt/live/pkgs/*pkg*z repo-add $1${mhwd_repo}/mhwd.db.tar.gz $1${mhwd_repo}/*pkg*z
} }
# $1: work dir
# $2: pkglist
copy_from_cache(){ copy_from_cache(){
local list="${tmp_dir}"/mhwd-cache.list local list="${tmp_dir}"/mhwd-cache.list
chroot-run \ chroot-run \
@ -287,11 +284,9 @@ copy_from_cache(){
sed -i "s/.*\///" "$list" sed -i "s/.*\///" "$list"
msg2 "Copying mhwd package cache ..." msg2 "Copying mhwd package cache ..."
rsync -v --files-from="$list" /var/cache/pacman/pkg "$1/opt/live/pkgs" rsync -v --files-from="$list" /var/cache/pacman/pkg "$1${mhwd_repo}"
} }
# $1: image path
# $2: packages
chroot_create(){ chroot_create(){
[[ "${1##*/}" == "root-image" ]] && local flag="-L" [[ "${1##*/}" == "root-image" ]] && local flag="-L"
setarch "${target_arch}" \ setarch "${target_arch}" \

27
lib/util-iso.sh
View file

@ -180,10 +180,10 @@ make_checksum(){
gen_iso_fn(){ gen_iso_fn(){
local vars=() name local vars=() name
vars+=("${iso_name}") vars+=("${iso_name}")
if ! ${cal_netinstall};then if ! ${netinstall};then
[[ -n ${profile} ]] && vars+=("${profile}") [[ -n ${profile} ]] && vars+=("${profile}")
else else
if ${cal_unpackfs};then if ${unpackfs};then
[[ -n ${profile} ]] && vars+=("${profile}") [[ -n ${profile} ]] && vars+=("${profile}")
fi fi
fi fi
@ -285,7 +285,7 @@ make_image_mhwd() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare [drivers repository] (mhwd-image)" msg "Prepare [drivers repository] (mhwd-image)"
local path="${work_dir}/mhwd-image" local path="${work_dir}/mhwd-image"
mkdir -p ${path}/opt/live/pkgs mkdir -p ${path}${mhwd_repo}
mount_image_select "${path}" mount_image_select "${path}"
@ -295,10 +295,10 @@ make_image_mhwd() {
if [[ -n "${packages_cleanup}" ]]; then if [[ -n "${packages_cleanup}" ]]; then
for mhwd_clean in ${packages_cleanup}; do for mhwd_clean in ${packages_cleanup}; do
rm ${path}/opt/live/pkgs/${mhwd_clean} rm ${path}${mhwd_repo}/${mhwd_clean}
done done
fi fi
cp ${DATADIR}/pacman-gfx.conf ${path}/opt/live cp ${DATADIR}/pacman-mhwd.conf ${path}/opt
make_repo "${path}" make_repo "${path}"
configure_mhwd_drivers "${path}" configure_mhwd_drivers "${path}"
@ -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"
@ -563,8 +563,8 @@ check_profile(){
[[ -f "${profile_dir}/Packages-Mhwd" ]] && packages_mhwd=${profile_dir}/Packages-Mhwd [[ -f "${profile_dir}/Packages-Mhwd" ]] && packages_mhwd=${profile_dir}/Packages-Mhwd
if ! ${cal_netinstall};then if ! ${netinstall};then
cal_unpackfs="true" unpackfs="true"
fi fi
} }
@ -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
@ -675,8 +675,9 @@ reset_profile(){
unset login_shell unset login_shell
unset tracker_url unset tracker_url
unset piece_size unset piece_size
unset cal_netinstall unset netinstall
unset cal_unpackfs unset unpackfs
unset netgroups
} }
make_profile(){ make_profile(){

26
lib/util.sh
View file

@ -312,6 +312,8 @@ init_buildiso(){
[[ -z ${use_overlayfs} ]] && use_overlayfs='true' [[ -z ${use_overlayfs} ]] && use_overlayfs='true'
[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles' [[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
mhwd_repo="/opt/pkg"
} }
init_deployiso(){ init_deployiso(){
@ -356,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!"
@ -365,11 +367,11 @@ check_profile_vars(){
if ! is_valid_bool "${pxe_boot}";then if ! is_valid_bool "${pxe_boot}";then
die "pxe_boot only accepts true/false value!" die "pxe_boot only accepts true/false value!"
fi fi
if ! is_valid_bool "${cal_netinstall}";then if ! is_valid_bool "${netinstall}";then
die "cal_netinstall only accepts true/false value!" die "netinstall only accepts true/false value!"
fi fi
if ! is_valid_bool "${cal_unpackfs}";then if ! is_valid_bool "${unpackfs}";then
die "cal_unpackfs only accepts true/false value!" die "unpackfs only accepts true/false value!"
fi fi
} }
@ -402,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"
@ -449,11 +451,15 @@ load_profile_config(){
[[ -z ${piece_size} ]] && piece_size=21 [[ -z ${piece_size} ]] && piece_size=21
[[ -z ${cal_netinstall} ]] && cal_netinstall='false' [[ -z ${netinstall} ]] && netinstall='false'
[[ -z ${cal_unpackfs} ]] && cal_unpackfs='true' [[ -z ${unpackfs} ]] && unpackfs='true'
[[ -z ${cal_netgroups} ]] && cal_netgroups="https://raw.githubusercontent.com/calamares/calamares-manjaro/master" [[ -z ${netgroups} ]] && netgroups="https://raw.githubusercontent.com/manjaro/manjaro-tools-iso-profiles/master/shared/netinstall"
if ! ${unpackfs} && ! ${netinstall};then
netinstall='true'
fi
check_profile_vars check_profile_vars