jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

runit-void: Fix incorrect path for /etc/default/apparmor

Browse source
This commit is contained in:
Olivier Mauras 2018-06-04 22:32:02 +00:00 committed by Enno Boland
parent 1625f001d5
commit 9d33466d38
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
srcpkgs/runit-void/files/rc.apparmor → srcpkgs/runit-void/files/apparmor
View file

13
srcpkgs/runit-void/runit-void-apparmor.INSTALL Normal file
View file

@ -0,0 +1,13 @@
case "$ACTION" in
pre)
# Fix incorrect path in /etc/default
if [ -e /etc/default/apparmor/rc.apparmor ]; then
mv /etc/default/apparmor/rc.apparmor /etc/default/rc.apparmor
rm -rf /etc/default/apparmor
mv /etc/default/rc.apparmor /etc/default/apparmor
fi
if [ -d /etc/default/apparmor ]; then
rm -rf /etc/default/apparmor
fi
;;
esac

5
srcpkgs/runit-void/template
View file

@ -1,7 +1,7 @@
# Template file for 'runit-void'
pkgname=runit-void
version=20171102
revision=2
revision=3
wrksrc="void-runit-${version}"
build_style=gnu-makefile
homepage="http://www.voidlinux.eu"
@ -32,7 +32,7 @@ post_install() {
vconf ${FILESDIR}/hostname
vconf ${FILESDIR}/os-release
vconf ${FILESDIR}/locale.conf
vinstall ${FILESDIR}/rc.apparmor 644 /etc/default/apparmor
vinstall ${FILESDIR}/apparmor 644 /etc/default/
vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
# Enable services at post-install time instead.
rm -f ${DESTDIR}/etc/runit/runsvdir/current
@ -44,6 +44,7 @@ post_install() {
runit-void-apparmor_package() {
short_desc+=" - AppArmor initialization"
depends="${sourcepkg}-${version}_${revision}"
conf_files="/etc/default/apparmor"
pkg_install() {
vmove etc/default/apparmor
vmove etc/runit/core-services/09-apparmor.sh