Update build.func

revert
This commit is contained in:
tteckster 2023-03-23 07:18:14 -04:00 committed by GitHub
parent 8500e495b0
commit 3d6b65895a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 30 deletions

View File

@ -87,9 +87,6 @@ echo_default() {
echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}" echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}" echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}"
fi
echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}" echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}" echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}"
} }
@ -303,15 +300,6 @@ advanced_settings() {
fi fi
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
FUSE="yes"
else
FUSE="no"
fi
echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}$FUSE${CL}"
fi
if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then if (whiptail --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
VERB="yes" VERB="yes"
else else
@ -367,29 +355,15 @@ start() {
build_container() { build_container() {
if [ "$VERB" == "yes" ]; then set -x; fi if [ "$VERB" == "yes" ]; then set -x; fi
if [ "$CT_TYPE" == "1" ]; then
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then FEATURES="nesting=1,keyctl=1"
if [ "$FUSE" == "yes" ]; then else
FEATURES="fuse=1,keyctl=1,nesting=1" FEATURES="nesting=1"
else
FEATURES="keyctl=1,nesting=1"
fi
fi fi
if [[ "$APP" != "Docker" && "$APP" != "Umbrel" && "$APP" != "CasaOS" && "$APP" != "Home Assistant"]]; then
if [ "$CT_TYPE" == "1" ]; then
FEATURES="keyctl=1,nesting=1"
else
FEATURES="nesting=1"
fi
fi
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null pushd $TEMP_DIR >/dev/null
export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)" export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)"
export tz="$timezone" export tz="$timezone"
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
export ST="$FUSE"
fi
export DISABLEIPV6="$DISABLEIP6" export DISABLEIPV6="$DISABLEIP6"
export APPLICATION="$APP" export APPLICATION="$APP"
export VERBOSE="$VERB" export VERBOSE="$VERB"