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

lint

Browse Source
This commit is contained in:
Bike Dude
2021-02-10 15:07:53 +01:00
parent 056b0237ad
commit 4373b8b8d9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr/local/share/bastille/bootstrap.sh
+5 -5
View File
@@ -448,7 +448,7 @@ ubuntu_bionic|bionic|ubuntu-bionic)
esac esac
fi fi
if which -s debootstrap; then if which -s debootstrap; then
debootstrap --foreign --arch=amd64 --no-check-gpg bionic ${bastille_releasesdir}/Ubuntu_1804 debootstrap --foreign --arch=amd64 --no-check-gpg bionic "${bastille_releasesdir}"/Ubuntu_1804
else else
warn "Debootstrap not found. Should it be installed? (N|y)" warn "Debootstrap not found. Should it be installed? (N|y)"
read answer read answer
@@ -458,11 +458,11 @@ ubuntu_bionic|bionic|ubuntu-bionic)
;; ;;
yes|Yes|y|Y) yes|Yes|y|Y)
pkg install debootstrap -y pkg install debootstrap -y
debootstrap --foreign --arch=amd64 --no-check-gpg bionic ${bastille_releasesdir}/Ubuntu_1804 debootstrap --foreign --arch=amd64 --no-check-gpg bionic "${bastille_releasesdir}"/Ubuntu_1804
;; ;;
esac esac
fi fi
echo "APT::Cache-Start 251658240;" > ${bastille_releasesdir}/Ubuntu_1804/etc/apt/apt.conf.d/00aptitude echo "APT::Cache-Start 251658240;" > "${bastille_releasesdir}"/Ubuntu_1804/etc/apt/apt.conf.d/00aptitude
;; ;;
ubuntu_focal|focal|ubuntu-focal) ubuntu_focal|focal|ubuntu-focal)
#check and install OS dependencies @hackacad #check and install OS dependencies @hackacad
@@ -486,7 +486,7 @@ ubuntu_focal|focal|ubuntu-focal)
esac esac
fi fi
if which -s debootstrap; then if which -s debootstrap; then
debootstrap --foreign --arch=amd64 --no-check-gpg focal ${bastille_releasesdir}/Ubuntu_2004 debootstrap --foreign --arch=amd64 --no-check-gpg focal "${bastille_releasesdir}"/Ubuntu_2004
else else
warn "Debootstrap not found. Should it be installed? (N|y)" warn "Debootstrap not found. Should it be installed? (N|y)"
read answer read answer
@@ -496,7 +496,7 @@ ubuntu_focal|focal|ubuntu-focal)
;; ;;
yes|Yes|y|Y) yes|Yes|y|Y)
pkg install debootstrap -y pkg install debootstrap -y
debootstrap --foreign --arch=amd64 --no-check-gpg focal ${bastille_releasesdir}/Ubuntu_2004 debootstrap --foreign --arch=amd64 --no-check-gpg focal "${bastille_releasesdir}"/Ubuntu_2004
;; ;;
esac esac
fi fi
usr/local/share/bastille/console.sh
+2 -2
View File
@@ -76,11 +76,11 @@ check_fib() {
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
info "[${_jail}]:" info "[${_jail}]:"
LOGIN="$(jexec -l "${_jail}" which login)" #needs to be added for validate_user as well @hackacad LOGIN="$(jexec -l "${_jail}" which login)"
if [ -n "${USER}" ]; then if [ -n "${USER}" ]; then
validate_user validate_user
else else
LOGIN="$(jexec -l "${_jail}" which login)" #needs to be added for validate_user as well @hackacad LOGIN="$(jexec -l "${_jail}" which login)"
${_setfib} jexec -l "${_jail}" $LOGIN -f root ${_setfib} jexec -l "${_jail}" $LOGIN -f root
fi fi
echo echo
usr/local/share/bastille/create.sh
+1 -1
View File
@@ -425,7 +425,7 @@ create_jail() {
# Jail must be started before applying the default template. -- cwells # Jail must be started before applying the default template. -- cwells
if [ -z "${EMPTY_JAIL}" ]; then if [ -z "${EMPTY_JAIL}" ]; then
bastille start "${NAME}" bastille start "${NAME}"
elif [ -n "${EMPTY_JAIL}" ]; then elif [ -n "${EMPTY_JAIL}" ]; then
# Don't start empty jails unless a template defined. # Don't start empty jails unless a template defined.
if [ -n "${bastille_template_empty}" ]; then if [ -n "${bastille_template_empty}" ]; then