diff --git a/main/grub-btrfs/.pkgfiles b/main/grub-btrfs/.pkgfiles index a25fc6e00..991b94419 100644 --- a/main/grub-btrfs/.pkgfiles +++ b/main/grub-btrfs/.pkgfiles @@ -1,4 +1,4 @@ -grub-btrfs-4.13-2 +grub-btrfs-4.13-3 drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/default/ drwxr-xr-x root/root etc/default/grub-btrfs/ @@ -7,11 +7,6 @@ drwxr-xr-x root/root etc/grub.d/ -rwxr-xr-x root/root etc/grub.d/41_snapshots-btrfs drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/grub-btrfs -drwxr-xr-x root/root etc/sv/ -drwxr-xr-x root/root etc/sv/grub-btrfs/ --rwxr-xr-x root/root etc/sv/grub-btrfs/conf --rwxr-xr-x root/root etc/sv/grub-btrfs/run -lrwxrwxrwx root/root etc/sv/grub-btrfs/supervise -> /run/runit/supervise.grub-btrfs drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr--r-- root/root usr/bin/grub-btrfsd diff --git a/main/grub-btrfs/spkgbuild b/main/grub-btrfs/spkgbuild index a5ef44aa4..a71c42c19 100644 --- a/main/grub-btrfs/spkgbuild +++ b/main/grub-btrfs/spkgbuild @@ -5,7 +5,7 @@ name=grub-btrfs version=4.13 -release=2 +release=3 backup="etc/default/grub-btrfs/config" source="$name-$version.tar.gz::https://github.com/Antynea/$name/archive/$version.tar.gz run.grub-btrfs @@ -18,15 +18,18 @@ build() { make DESTDIR=$PKG install # remove systemd things rm -rf $PKG/usr/lib/systemd + rm -rf $PKG/usr/share/licenses - # Install services + _runit() { # runit install -Dm755 $SRC/run.grub-btrfs $PKG/etc/sv/grub-btrfs/run install $SRC/conf $PKG/etc/sv/grub-btrfs/conf ln -s /run/runit/supervise.grub-btrfs $PKG/etc/sv/grub-btrfs/supervise + } + _sysv() { # sysv install -Dm755 $SRC/rc.grub-btrfs $PKG/etc/rc.d/grub-btrfs - - rm -rf $PKG/usr/share/licenses + } + scratch isinstalled runit && _runit || _sysv }