Merge pull request #915 from linuxserver/mod-scripts-move-lsiown

Remove lsiown and legacy s6 handlers
linuxserver · Jun 12, 2024 · c3c1a08 · c3c1a08
2 parents b4f7034 + aaf71c6
commit c3c1a08
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 These files are used by Linuxserver build processes to handle mods in our images. Not for end-user consumption.
 
+* **10.06.24:** - Move lsiown to its own file. Remove support for legacy v2 and hybrid mods.
 * **13.04.24:** - Let lsiown ignore broken symlinks (requires gnu find).
 * **26.03.24:** - Add versioning and debug logging to package install script, force venv creation when python packages are to be installed.
 * **25.02.24:** - Support unauthenticated registries.

diff --git a/docker-mods.v3 b/docker-mods.v3
@@ -6,7 +6,8 @@
 # Version 3
 # 2022-09-25 - Initial Release
 # 2024-04-13 - Let lsiown ignore broken symlinks (requires gnu find)
-MOD_SCRIPT_VER="3.20240413"
+# 2024-06-12 - Remove lsiown and legacy s6 handlers
+MOD_SCRIPT_VER="3.20240612"
 
 # Define custom folder paths
 SCRIPTS_DIR="/custom-cont-init.d"
@@ -18,14 +19,6 @@ else
   CURL_NOISE_LEVEL="--silent"
 fi
 
-# Set executable bit on cont-init and services built into the image
-set_legacy_executable_bits() {
-    mkdir -p /etc/{cont-init.d,services.d}
-    chmod +x \
-        /etc/cont-init.d/* \
-        /etc/services.d/*/* 2>/dev/null || true
-}
-
 tamper_check() {
     # Tamper check custom service locations
     if [[ -d "${SERVICES_DIR}" ]] && [[ -n "$(find ${SERVICES_DIR}/* ! -user root 2>/dev/null)" ]]; then
@@ -105,39 +98,6 @@ process_custom_services() {
     fi
 }
 
-# Create our noisy chown alias to handle read-only/remote volumes
-create_lsiown_alias() {
-    # intentional tabs in the heredoc
-    cat <<-'EOF' >/usr/bin/lsiown
-	#!/bin/bash
-
-	MAXDEPTH=("-maxdepth" "0")
-	OPTIONS=()
-	while getopts RcfvhHLP OPTION
-	do
-	    if [[ "${OPTION}" != "?" && "${OPTION}" != "R" ]]; then
-	        OPTIONS+=("-${OPTION}")
-	    fi
-	    if [[ "${OPTION}" = "R" ]]; then
-	        MAXDEPTH=()
-	    fi
-	done
-
-	shift $((OPTIND - 1))
-	OWNER=$1
-	IFS=: read -r USER GROUP <<< "${OWNER}"
-	if [[ -z "${GROUP}" ]]; then
-	    printf '**** Permissions could not be set. Group is missing or incorrect, expecting user:group. ****\n'
-	    exit 0
-	fi
-
-	ERROR='**** Permissions could not be set. This is probably because your volume mounts are remote or read-only. ****\n**** The app may not work properly and we will not provide support for it. ****\n'
-	PATH=("${@:2}")
-	/usr/bin/find "${PATH[@]}" "${MAXDEPTH[@]}" ! -xtype l \( ! -group "${GROUP}" -o ! -user "${USER}" \) -exec chown "${OPTIONS[@]}" "${USER}":"${GROUP}" {} + || printf "${ERROR}"
-	EOF
-    chmod +x /usr/bin/lsiown
-}
-
 # Create our with-contenv alias with umask support
 create_with_contenv_alias() {
     if [[ ! -f /command/with-contenv ]]; then
@@ -418,13 +378,12 @@ run_mods() {
             fi
             write_mod_info "Installing ${DOCKER_MOD}"
             tar xzf /modtarball.tar.xz -C /tmp/mod
-            if [[ -d /tmp/mod/etc/s6-overlay ]]; then
-                if [[ -d /tmp/mod/etc/cont-init.d ]]; then
-                    rm -rf /tmp/mod/etc/cont-init.d
-                fi
-                if [[ -d /tmp/mod/etc/services.d ]]; then
-                    rm -rf /tmp/mod/etc/services.d
-                fi
+            # Remove any v2 mod elements as they're no longer supported
+            if [[ -d /tmp/mod/etc/cont-init.d ]]; then
+                rm -rf /tmp/mod/etc/cont-init.d
+            fi
+            if [[ -d /tmp/mod/etc/services.d ]]; then
+                rm -rf /tmp/mod/etc/services.d
             fi
             shopt -s dotglob
             cp -R /tmp/mod/* /
@@ -453,13 +412,12 @@ run_mods_local() {
                 mkdir -p "/tmp/mod/${DOCKER_MOD}"
                 tar xf "/mods/${DOCKER_MOD}.tar" -C /tmp/mod --strip-components=1
                 tar xf "/tmp/mod/layer.tar" -C "/tmp/mod/${DOCKER_MOD}"
-                if [[ -d "/tmp/mod/${DOCKER_MOD}/etc/s6-overlay" ]]; then
-                    if [[ -d "/tmp/mod/${DOCKER_MOD}/etc/cont-init.d" ]]; then
-                        rm -rf "/tmp/mod/${DOCKER_MOD}/etc/cont-init.d"
-                    fi
-                    if [[ -d "/tmp/mod/${DOCKER_MOD}/etc/services.d" ]]; then
-                        rm -rf "/tmp/mod/${DOCKER_MOD}/etc/services.d"
-                    fi
+                # Remove any v2 mod elements as they're no longer supported
+                if [[ -d "/tmp/mod/${DOCKER_MOD}/etc/cont-init.d" ]]; then
+                    rm -rf "/tmp/mod/${DOCKER_MOD}/etc/cont-init.d"
+                fi
+                if [[ -d "/tmp/mod/${DOCKER_MOD}/etc/services.d" ]]; then
+                    rm -rf "/tmp/mod/${DOCKER_MOD}/etc/services.d"
                 fi
                 shopt -s dotglob
                 cp -R "/tmp/mod/${DOCKER_MOD}"/* /
@@ -492,11 +450,9 @@ run_branding() {
 }
 
 # Run alias creation functions
-create_lsiown_alias
 create_with_contenv_alias
 
 # Main script loop
-
 if [[ -d "${SCRIPTS_DIR}" ]] || [[ -d "${SERVICES_DIR}" ]]; then
     tamper_check
     process_custom_services
@@ -513,6 +469,3 @@ fi
 if [[ "${LSIO_FIRST_PARTY}" = "true" ]]; then
     run_branding
 fi
-
-# Set executable bit on legacy cont-init and services built into the image and anything legacy unpacked by mods
-set_legacy_executable_bits