[ws-daemon] Fix shiftfs-module-loader

olearycrew · Oct 21, 2020 · 84be881 · 84be881
1 parent d54f791
commit 84be881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/chart/templates/ws-daemon-daemonset.yaml b/chart/templates/ws-daemon-daemonset.yaml
@@ -100,7 +100,7 @@ spec:
       initContainers:
       - name: shiftfs-module-loader
         volumeMounts:
-        - mountPath: /usr/src
+        - mountPath: /usr/src_node
           name: node-linux-src
           readOnly: true
         image: {{ template "gitpod.comp.imageFull" (dict "root" . "gp" $.Values "comp" $comp.userNamespaces.shiftfsModuleLoader) }}

diff --git a/components/ws-daemon/shiftfs-module-loader/entrypoint.sh b/components/ws-daemon/shiftfs-module-loader/entrypoint.sh
@@ -17,6 +17,6 @@ fi
 
 set -ex
 mkdir -p /lib/modules/${KERNEL_RELEASE}
-ln -s /usr/src/linux-headers-${KERNEL_RELEASE} /lib/modules/${KERNEL_RELEASE}/build
-dkms install -m ${DRIVER_NAME} -v ${DRIVER_VERSION} -k $KERNEL_RELEASE --kernelsourcedir /usr/src/linux-headers-${KERNEL_RELEASE}
+ln -s /usr/src_node/linux-headers-${KERNEL_RELEASE} /lib/modules/${KERNEL_RELEASE}/build
+dkms install -m ${DRIVER_NAME} -v ${DRIVER_VERSION} -k $KERNEL_RELEASE --kernelsourcedir /usr/src_node/linux-headers-${KERNEL_RELEASE}
 insmod /var/lib/dkms/${DRIVER_NAME}/${DRIVER_VERSION}/${KERNEL_RELEASE}/${ARCH}/module/${DRIVER_NAME}.ko