diff options
| -rw-r--r-- | system/incus/README | 5 | ||||
| -rw-r--r-- | system/incus/incus.SlackBuild | 10 | ||||
| -rw-r--r-- | system/incus/incus.info | 8 | ||||
| -rw-r--r-- | system/incus/rc.incusd.new | 5 |
4 files changed, 22 insertions, 6 deletions
diff --git a/system/incus/README b/system/incus/README index 630ef12e690b5..e6c63309195cc 100644 --- a/system/incus/README +++ b/system/incus/README @@ -40,3 +40,8 @@ the following snippet to /etc/rc.d/rc.local if [ -x /etc/rc.d/rc.incusd ]; then . /etc/rc.d/rc.incusd start fi + +From version 6.7, the necessary files to run the incus web ui +are included. To set this up, see: + https://blog.simos.info/how-to-install-and-setup-the-incus-web-ui/ + diff --git a/system/incus/incus.SlackBuild b/system/incus/incus.SlackBuild index ad123234c2f58..b56dd69622aeb 100644 --- a/system/incus/incus.SlackBuild +++ b/system/incus/incus.SlackBuild @@ -25,11 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=incus -VERSION=${VERSION:-6.6} +VERSION=${VERSION:-6.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +INCUS_UI=${PRGNAM}-ui-canonical_${VERSION}-ubuntu24.04-202411151754_amd64.deb + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -111,6 +113,12 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# Add web ui +cd $PKG +ar p $CWD/$INCUS_UI data.tar.zst |tar xv --zst +cp -a usr/share/doc/incus-ui-canonical $PKG/usr/doc/$PRGNAM-$VERSION/ +rm -rf $PKG/usr/share/doc + INCUSD_GROUP=${INCUSD_GROUP:-wheel} mkdir -p $PKG/etc/default cat >$PKG/etc/default/incus.new <<EOF diff --git a/system/incus/incus.info b/system/incus/incus.info index dec5d435fd9e6..9190a90e1d09c 100644 --- a/system/incus/incus.info +++ b/system/incus/incus.info @@ -1,8 +1,10 @@ PRGNAM="incus" -VERSION="6.6" +VERSION="6.7" HOMEPAGE="https://linuxcontainers.org/incus" -DOWNLOAD="https://github.com/lxc/incus/releases/download/v6.6.0/incus-6.6.tar.xz" -MD5SUM="c23d2c6cc8c87fc7f6a1dc81f4dda2b8" +DOWNLOAD="https://github.com/lxc/incus/releases/download/v6.7.0/incus-6.7.tar.xz \ + https://pkgs.zabbly.com/incus/stable/pool/main/i/incus/incus-ui-canonical_6.7-ubuntu24.04-202411151754_amd64.deb" +MD5SUM="5f8dd9922886bad5545fea6fa4827d89 \ + 5174cee17f50ac4aece1c46114d0fe11" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cowsql edk2-ovmf google-go-lang" diff --git a/system/incus/rc.incusd.new b/system/incus/rc.incusd.new index ef7ca4aea555c..e7271c9e17e4b 100644 --- a/system/incus/rc.incusd.new +++ b/system/incus/rc.incusd.new @@ -5,7 +5,8 @@ # start/stop/restart incusd as a daemon. -INCUSD_GROUP=wheel +export INCUSD_GROUP=wheel +export INCUS_UI=/opt/incus/ui # Use defaults from /etc/default/incusd # (overrides anything set above). @@ -16,7 +17,7 @@ fi incusd_start() { - echo "Starting incusd: /usr/sbin/incus --group $INCUSD_GROUP --logfile=/var/log/incus/incusd.log" + echo "Starting incusd: /usr/sbin/incus --group $INCUSD_GROUP --logfile=/var/log/incus/incusd.log (INCUS_UI=$INCUS_UI)" INCUS_EDK2_PATH=/usr/share/edk2-ovmf-x64 /usr/sbin/incusd --group $INCUSD_GROUP --logfile=/var/log/incus/incusd.log 2>/dev/null & } |