diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-17 19:54:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-17 19:54:40 +0000 |
| commit | deab3e941121f308ab418e5dbf89684755930224 (patch) | |
| tree | 7ef81eb7f8f7f3e3c1d8aca6d06fe06e100ab384 /main | |
| parent | 7638c4a9f9a06887faaf3a2e4a655f297bd82a10 (diff) | |
| download | aports-deab3e941121f308ab418e5dbf89684755930224.tar.bz2 aports-deab3e941121f308ab418e5dbf89684755930224.tar.xz | |
main/alpine-conf: backport fix for xen-4.2
Diffstat (limited to 'main')
| -rw-r--r-- | main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch | 53 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 57 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch b/main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch new file mode 100644 index 000000000..55a33f2c2 --- /dev/null +++ b/main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch @@ -0,0 +1,53 @@ +From b007e51d7d776d7f31e7e300b7af5f56cfac18c4 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne <roger.pau@citrix.com> +Date: Thu, 13 Sep 2012 15:18:59 +0100 +Subject: [PATCH] setup-xen-dom0: update to upcoming 4.2 + +New version of Xen (4.2) doesn't require udev, so update the +script to reflect those changes. Also, only include a module +in /etc/modules if we can load it successfully. +--- + setup-xen-dom0.in | 20 +++++++------------- + 1 file changed, 7 insertions(+), 13 deletions(-) + +diff --git a/setup-xen-dom0.in b/setup-xen-dom0.in +index a9c993a..0e7b3b3 100644 +--- a/setup-xen-dom0.in ++++ b/setup-xen-dom0.in +@@ -3,26 +3,20 @@ + # simple script to setup basic xen dom0 + + # kernel modules +-for mod in xen_netback xen_blkback xenfs xen-platform-pci xen_wdt tun; do +- modprobe $mod +- grep -q -w $mod /etc/modules || echo $mod >> /etc/modules ++for mod in xen_netback xen_blkback xenfs xen_pciback xen_wdt tun; do ++ if modprobe $mod; then ++ grep -q -w $mod /etc/modules || echo $mod >> /etc/modules ++ fi + done + + # install packages +-apk add -q xen udev ++apk add -q xen + + # setup and start services +-rc-update -q del mdev sysinit +-rc-update -q add udev sysinit +-for svc in udev-postmount xenstored xenconsoled; do ++for svc in xenstored xenconsoled xenqemu; do + rc-update -q add $svc default + done + +-if ! rc-service -q udev status; then +- rc-service udev start +- rc-service udev-postmount start +-fi +- + rc-service xenstored start + rc-service xenconsoled start +- ++rc-service xenqemu start +-- +1.7.12 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 2d4a638b9..3dbe0061e 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.11.2 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-lbu-do-not-use-xargs.patch 0001-lbu-check-permissions-when-generating-apkovl.patch + 0001-setup-xen-dom0-update-to-upcoming-4.2.patch " arch="all" @@ -40,4 +41,5 @@ package() { } md5sums="47e37f6211817acc12aa637798da0437 alpine-conf-2.11.2.tar.bz2 a49569f9eb9bfa630efaca4988bde07c 0001-lbu-do-not-use-xargs.patch -97db0e60d1fd534a613e3d6cbca23a14 0001-lbu-check-permissions-when-generating-apkovl.patch" +97db0e60d1fd534a613e3d6cbca23a14 0001-lbu-check-permissions-when-generating-apkovl.patch +f2f36e9b99c6102c0acc9978d049be2d 0001-setup-xen-dom0-update-to-upcoming-4.2.patch" |