From c7f309fda38331a316d44715693957b6e6b2deb0 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 9 Mar 2017 17:39:15 +0100 Subject: [PATCH] more cleaning --- bin/buildiso.in | 1 - bin/check-yaml.in | 1 - data/profile.conf.example | 3 --- docbook/profile.conf.xml | 16 ---------------- lib/util.sh | 2 -- 5 files changed, 23 deletions(-) diff --git a/bin/buildiso.in b/bin/buildiso.in index b1b3eaf..863b9b9 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -29,7 +29,6 @@ show_profile(){ [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}" - msg2 "basic: %s" "${basic}" msg2 "extra: %s" "${extra}" msg2 "netinstall: %s" "${netinstall}" diff --git a/bin/check-yaml.in b/bin/check-yaml.in index e492fc5..3c7bed6 100644 --- a/bin/check-yaml.in +++ b/bin/check-yaml.in @@ -30,7 +30,6 @@ show_profile(){ [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}" - msg2 "basic: %s" "${basic}" msg2 "extra: %s" "${extra}" msg2 "netinstall: %s" "${netinstall}" diff --git a/data/profile.conf.example b/data/profile.conf.example index 32f1a3f..817ebd3 100644 --- a/data/profile.conf.example +++ b/data/profile.conf.example @@ -29,9 +29,6 @@ # configure calamares for netinstall # netinstall="false" -# the default url for the netinstall.yaml -# netgroups="https://raw.githubusercontent.com/manjaro/calamares-netgroups/master" - # configure calamares to use chrootcfg instead of unpackfs; default: unpackfs # chrootcfg="false" diff --git a/docbook/profile.conf.xml b/docbook/profile.conf.xml index e9bdfbe..e45ae1a 100644 --- a/docbook/profile.conf.xml +++ b/docbook/profile.conf.xml @@ -108,22 +108,6 @@ along with systemd; If not, see . - - netgroups= - - Default url for the netinstall.yaml. - - - - - basic= - - Accepts - (the default) - . - - - extra= diff --git a/lib/util.sh b/lib/util.sh index e392c30..e28a118 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -465,9 +465,7 @@ reset_profile(){ unset login_shell unset netinstall unset chrootcfg - unset netgroups unset geoip - unset basic unset extra }