From f7a956ef2e6599fe22a93fc1a6481263e777797a Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Thu, 28 Nov 2013 14:56:33 +0100 Subject: [PATCH] archlinux: fixes due to new archlinux releases --- archlinux/PKGBUILD | 2 +- archlinux/PKGBUILD.install | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 346bab5..4b2179f 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer: Olivier Medoc pkgname=qubes-vm-core pkgver=`cat version` -pkgrel=13 +pkgrel=14 epoch= pkgdesc="The Qubes core files for installation inside a Qubes VM." arch=("x86_64") diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index 972b50a..bf0f70d 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -52,11 +52,15 @@ fi /usr/lib/qubes/qubes-fix-nm-conf.sh # Remove ip_forward setting from sysctl, so NM will not reset it -sed 's/^net.ipv4.ip_forward.*/#\0/' -i /etc/sysctl.conf +# Archlinux now use sysctl.d/ instead of sysctl.conf +# sed 's/^net.ipv4.ip_forward.*/#\0/' -i /etc/sysctl.conf + # Install firmware link only on system which haven't it yet if ! [ -e /lib/firmware/updates ]; then - ln -s /lib/modules/firmware /lib/firmware/updates + if ! [ -h /lib/firmware/updates ]; then + ln -s /lib/modules/firmware /lib/firmware/updates + fi fi # qubes-core-vm has been broken for some time - it overrides /etc/hosts; restore original content