BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Small cosmetic changes/readability

Browse Source
This commit is contained in:
JRGTH
2021-08-07 13:33:57 -04:00
parent e92451b37c
commit 125b829872
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usr/local/share/bastille/bootstrap.sh
View File

@@ -353,7 +353,7 @@ debootstrap_release() {
# Fetch the Linux flavor # Fetch the Linux flavor
info "Bootstrapping ${PLATFORM_OS} distfiles..." info "Bootstrapping ${PLATFORM_OS} distfiles..."
if ! debootstrap --foreign --arch=${ARCH_BOOTSTRAP} --no-check-gpg ${UBUNTU_FLAVOR} "${bastille_releasesdir}"/${DIR_BOOTSTRAP}; then if ! debootstrap --foreign --arch=${ARCH_BOOTSTRAP} --no-check-gpg ${LINUX_FLAVOR} "${bastille_releasesdir}"/${DIR_BOOTSTRAP}; then
## perform cleanup only for stale/empty directories on failure ## perform cleanup only for stale/empty directories on failure
if [ "${bastille_zfs_enable}" = "YES" ]; then if [ "${bastille_zfs_enable}" = "YES" ]; then
if [ -n "${bastille_zfs_zpool}" ]; then if [ -n "${bastille_zfs_zpool}" ]; then
@@ -370,7 +370,7 @@ debootstrap_release() {
error_exit "Bootstrap failed." error_exit "Bootstrap failed."
fi fi
case "${UBUNTU_FLAVOR}" in case "${LINUX_FLAVOR}" in
bionic|stretch|buster) bionic|stretch|buster)
info "Increasing APT::Cache-Start" info "Increasing APT::Cache-Start"
echo "APT::Cache-Start 251658240;" > "${bastille_releasesdir}"/${DIR_BOOTSTRAP}/etc/apt/apt.conf.d/00aptitude echo "APT::Cache-Start 251658240;" > "${bastille_releasesdir}"/${DIR_BOOTSTRAP}/etc/apt/apt.conf.d/00aptitude
@@ -510,28 +510,28 @@ http?://*/*/*)
#adding Ubuntu Bionic as valid "RELEASE" for POC @hackacad #adding Ubuntu Bionic as valid "RELEASE" for POC @hackacad
ubuntu_bionic|bionic|ubuntu-bionic) ubuntu_bionic|bionic|ubuntu-bionic)
PLATFORM_OS="Ubuntu/Linux" PLATFORM_OS="Ubuntu/Linux"
UBUNTU_FLAVOR="bionic" LINUX_FLAVOR="bionic"
DIR_BOOTSTRAP="Ubuntu_1804" DIR_BOOTSTRAP="Ubuntu_1804"
ARCH_BOOTSTRAP="amd64" ARCH_BOOTSTRAP="amd64"
debootstrap_release debootstrap_release
;; ;;
ubuntu_focal|focal|ubuntu-focal) ubuntu_focal|focal|ubuntu-focal)
PLATFORM_OS="Ubuntu/Linux" PLATFORM_OS="Ubuntu/Linux"
UBUNTU_FLAVOR="focal" LINUX_FLAVOR="focal"
DIR_BOOTSTRAP="Ubuntu_2004" DIR_BOOTSTRAP="Ubuntu_2004"
ARCH_BOOTSTRAP="amd64" ARCH_BOOTSTRAP="amd64"
debootstrap_release debootstrap_release
;; ;;
debian_stretch|stretch|debian-stretch) debian_stretch|stretch|debian-stretch)
PLATFORM_OS="Debian/Linux" PLATFORM_OS="Debian/Linux"
UBUNTU_FLAVOR="stretch" LINUX_FLAVOR="stretch"
DIR_BOOTSTRAP="Debian9" DIR_BOOTSTRAP="Debian9"
ARCH_BOOTSTRAP="amd64" ARCH_BOOTSTRAP="amd64"
debootstrap_release debootstrap_release
;; ;;
debian_buster|buster|debian-buster) debian_buster|buster|debian-buster)
PLATFORM_OS="Debian/Linux" PLATFORM_OS="Debian/Linux"
UBUNTU_FLAVOR="buster" LINUX_FLAVOR="buster"
DIR_BOOTSTRAP="Debian10" DIR_BOOTSTRAP="Debian10"
ARCH_BOOTSTRAP="amd64" ARCH_BOOTSTRAP="amd64"
debootstrap_release debootstrap_release