From 3883e8b596b9d61ad9e42eee9fb6296ccac1c48c Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 29 Feb 2024 14:43:57 +0200 Subject: [PATCH] docker: Fix post function for Alpine build (package) It was using a wrong sysdir. ``` -------------------- 72 | # Own the config / PID files 73 | RUN mkdir -p /var/run/frr 74 | >>> RUN chown -R frr:frr /etc/frr /var/run/frr 75 | 76 | # Simple init manager for reaping processes and forwarding signals -------------------- ``` Signed-off-by: Donatas Abraitis --- alpine/APKBUILD.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/alpine/APKBUILD.in b/alpine/APKBUILD.in index 98d3e51452f4..2cb3feec157f 100644 --- a/alpine/APKBUILD.in +++ b/alpine/APKBUILD.in @@ -27,6 +27,7 @@ source="$pkgname-$pkgver.tar.gz" builddir="$srcdir"/$pkgname-$pkgver +_sysconfdir=/etc _sbindir=/usr/lib/frr _libdir=/usr/lib _user=frr @@ -36,7 +37,7 @@ build() { ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=$_sysconfdir \ --localstatedir=/var \ --sbindir=$_sbindir \ --libdir=$_libdir \ @@ -61,7 +62,9 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 "$builddir"/tools/etc/frr/daemons "$pkgdir"$_sysconfdir/daemons - install -d "$pkgdir"/etc/init.d - ln -s ${_sbindir}/frr "$pkgdir"/etc/init.d/frr + install -d $pkgdir/$_sysconfdir/frr + install -m 0644 tools/etc/frr/daemons $pkgdir/$_sysconfdir/frr/daemons + + install -d $pkgdir/$_sysconfdir/init.d + ln -s ${_sbindir}/frr $pkgdir/$_sysconfdir/init.d/frr }