bootstrap_archives: remove useless param
This commit is contained in:
parent
38a5aed0dc
commit
78b03ce8a3
|
@ -35,7 +35,7 @@ lb bootstrap_cache save "${@}"
|
||||||
# Configuring chroot
|
# Configuring chroot
|
||||||
lb chroot_prep install all-except-archives "${@}"
|
lb chroot_prep install all-except-archives "${@}"
|
||||||
|
|
||||||
lb bootstrap_archives binary "${@}"
|
lb bootstrap_archives "${@}"
|
||||||
|
|
||||||
# Deconfiguring chroot
|
# Deconfiguring chroot
|
||||||
lb chroot_prep remove all-except-archives "${@}"
|
lb chroot_prep remove all-except-archives "${@}"
|
||||||
|
|
|
@ -16,14 +16,7 @@ set -e
|
||||||
|
|
||||||
# Setting static variables
|
# Setting static variables
|
||||||
DESCRIPTION="Manage /etc/apt/sources.list"
|
DESCRIPTION="Manage /etc/apt/sources.list"
|
||||||
USAGE="${PROGRAM} {source|binary} [--force]"
|
USAGE="${PROGRAM} [--force]"
|
||||||
|
|
||||||
_PASS="${1}"
|
|
||||||
shift
|
|
||||||
|
|
||||||
if [ "${_PASS}" != "binary" ] && [ "${_PASS}" != "source" ]; then
|
|
||||||
Usage
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Processing arguments and configuration files
|
# Processing arguments and configuration files
|
||||||
Init_config_data "${@}"
|
Init_config_data "${@}"
|
||||||
|
@ -49,7 +42,7 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Configure custom sources.list
|
# Configure custom sources.list
|
||||||
Create_apt_sources_list chroot "${_PASS}"
|
Create_apt_sources_list chroot
|
||||||
|
|
||||||
# Adding local apt sources (chroot)
|
# Adding local apt sources (chroot)
|
||||||
for FILE in config/archives/*.list config/archives/*.list.chroot
|
for FILE in config/archives/*.list config/archives/*.list.chroot
|
||||||
|
@ -61,12 +54,6 @@ do
|
||||||
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
|
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
|
||||||
-e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
|
-e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \
|
||||||
"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
|
"${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
|
||||||
|
|
||||||
if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ]
|
|
||||||
then
|
|
||||||
# Disable source archives
|
|
||||||
sed -i "s/^deb-src/#deb-src/g" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue