Merge pull request #197 from simondeziel/no-shiftfs-latest-candidate

Drop `shiftfs.enable` configuration key (latest-candidate)

snapcraft.yaml

@@ -47,7 +47,6 @@ description: |-
    - openvswitch.builtin: Run a snap-specific OVS daemon [default=false]
    - openvswitch.external: Use the system's OVS tools (ignores openvswitch.builtin) [default=false]
    - ovn.builtin: Use snap-specific OVN configuration [default=false]
-   - shiftfs.enable: Enable shiftfs support [default=auto]
    - ui.enable: Enable the experimental web interface [default=false]
 
  For system-wide configuration of the CLI, place your configuration in

snapcraft/commands/daemon.start

@@ -459,18 +459,6 @@ fi
 echo "==> Exposing LXD documentation"
 export LXD_DOCUMENTATION="${SNAP_CURRENT}/share/lxd-documentation"
 
-# Setup shiftfs
-if [ "${shiftfs_enable:-"auto"}" = "auto" ]; then
-    echo "==> Disabling shiftfs on this kernel (auto)"
-    shiftfs_enable="false"
-elif [ "${shiftfs_enable:-"auto"}" = "false" ]; then
-    echo "==> Disabling shiftfs at user request"
-fi
-
-if [ "${shiftfs_enable:-"auto"}" = "false" ]; then
-    export LXD_SHIFTFS_DISABLE=true
-fi
-
 # LXC
 ## Host specific overrides
 mkdir -p "${SNAP_COMMON}/lxc"

snapcraft/hooks/configure

@@ -55,7 +55,6 @@ lxcfs_debug=$(get_bool "$(snapctl get lxcfs.debug)")
 openvswitch_builtin=$(get_bool "$(snapctl get openvswitch.builtin)")
 openvswitch_external=$(get_bool "$(snapctl get openvswitch.external)")
 ovn_builtin=$(get_bool "$(snapctl get ovn.builtin)")
-shiftfs_enable=$(get_bool "$(snapctl get shiftfs.enable)")
 ui_enable=$(get_bool "$(snapctl get ui.enable)")
 
 # Special-handling of daemon.preseed
@@ -85,7 +84,6 @@ config="${SNAP_COMMON}/config"
     echo "openvswitch_builtin=${openvswitch_builtin:-"false"}"
     echo "openvswitch_external=${openvswitch_external:-"false"}"
     echo "ovn_builtin=${ovn_builtin:-"false"}"
-    echo "shiftfs_enable=${shiftfs_enable:-"auto"}"
     echo "ui_enable=${ui_enable:-"false"}"
 } > "${config}"