diff --git a/debian-version/Dockerfile b/debian-version/Dockerfile index 5692e63..8d928f2 100644 --- a/debian-version/Dockerfile +++ b/debian-version/Dockerfile @@ -20,7 +20,6 @@ RUN echo "#!/bin/bash" > /sbin/systemctl && \ apt-get remove -y curl && \ apt autoremove -y && \ apt-get clean && \ - mkdir -p /var/lib/incus/lxcfs && \ echo '#!/bin/bash' > /start.sh && \ echo 'trap "cleanup; exit" SIGTERM' >> /start.sh && \ echo 'cleanup() {' >> /start.sh && \ @@ -30,7 +29,7 @@ RUN echo "#!/bin/bash" > /sbin/systemctl && \ echo ' echo "Stopped incusd."' >> /start.sh && \ echo ' echo "Stopping lxcfs..."' >> /start.sh && \ echo ' pkill -TERM lxcfs' >> /start.sh && \ - echo ' fusermount -u /var/lib/incus/lxcfs' >> /start.sh && \ + echo ' fusermount -u /var/lib/incus-lxcfs' >> /start.sh && \ echo ' echo "Stopped lxcfs."' >> /start.sh && \ echo '}' >> /start.sh && \ echo 'export PATH="/opt/incus/bin/:${PATH}"' >> /start.sh && \ @@ -55,10 +54,8 @@ RUN echo "#!/bin/bash" > /sbin/systemctl && \ echo ' ip6tables -I DOCKER-USER -j ACCEPT' >> /start.sh && \ echo ' fi' >> /start.sh && \ echo 'fi' >> /start.sh && \ -# echo 'if [ "$USELXCFS" = "true" ]; then' >> /start.sh && \ - echo ' mkdir -p /var/lib/incus/lxcfs' >> /start.sh && \ - echo ' /opt/incus/bin/lxcfs /var/lib/incus/lxcfs --enable-loadavg --enable-cfs &' >> /start.sh && \ -# echo 'fi' >> /start.sh && \ + echo ' mkdir -p /var/lib/incus-lxcfs' >> /start.sh && \ + echo ' /opt/incus/bin/lxcfs /var/lib/incus-lxcfs --enable-loadavg --enable-cfs &' >> /start.sh && \ # echo '/usr/lib/systemd/systemd-udevd &' >> /start.sh && \ echo '/opt/incus/bin/incusd' >> /start.sh && \ chmod +x /start.sh