root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

buildiso: use new netgroups repo for netgroups url

Browse source
This commit is contained in:
udeved 2016-11-01 11:16:22 +01:00
parent 0f6da0cd35
commit ac408e3f5a
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util-yaml.sh
View file

@ -232,18 +232,18 @@ write_postcfg_conf(){
} }
get_yaml(){ get_yaml(){
local args=() ext="yaml" yaml local args=() yaml
if ${chrootcfg};then if ${chrootcfg};then
args+=('chrootcfg') args+=('chrootcfg')
else else
args+=("packages") args+=("${profile}/packages")
fi fi
args+=("${initsys}") args+=("${initsys}")
[[ ${edition} == 'sonar' ]] && args+=("${edition}") [[ ${edition} == 'sonar' ]] && args+=("${edition}")
for arg in ${args[@]};do for arg in ${args[@]};do
yaml=${yaml:-}${yaml:+-}${arg} yaml=${yaml:-}${yaml:+-}${arg}
done done
echo "${yaml}.${ext}" echo "${yaml}.yaml"
} }
write_netinstall_conf(){ write_netinstall_conf(){
@ -399,7 +399,7 @@ write_pacman_group_yaml(){
} }
prepare_check(){ prepare_check(){
local profile=$1 profile=$1
edition=$(get_edition ${profile}) edition=$(get_edition ${profile})
profile_dir=${run_dir}/${edition}/${profile} profile_dir=${run_dir}/${edition}/${profile}
check_profile check_profile

5
lib/util.sh
View file

@ -456,7 +456,7 @@ load_profile_config(){
#[[ -z ${netgroups} ]] && -- needs to be hardcoded for now, until a standard has been established #[[ -z ${netgroups} ]] && -- needs to be hardcoded for now, until a standard has been established
# will be unlocked again after everything has been established. # will be unlocked again after everything has been established.
netgroups="https://raw.githubusercontent.com/manjaro/iso-profiles/master/shared/netgroups" netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master"
[[ -z ${geoip} ]] && geoip='true' [[ -z ${geoip} ]] && geoip='true'
@ -646,8 +646,7 @@ load_pkgs(){
if [[ $1 == "${packages_mhwd}" ]]; then if [[ $1 == "${packages_mhwd}" ]]; then
local _used_kernel=${kernel:5:2} [[ ${_used_kernel} < "42" ]] && local _amd="s|xf86-video-amdgpu||g"
[[ ${_used_kernel} < "42" ]] && local _amd="s|xf86-video-amdgpu||g"
packages_cleanup=$(sed "$_com_rm" "$1" \ packages_cleanup=$(sed "$_com_rm" "$1" \
| grep cleanup \ | grep cleanup \