summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-15 12:38:43 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-15 12:38:43 +0000
commit5dc7a6df51a15c815dbce88bd26ef582f7e05a78 (patch)
tree3ed1b6e086e42e2178f985248d0380f5b7851cba
parentd2dd5ae63d2d5e598dd76d075ea998b4d3062f13 (diff)
downloadalpine-conf-5dc7a6df51a15c815dbce88bd26ef582f7e05a78.tar.bz2
alpine-conf-5dc7a6df51a15c815dbce88bd26ef582f7e05a78.tar.xz
setup-disk: support for vserver kernel
-rw-r--r--setup-disk.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/setup-disk.in b/setup-disk.in
index a81172a..28cf33e 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -138,7 +138,11 @@ install_mounted_root() {
local apkflags="--quiet --progress --update-cache --clean-protected"
local pkgs=$(cat "$mnt"/var/lib/apk/world)
- pkgs="$pkgs acct linux-grsec alpine-base"
+ local kernelpkg=linux-grsec
+ case "$(uname -r)" in
+ *-vs[0-9]*) kernelpkg=linux-vserver;;
+ esac
+ pkgs="$pkgs acct $kernelpkg alpine-base"
local repos=$(sed -e 's/\#.*//' /etc/apk/repositories)
local repoflags=
for i in $repos; do