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

[util.sh] add default values for snaps

Browse source
This commit is contained in:
Philip Müller 2019-06-12 18:47:52 +02:00
parent 1f4fda04dd
commit b4f167d96a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/util-iso.sh
View file

@ -244,7 +244,7 @@ reset_pac_conf(){
# * https://blackboxsw.github.io/seed-snaps-using-maas.html # * https://blackboxsw.github.io/seed-snaps-using-maas.html
function seed_snaps() { function seed_snaps() {
local SEED_DIR="/var/lib/snapd/seed" local SEED_DIR="/var/lib/snapd/seed"
local SEED_CHANNEL="${SEED_BRANCH}" local SEED_CHANNEL="${SEED_CHANNEL_ISO}"
local SEED_SNAPS="${STRICT_SNAPS} ${CLASSIC_SNAPS}" local SEED_SNAPS="${STRICT_SNAPS} ${CLASSIC_SNAPS}"
if [ -n "${STRICT_SNAPS}" ] || [ -n "${CLASSIC_SNAPS}" ]; then if [ -n "${STRICT_SNAPS}" ] || [ -n "${CLASSIC_SNAPS}" ]; then

4
lib/util.sh
View file

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