fuse-overlayfs option (#876)

CasaOS
Umbrel
This commit is contained in:
tteckster 2022-12-28 06:41:43 -05:00 committed by GitHub
parent f3c45d0398
commit 552cff8a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 8 deletions

View File

@ -100,6 +100,8 @@ function default_settings() {
VLAN="" VLAN=""
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
SSH="no" SSH="no"
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
FUSE="no"
echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}" echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
VERB="no" VERB="no"
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}"
@ -251,6 +253,13 @@ function advanced_settings() {
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
SSH="no" SSH="no"
fi fi
if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}Yes${CL}"
FUSE="yes"
else
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
FUSE="no"
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
echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}" echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
VERB="yes" VERB="yes"
@ -281,13 +290,14 @@ function start_script() {
clear clear
start_script start_script
if [ "$VERB" == "yes" ]; then set -x; fi if [ "$VERB" == "yes" ]; then set -x; fi
if [ "$CT_TYPE" == "1" ]; then if [ "$FUSE" == "yes" ]; then
FEATURES="nesting=1,keyctl=1" FEATURES="fuse=1,keyctl=1,nesting=1"
else else
FEATURES="nesting=1" FEATURES="keyctl=1,nesting=1"
fi fi
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null pushd $TEMP_DIR >/dev/null
export ST=$FUSE
export VERBOSE=$VERB export VERBOSE=$VERB
export SSH_ROOT=${SSH} export SSH_ROOT=${SSH}
export CTID=$CT_ID export CTID=$CT_ID

View File

@ -100,6 +100,8 @@ function default_settings() {
VLAN="" VLAN=""
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
SSH="no" SSH="no"
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
FUSE="no"
echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}" echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
VERB="no" VERB="no"
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}"
@ -251,6 +253,13 @@ function advanced_settings() {
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}"
SSH="no" SSH="no"
fi fi
if (whiptail --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}Yes${CL}"
FUSE="yes"
else
echo -e "${DGN}(ZFS) Enable Fuse Overlayfs: ${BGN}No${CL}"
FUSE="no"
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
echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}" echo -e "${DGN}Enable Verbose Mode: ${BGN}Yes${CL}"
VERB="yes" VERB="yes"
@ -281,13 +290,14 @@ function start_script() {
clear clear
start_script start_script
if [ "$VERB" == "yes" ]; then set -x; fi if [ "$VERB" == "yes" ]; then set -x; fi
if [ "$CT_TYPE" == "1" ]; then if [ "$FUSE" == "yes" ]; then
FEATURES="nesting=1,keyctl=1" FEATURES="fuse=1,keyctl=1,nesting=1"
else else
FEATURES="nesting=1" FEATURES="keyctl=1,nesting=1"
fi fi
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null pushd $TEMP_DIR >/dev/null
export ST=$FUSE
export VERBOSE=$VERB export VERBOSE=$VERB
export SSH_ROOT=${SSH} export SSH_ROOT=${SSH}
export CTID=$CT_ID export CTID=$CT_ID

View File

@ -96,6 +96,13 @@ cat >$DOCKER_CONFIG_PATH <<'EOF'
EOF EOF
msg_info "Installing CasaOS (Patience)" msg_info "Installing CasaOS (Patience)"
if [ "$ST" == "yes" ]; then
VER=$(curl -s https://api.github.com/repos/containers/fuse-overlayfs/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
cd /usr/local/bin
curl -sSL -o fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/$VER/fuse-overlayfs-x86_64
chmod 755 /usr/local/bin/fuse-overlayfs
cd ~
fi
wget -qO- https://get.casaos.io | bash &>/dev/null wget -qO- https://get.casaos.io | bash &>/dev/null
msg_ok "Installed CasaOS" msg_ok "Installed CasaOS"

View File

@ -95,6 +95,13 @@ cat >$DOCKER_CONFIG_PATH <<'EOF'
EOF EOF
msg_info "Installing Umbrel (Patience)" msg_info "Installing Umbrel (Patience)"
if [ "$ST" == "yes" ]; then
VER=$(curl -s https://api.github.com/repos/containers/fuse-overlayfs/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
cd /usr/local/bin
curl -sSL -o fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/$VER/fuse-overlayfs-x86_64
chmod 755 /usr/local/bin/fuse-overlayfs
cd ~
fi
curl -sL https://umbrel.sh | bash &>/dev/null curl -sL https://umbrel.sh | bash &>/dev/null
systemctl daemon-reload systemctl daemon-reload
systemctl enable --now umbrel-startup.service &>/dev/null systemctl enable --now umbrel-startup.service &>/dev/null