runit-void: Fix incorrect path for /etc/default/apparmor
This commit is contained in:
parent
1625f001d5
commit
9d33466d38
3 changed files with 16 additions and 2 deletions
13
srcpkgs/runit-void/runit-void-apparmor.INSTALL
Normal file
13
srcpkgs/runit-void/runit-void-apparmor.INSTALL
Normal 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
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'runit-void'
|
# Template file for 'runit-void'
|
||||||
pkgname=runit-void
|
pkgname=runit-void
|
||||||
version=20171102
|
version=20171102
|
||||||
revision=2
|
revision=3
|
||||||
wrksrc="void-runit-${version}"
|
wrksrc="void-runit-${version}"
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
homepage="http://www.voidlinux.eu"
|
homepage="http://www.voidlinux.eu"
|
||||||
|
@ -32,7 +32,7 @@ post_install() {
|
||||||
vconf ${FILESDIR}/hostname
|
vconf ${FILESDIR}/hostname
|
||||||
vconf ${FILESDIR}/os-release
|
vconf ${FILESDIR}/os-release
|
||||||
vconf ${FILESDIR}/locale.conf
|
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/
|
vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
|
||||||
# Enable services at post-install time instead.
|
# Enable services at post-install time instead.
|
||||||
rm -f ${DESTDIR}/etc/runit/runsvdir/current
|
rm -f ${DESTDIR}/etc/runit/runsvdir/current
|
||||||
|
@ -44,6 +44,7 @@ post_install() {
|
||||||
runit-void-apparmor_package() {
|
runit-void-apparmor_package() {
|
||||||
short_desc+=" - AppArmor initialization"
|
short_desc+=" - AppArmor initialization"
|
||||||
depends="${sourcepkg}-${version}_${revision}"
|
depends="${sourcepkg}-${version}_${revision}"
|
||||||
|
conf_files="/etc/default/apparmor"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove etc/default/apparmor
|
vmove etc/default/apparmor
|
||||||
vmove etc/runit/core-services/09-apparmor.sh
|
vmove etc/runit/core-services/09-apparmor.sh
|
||||||
|
|
Loading…
Reference in a new issue