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

[util-iso.sh] fix snap values

Browse source
This commit is contained in:
Philip Müller 2019-06-12 22:16:42 +02:00
parent 11c328c79e
commit 5ccd0e2167
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -244,10 +244,10 @@ reset_pac_conf(){
# * https://blackboxsw.github.io/seed-snaps-using-maas.html
function seed_snaps() {
local SEED_DIR="/var/lib/snapd/seed"
local SEED_CHANNEL="${SEED_CHANNEL_ISO}"
local SEED_SNAPS="${STRICT_SNAPS} ${CLASSIC_SNAPS}"
local SEED_CHANNEL="${seed_channel}"
local SEED_SNAPS="${strict_snaps} ${classic_snaps}"
if [[ -n "${STRICT_SNAPS}" ]] || [[ -n "${CLASSIC_SNAPS}" ]]; then
if [[ -n "${strict_snaps}" ]] || [[ -n "${classic_snaps}" ]]; then
msg2 "Installing snaps: %s" ${SEED_SNAPS}
# Preseeded snaps should be downloaded from a versioned channel
rm -rfv "$1/${SEED_DIR}"

6
lib/util.sh
View file

@ -404,9 +404,9 @@ load_profile_config(){
[[ -z ${autologin} ]] && autologin="true"
[[ ${displaymanager} == 'none' ]] && autologin="false"
[[ -z ${strict_snaps} ]] && STRICT_SNAPS=""
[[ -z ${classic_snaps} ]] && CLASSIC_SNAPS=""
[[ -z ${snap_channel} ]] && SNAP_CHANNEL_ISO="stable"
[[ -z ${strict_snaps} ]] && strict_snaps=""
[[ -z ${classic_snaps} ]] && classic-snaps=""
[[ -z ${snap_channel} ]] && snap_channel="stable"
[[ -z ${multilib} ]] && multilib="true"