Add debian stretch/buster, small changes
This commit is contained in:
@@ -370,9 +370,12 @@ debootstrap_release() {
|
|||||||
error_exit "Bootstrap failed."
|
error_exit "Bootstrap failed."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${UBUNTU_FLAVOR}" = "bionic" ]; then
|
case "${UBUNTU_FLAVOR}" in
|
||||||
|
bionic|stretch|buster)
|
||||||
|
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
|
||||||
fi
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
info "Bootstrap successful."
|
info "Bootstrap successful."
|
||||||
info "See 'bastille --help' for available commands."
|
info "See 'bastille --help' for available commands."
|
||||||
@@ -519,6 +522,20 @@ ubuntu_focal|focal|ubuntu-focal)
|
|||||||
ARCH_BOOTSTRAP="amd64"
|
ARCH_BOOTSTRAP="amd64"
|
||||||
debootstrap_release
|
debootstrap_release
|
||||||
;;
|
;;
|
||||||
|
debian_stretch|stretch|debian-stretch)
|
||||||
|
PLATFORM_OS="Debian/Linux"
|
||||||
|
UBUNTU_FLAVOR="stretch"
|
||||||
|
DIR_BOOTSTRAP="Debian9"
|
||||||
|
ARCH_BOOTSTRAP="amd64"
|
||||||
|
debootstrap_release
|
||||||
|
;;
|
||||||
|
debian_buster|buster|debian-buster)
|
||||||
|
PLATFORM_OS="Debian/Linux"
|
||||||
|
UBUNTU_FLAVOR="buster"
|
||||||
|
DIR_BOOTSTRAP="Debian10"
|
||||||
|
ARCH_BOOTSTRAP="amd64"
|
||||||
|
debootstrap_release
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -207,32 +207,37 @@ case "${TARGET}" in
|
|||||||
;;
|
;;
|
||||||
*-stable-LAST|*-STABLE-last|*-stable-last|*-STABLE-LAST)
|
*-stable-LAST|*-STABLE-last|*-stable-last|*-STABLE-LAST)
|
||||||
## check for HardenedBSD releases name
|
## check for HardenedBSD releases name
|
||||||
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '^([1-9]{2,2})(-stable-last)$' | sed 's/STABLE/stable/;s/last/LAST/g')
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '^([1-9]{2,2})(-stable-last)$' | sed 's/STABLE/stable/g;s/last/LAST/g')
|
||||||
destroy_rel
|
destroy_rel
|
||||||
;;
|
;;
|
||||||
*-stable-build-[0-9]*|*-STABLE-BUILD-[0-9]*)
|
*-stable-build-[0-9]*|*-STABLE-BUILD-[0-9]*)
|
||||||
## check for HardenedBSD(specific stable build releases)
|
## check for HardenedBSD(specific stable build releases)
|
||||||
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '([0-9]{1,2})(-stable-build)-([0-9]{1,3})$' | sed 's/BUILD/build/;s/STABLE/stable/g')
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '([0-9]{1,2})(-stable-build)-([0-9]{1,3})$' | sed 's/BUILD/build/g;s/STABLE/stable/g')
|
||||||
destroy_rel
|
destroy_rel
|
||||||
;;
|
;;
|
||||||
*-stable-build-latest|*-stable-BUILD-LATEST|*-STABLE-BUILD-LATEST)
|
*-stable-build-latest|*-stable-BUILD-LATEST|*-STABLE-BUILD-LATEST)
|
||||||
## check for HardenedBSD(latest stable build release)
|
## check for HardenedBSD(latest stable build release)
|
||||||
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '([0-9]{1,2})(-stable-build-latest)$' | sed 's/STABLE/stable/;s/build/BUILD/;s/latest/LATEST/g')
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '([0-9]{1,2})(-stable-build-latest)$' | sed 's/STABLE/stable/;s/build/BUILD/g;s/latest/LATEST/g')
|
||||||
destroy_rel
|
destroy_rel
|
||||||
;;
|
;;
|
||||||
current-build-[0-9]*|CURRENT-BUILD-[0-9]*)
|
current-build-[0-9]*|CURRENT-BUILD-[0-9]*)
|
||||||
## check for HardenedBSD(specific current build releases)
|
## check for HardenedBSD(specific current build releases)
|
||||||
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(current-build)-([0-9]{1,3})' | sed 's/BUILD/build/;s/CURRENT/current/g')
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(current-build)-([0-9]{1,3})' | sed 's/BUILD/build/g;s/CURRENT/current/g')
|
||||||
destroy_rel
|
destroy_rel
|
||||||
;;
|
;;
|
||||||
current-build-latest|current-BUILD-LATEST|CURRENT-BUILD-LATEST)
|
current-build-latest|current-BUILD-LATEST|CURRENT-BUILD-LATEST)
|
||||||
## check for HardenedBSD(latest current build release)
|
## check for HardenedBSD(latest current build release)
|
||||||
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(current-build-latest)$' | sed 's/CURRENT/current/;s/build/BUILD/;s/latest/LATEST/g')
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(current-build-latest)$' | sed 's/CURRENT/current/;s/build/BUILD/g;s/latest/LATEST/g')
|
||||||
destroy_rel
|
destroy_rel
|
||||||
;;
|
;;
|
||||||
Ubuntu_1804|Ubuntu_2004|UBUNTU_1804|UBUNTU_2004)
|
Ubuntu_1804|Ubuntu_2004|UBUNTU_1804|UBUNTU_2004)
|
||||||
## check for Linux releases
|
## check for Linux releases
|
||||||
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Ubuntu_1804)$|(Ubuntu_2004)$' | sed 's/UBUNTU/Ubuntu/;s/ubuntu/Ubuntu/g')
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Ubuntu_1804)$|(Ubuntu_2004)$' | sed 's/UBUNTU/Ubuntu/g;s/ubuntu/Ubuntu/g')
|
||||||
|
destroy_rel
|
||||||
|
;;
|
||||||
|
Debian9|Debian10|DEBIAN9|DEBIAN10)
|
||||||
|
## check for Linux releases
|
||||||
|
NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Debian9)$|(Debian10)$' | sed 's/DEBIAN/Debian/g')
|
||||||
destroy_rel
|
destroy_rel
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
Reference in New Issue
Block a user