From 3d6b65895a30050d7b42880c16d9a259865238ab Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 23 Mar 2023 07:18:14 -0400 Subject: [PATCH] Update build.func revert --- misc/build.func | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/misc/build.func b/misc/build.func index 24336f62..977d4706 100644 --- a/misc/build.func +++ b/misc/build.func @@ -87,9 +87,6 @@ echo_default() { echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}" echo -e "${DGN}Using VLAN Tag: ${BGN}Default${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 "${BL}Creating a ${APP} LXC using the above default settings${CL}" } @@ -303,15 +300,6 @@ advanced_settings() { fi 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 VERB="yes" else @@ -367,29 +355,15 @@ start() { build_container() { if [ "$VERB" == "yes" ]; then set -x; fi - - if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then - if [ "$FUSE" == "yes" ]; then - FEATURES="fuse=1,keyctl=1,nesting=1" - else - FEATURES="keyctl=1,nesting=1" - fi + if [ "$CT_TYPE" == "1" ]; then + FEATURES="nesting=1,keyctl=1" + else + FEATURES="nesting=1" 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) pushd $TEMP_DIR >/dev/null export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)" export tz="$timezone" - if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then - export ST="$FUSE" - fi export DISABLEIPV6="$DISABLEIP6" export APPLICATION="$APP" export VERBOSE="$VERB"