Browse Source

Removed linux24-related code from vserver package

early
Alejandro Mery 17 years ago
parent
commit
6d1382f86e
  1. 18
      security/vserver/config.hlp
  2. 20
      security/vserver/config.in
  3. 18
      security/vserver/kernel-vquota.conf.sh
  4. 17
      security/vserver/pkg_linux24_post.conf
  5. 27
      security/vserver/pkg_linux_post.conf
  6. 8
      security/vserver/vserver.desc

18
security/vserver/config.hlp

@ -1,18 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vserver/config.hlp
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
SDECFG_PKG_VSERVER_QUOTA
Please check here if you want to enable Virtual Server per Context
Quota Support.

20
security/vserver/config.in

@ -1,20 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vserver/config.in
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
if pkgcheck vserver X && pkgcheck linux24 X ; then
menu_begin MENU_VSERVER 'VServer Options'
bool 'Enable per Context Quota Support (2.4 only)' \
SDECFG_PKG_VSERVER_QUOTA 0
menu_end
fi

18
security/vserver/kernel-vquota.conf.sh

@ -1,18 +0,0 @@
#!/bin/bash
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vserver/kernel-vquota.conf.sh
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
echo "CONFIG_QUOTA=y" >> $1
echo "CONFIG_BLK_DEV_VROOT=y" >> $1

17
security/vserver/pkg_linux24_post.conf

@ -1,17 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../vserver/pkg_linux24_post.conf
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
. $base/package/*/vserver/pkg_linux_post.conf

27
security/vserver/pkg_linux_post.conf

@ -59,30 +59,3 @@ echo_status "Including VServer ($pkg_ctx_ver) support."
hook_add postpatch 5 "lx_extraversion=\$lx_extraversion-vs${pkg_ctx_ver}"
var_append patchfiles ' ' $pkg_ctx_tempdir/vserver-$pkg_ctx_ver.patch
[ -n "${pkg_ctx_fixes}" ] && var_append patchfiles ' ' ${pkg_ctx_fixes}
if [ "$SDECFG_PKG_VSERVER_QUOTA" = "1" ]; then
pkg_ctx_lxver=$ver.
pkg_vquota_patch=
if [[ $ver == 2.4.* ]]; then
# prepare vquota patch
while [ "$pkg_ctx_lxver" != "${pkg_ctx_lxver%.*}" -a -z "$pkg_quota_patch" ]; do
pkg_ctx_lxver=${pkg_ctx_lxver%.*}
pkg_vquota_patch=`match_source_file -p " patch-${pkg_ctx_lxver}[^ ]*-q.*.diff" vserver | head -n 1`
done
fi
if [ -n "$pkg_vquota_patch" ]; then
pkg_vquota_ver=$( echo $pkg_vquota_patch | sed -n -e 's,.*-q\(.*\).diff.bz2,\1,p' )
[[ ${pkg_vquota_patch} == *.bz2 ]] && x=bzcat || x=cat
$x $pkg_vquota_patch \
> $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch
echo_status "Including Per Context Quota/Disk Limits ($pkg_vquota_ver) support."
var_append patchfiles ' ' $pkg_ctx_tempdir/vquota-$pkg_vquota_ver.patch
var_append lx_confscripts ' ' $pkg_ctx_confdir/kernel-vquota.conf.sh
else
echo_status "No Per Context Quota/Disk Limits support available for Linux ${pkg_ctx_lxver}"
fi
fi

8
security/vserver/vserver.desc

@ -41,13 +41,5 @@
[V] 2.2.0.6
[P] O -?---5---9 190.200
[F] NOPARALLEL DIETLIBC NO-SSP
# linux26 patches
[D] 658328487 patch-2.6.22.18-vs2.2.0.6.diff http://ftp.linux-vserver.org/pub/kernel/vs2.2/
#[D] 299972723 patch-2.6.21.5-vs2.2.0-rc3.diff http://ftp.linux-vserver.org/pub/kernel/vs2.2/testing/
# linux24 patches
[D] 288983213 patch-2.4.31-vs1.2.11-rc1.diff http://vserver.13thfloor.at/Experimental/
[D] 3028530622 patch-2.4.27-vs1.29-q0.14.diff.bz2 http://www.13thfloor.at/vserver/s_addons/quota/

Loading…
Cancel
Save