From a4bf8c0b7d41663aee20f8064c920e653eb820e1 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Thu, 1 Aug 2019 22:20:13 -0500 Subject: system/iproute2: Remove obsolete post-install script Signed-off-by: Samuel Holland --- system/iproute2/APKBUILD | 1 - system/iproute2/iproute2.post-install | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 system/iproute2/iproute2.post-install (limited to 'system') diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index 4b4b6060c..b4e32f6a8 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -11,7 +11,6 @@ options="!check" license="GPL-2.0-only" depends="" makedepends="bison flex bash libelf-dev libmnl-dev libcap-dev bsd-compat-headers" -install="$pkgname.post-install" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="https://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz devlink-sysinfo.patch" diff --git a/system/iproute2/iproute2.post-install b/system/iproute2/iproute2.post-install deleted file mode 100644 index 36d567ea2..000000000 --- a/system/iproute2/iproute2.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$(readlink /bin/ip)" = "/bin/busybox" ]; then - rm -f /bin/ip -fi -exit 0 -- cgit v1.2.3-70-g09d2 From f782f26af11f6d6ddc0074506f410d36409ebeae Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Thu, 1 Aug 2019 22:23:55 -0500 Subject: system/lvm2: Always use /run for ephemeral state Previously, autodetection on the arm64 builder chose to put lockfiles in /var/lock. This broke running pvscan from a udev rule with read-only / and separate /var. Make this option and related ones always use /run, independent of the build environment. --- system/lvm2/APKBUILD | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'system') diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD index 842dee2fa..fc491a70a 100644 --- a/system/lvm2/APKBUILD +++ b/system/lvm2/APKBUILD @@ -51,6 +51,10 @@ build () { --with-thin=internal \ --enable-dmeventd \ --enable-cmdlib \ + --with-default-dm-run-dir=/run \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-pid-dir=/run \ + --with-default-run-dir=/run/lvm \ --with-thin-check=/sbin/thin_check \ --with-thin-dump=/sbin/thin_dump \ --with-thin-repair=/sbin/thin_repair \ -- cgit v1.2.3-70-g09d2