diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-02 05:21:30 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-02 05:21:30 +0000 |
| commit | b7ff9f469ba23bf1b492c5dc14a40302e98ba72b (patch) | |
| tree | 975f4167f80e38fa1a9c5b1c0e7769aab1f5759c /system | |
| parent | addcb5d4b2d24c7927c597d156f5a31a3df2ab31 (diff) | |
| parent | f782f26af11f6d6ddc0074506f410d36409ebeae (diff) | |
| download | packages-b7ff9f469ba23bf1b492c5dc14a40302e98ba72b.tar.gz packages-b7ff9f469ba23bf1b492c5dc14a40302e98ba72b.tar.bz2 packages-b7ff9f469ba23bf1b492c5dc14a40302e98ba72b.tar.xz packages-b7ff9f469ba23bf1b492c5dc14a40302e98ba72b.zip | |
Merge branch 'fixes' into 'master'
Small fixes to iproute2 and lvm2
See merge request adelie/packages!305
Diffstat (limited to 'system')
| -rw-r--r-- | system/iproute2/APKBUILD | 1 | ||||
| -rw-r--r-- | system/iproute2/iproute2.post-install | 6 | ||||
| -rw-r--r-- | system/lvm2/APKBUILD | 4 |
3 files changed, 4 insertions, 7 deletions
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 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 \ |