[pve-devel] r5240 - pve-kernel-2.6.32/trunk
svn-commits at proxmox.com
svn-commits at proxmox.com
Fri Oct 8 12:08:54 CEST 2010
Author: dietmar
Date: 2010-10-08 10:08:53 +0000 (Fri, 08 Oct 2010)
New Revision: 5240
Added:
pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-24.diff.gz
Removed:
pve-kernel-2.6.32/trunk/busybox-1.14.0.tar.bz2
pve-kernel-2.6.32/trunk/busybox-config
pve-kernel-2.6.32/trunk/create-initrd-dir
pve-kernel-2.6.32/trunk/ejectcd.sh
pve-kernel-2.6.32/trunk/init
pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-22.diff.gz
pve-kernel-2.6.32/trunk/proxmox_splash.dat
pve-kernel-2.6.32/trunk/sched-fix.diff
pve-kernel-2.6.32/trunk/security-fix1.patch
pve-kernel-2.6.32/trunk/security-fix2.patch
Modified:
pve-kernel-2.6.32/trunk/Makefile
pve-kernel-2.6.32/trunk/changelog.Debian
pve-kernel-2.6.32/trunk/postinst.in
Log:
Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/Makefile 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,11 +1,11 @@
RELEASE=1.6
KERNEL_VER=2.6.32
-KERNEL_DEB_REL=22
-
-PKGREL=21
+PKGREL=22
KREL=4
+KERNEL_DEB_REL=24
+
EXTRAVERSION=-${KREL}-pve
KVNAME=${KERNEL_VER}${EXTRAVERSION}
PACKAGE=pve-kernel-${KVNAME}
@@ -22,10 +22,6 @@
FW_REL=9
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
-BUSYBOXVER=1.14.0
-BUSYBOXSOURCE=busybox-${BUSYBOXVER}.tar.bz2
-BUSYBOXDIR=busybox-${BUSYBOXVER}
-
AOEDIR=aoe6-73
AOESRC=${AOEDIR}.tar.gz
@@ -63,7 +59,7 @@
check_gcc:
gcc --version|grep "4.3.2" || false
-${DST_DEB}: data initrd.img-${KVNAME} control.in postinst.in
+${DST_DEB}: data control.in postinst.in
mkdir -p data/DEBIAN
sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@KVNAME@/${KVNAME}/' -e 's/@PKGREL@/${PKGREL}/' <control.in >data/DEBIAN/control
sed -e 's/@@KVNAME@@/${KVNAME}/g' <postinst.in >data/DEBIAN/postinst
@@ -71,7 +67,6 @@
install -D -m 644 copyright data/usr/share/doc/${PACKAGE}/copyright
install -D -m 644 changelog.Debian data/usr/share/doc/${PACKAGE}/changelog.Debian
gzip -f --best data/usr/share/doc/${PACKAGE}/changelog.Debian
- install -D -m 0644 initrd.img-${KVNAME} data/boot/initrd.img-${KVNAME}
rm -f data/lib/modules/${KVNAME}/source
rm -f data/lib/modules/${KVNAME}/build
dpkg-deb --build data ${DST_DEB}
@@ -104,6 +99,8 @@
tar xf scst-modules.tar -C tmp/lib/modules/${KVNAME}/extra/scst
# remove firmware
rm -rf tmp/lib/firmware
+ # strip debug info
+ find tmp/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
# finalize
depmod -b tmp/ ${KVNAME}
mv tmp data
@@ -129,10 +126,6 @@
rm -rf ${KERNEL_SRC}
tar xf ${KERNEL_SRC_TAR}
zcat ${KERNEL_DEB_DIFF}|patch -p1 -d ${KERNEL_SRC}
- # fix CVE-2010-3081
- cd ${KERNEL_SRC}; patch -p1 <../security-fix1.patch
- # fix CVE-2010-3301
- cd ${KERNEL_SRC}; patch -p1 <../security-fix2.patch
./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch
cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
@@ -140,7 +133,6 @@
cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/io_context-2.6.32.patch
#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/readahead-2.6.32.patch
cd ${KERNEL_SRC}; patch -p1 <../put_page_callback-2.6.32.patch
- cd ${KERNEL_SRC}; patch -p1 <../sched-fix.diff
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
@@ -194,30 +186,6 @@
cp ${ISCSIDIR}/kernel/iscsi-scst.ko iscsi-scst.ko
lintian ${ISCSI_DEB}
-busybox.tar: ${BUSYBOXSOURCE}
- rm -rf ${BUSYBOXDIR}
- tar xvjf ${BUSYBOXSOURCE}
- #cd ${BUSYBOXDIR}; make defconfig;
- cp busybox-config ${BUSYBOXDIR}/.config
- cd ${BUSYBOXDIR}; make oldconfig;
- rm -rf busybox; mkdir busybox
- cd ${BUSYBOXDIR}; make; make CONFIG_PREFIX=../busybox/ install
- tar cpf $@ -C busybox .
-
-INITRD_SOURCES = \
- init \
- ejectcd.sh \
- busybox.tar \
- proxmox_splash.dat \
- create-initrd-dir
-
-pci.ids: /usr/share/misc/pci.ids
- #update-pciids
- cp /usr/share/misc/pci.ids pci.ids
-
-initrd.img-${KVNAME}: data ${INITRD_SOURCES} pci.ids
- ./create-initrd-dir ${KVNAME}
-
headers_tmp := $(CURDIR)/tmp-headers
headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
@@ -290,6 +258,6 @@
.PHONY: clean
clean:
- rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data busybox busybox.tar ${BUSYBOXDIR} pci.ids proxmox-ve/data initrd.img-${KVNAME} *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp fwlist.initrd iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME}
+ rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME}
Deleted: pve-kernel-2.6.32/trunk/busybox-1.14.0.tar.bz2
===================================================================
(Binary files differ)
Deleted: pve-kernel-2.6.32/trunk/busybox-config
===================================================================
--- pve-kernel-2.6.32/trunk/busybox-config 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/busybox-config 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,888 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.14.0
-# Mon Apr 27 14:17:53 2009
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-CONFIG_FEATURE_INSTALLER=y
-CONFIG_LOCALE_SUPPORT=y
-CONFIG_GETOPT_LONG=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_PIDFILE=y
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET=y
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-CONFIG_STATIC=y
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-CONFIG_INCLUDE_SUSv2=y
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-# CONFIG_MONOTONIC_SYSCALL is not set
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_FEATURE_SEAMLESS_LZMA=y
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-CONFIG_FEATURE_SEAMLESS_Z=y
-CONFIG_AR=y
-CONFIG_FEATURE_AR_LONG_FILENAMES=y
-CONFIG_BUNZIP2=y
-CONFIG_BZIP2=y
-CONFIG_CPIO=y
-CONFIG_FEATURE_CPIO_O=y
-CONFIG_FEATURE_CPIO_P=y
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_AUTODETECT=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_FEATURE_TAR_UNAME_GNAME=y
-CONFIG_UNCOMPRESS=y
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAL=y
-CONFIG_CAT=y
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-CONFIG_COMM=y
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-CONFIG_EXPAND=y
-CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-CONFIG_FOLD=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LENGTH=y
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_SPLIT=y
-CONFIG_FEATURE_SPLIT_FANCY=y
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-CONFIG_STTY=y
-CONFIG_SUM=y
-CONFIG_SYNC=y
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNEXPAND=y
-CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
-CONFIG_SETCONSOLE=y
-CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
-CONFIG_SETFONT=y
-CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y
-CONFIG_DEFAULT_SETFONT_DIR=""
-CONFIG_SETKEYCODES=y
-CONFIG_SETLOGCONS=y
-CONFIG_SHOWKEY=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_PIPE_PROGRESS=y
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_FEATURE_DIFF_MINIMAL=y
-CONFIG_ED=y
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-# CONFIG_FEATURE_VI_8BIT is not set
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-CONFIG_FEATURE_FIND_INUM=y
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-CONFIG_FEATURE_FIND_DELETE=y
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-CONFIG_INIT=y
-CONFIG_FEATURE_USE_INITTAB=y
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
-CONFIG_FEATURE_INIT_COREDUMPS=y
-CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
-CONFIG_MESG=y
-
-#
-# Login/Password Management Utilities
-#
-CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_PWD_GRP=y
-CONFIG_USE_BB_SHADOW=y
-CONFIG_USE_BB_CRYPT=y
-CONFIG_USE_BB_CRYPT_SHA=y
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-CONFIG_DELGROUP=y
-CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_ADDUSER=y
-CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
-CONFIG_DELUSER=y
-CONFIG_GETTY=y
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
-CONFIG_LOGIN=y
-# CONFIG_PAM is not set
-CONFIG_LOGIN_SCRIPTS=y
-CONFIG_FEATURE_NOLOGIN=y
-CONFIG_FEATURE_SECURETTY=y
-CONFIG_PASSWD=y
-CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
-CONFIG_CRYPTPW=y
-CONFIG_CHPASSWD=y
-CONFIG_SU=y
-CONFIG_FEATURE_SU_SYSLOG=y
-CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-CONFIG_LSATTR=y
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-CONFIG_ACPID=y
-CONFIG_FEATURE_ACPID_COMPAT=y
-CONFIG_BLKID=y
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-CONFIG_FEATURE_FBSET_READMODE=y
-CONFIG_FDFLUSH=y
-CONFIG_FDFORMAT=y
-CONFIG_FDISK=y
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_FINDFS=y
-CONFIG_FREERAMDISK=y
-CONFIG_FSCK_MINIX=y
-CONFIG_MKFS_MINIX=y
-
-#
-# Minix filesystem support
-#
-CONFIG_FEATURE_MINIX2=y
-CONFIG_MKFS_VFAT=y
-CONFIG_GETOPT=y
-CONFIG_HEXDUMP=y
-CONFIG_FEATURE_HEXDUMP_REVERSE=y
-CONFIG_HD=y
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-CONFIG_MDEV=y
-CONFIG_FEATURE_MDEV_CONF=y
-CONFIG_FEATURE_MDEV_RENAME=y
-CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
-CONFIG_FEATURE_MDEV_EXEC=y
-CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-CONFIG_MKSWAP=y
-CONFIG_FEATURE_MKSWAP_V0=y
-CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_VOLUMEID=y
-CONFIG_FEATURE_VOLUMEID_EXT=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
-CONFIG_FEATURE_VOLUMEID_FAT=y
-CONFIG_FEATURE_VOLUMEID_HFS=y
-CONFIG_FEATURE_VOLUMEID_JFS=y
-CONFIG_FEATURE_VOLUMEID_XFS=y
-CONFIG_FEATURE_VOLUMEID_NTFS=y
-CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
-CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
-CONFIG_FEATURE_VOLUMEID_ROMFS=y
-CONFIG_FEATURE_VOLUMEID_SYSV=y
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_FAKE=y
-CONFIG_FEATURE_MOUNT_VERBOSE=y
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-CONFIG_RDEV=y
-CONFIG_READPROFILE=y
-CONFIG_RTCWAKE=y
-CONFIG_SCRIPT=y
-CONFIG_SETARCH=y
-CONFIG_SWAPONOFF=y
-CONFIG_FEATURE_SWAPON_PRI=y
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-
-#
-# Miscellaneous Utilities
-#
-CONFIG_ADJTIMEX=y
-# CONFIG_BBCONFIG is not set
-CONFIG_CHAT=y
-CONFIG_FEATURE_CHAT_NOFAIL=y
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
-CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
-CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
-CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
-CONFIG_FEATURE_CHAT_CLR_ABORT=y
-CONFIG_CHRT=y
-CONFIG_CROND=y
-CONFIG_FEATURE_CROND_D=y
-CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
-CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
-CONFIG_CRONTAB=y
-CONFIG_DC=y
-CONFIG_FEATURE_DC_LIBM=y
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-CONFIG_DEVMEM=y
-CONFIG_EJECT=y
-CONFIG_FEATURE_EJECT_SCSI=y
-CONFIG_FBSPLASH=y
-CONFIG_FLASH_ERASEALL=y
-CONFIG_IONICE=y
-# CONFIG_INOTIFYD is not set
-CONFIG_LAST=y
-# CONFIG_FEATURE_LAST_SMALL is not set
-CONFIG_FEATURE_LAST_FANCY=y
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_MARKS=y
-CONFIG_FEATURE_LESS_REGEXP=y
-CONFIG_FEATURE_LESS_WINCH=y
-CONFIG_FEATURE_LESS_DASHCMD=y
-CONFIG_FEATURE_LESS_LINENUMS=y
-CONFIG_HDPARM=y
-CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
-CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
-CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y
-CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
-CONFIG_MAKEDEVS=y
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-CONFIG_FEATURE_MAKEDEVS_TABLE=y
-CONFIG_MAN=y
-CONFIG_MICROCOM=y
-CONFIG_MOUNTPOINT=y
-CONFIG_MT=y
-CONFIG_RAIDAUTORUN=y
-CONFIG_READAHEAD=y
-CONFIG_RUNLEVEL=y
-CONFIG_RX=y
-CONFIG_SETSID=y
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-CONFIG_TIMEOUT=y
-CONFIG_TTYSIZE=y
-CONFIG_WATCHDOG=y
-
-#
-# Networking Utilities
-#
-CONFIG_FEATURE_IPV6=y
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-CONFIG_ARP=y
-CONFIG_ARPING=y
-CONFIG_BRCTL=y
-CONFIG_FEATURE_BRCTL_FANCY=y
-CONFIG_FEATURE_BRCTL_SHOW=y
-CONFIG_DNSD=y
-CONFIG_ETHER_WAKE=y
-CONFIG_FAKEIDENTD=y
-CONFIG_FTPD=y
-CONFIG_FEATURE_FTP_WRITE=y
-CONFIG_FTPGET=y
-CONFIG_FTPPUT=y
-CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
-CONFIG_HOSTNAME=y
-CONFIG_HTTPD=y
-CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-CONFIG_IFENSLAVE=y
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-CONFIG_FEATURE_IFUPDOWN_IP=y
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-CONFIG_INETD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
-CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-CONFIG_FEATURE_INETD_RPC=y
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-CONFIG_IPCALC=y
-CONFIG_FEATURE_IPCALC_FANCY=y
-CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
-CONFIG_NAMEIF=y
-CONFIG_FEATURE_NAMEIF_EXTENDED=y
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-CONFIG_PSCAN=y
-CONFIG_ROUTE=y
-CONFIG_SLATTACH=y
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-CONFIG_TELNETD=y
-CONFIG_FEATURE_TELNETD_STANDALONE=y
-CONFIG_TFTP=y
-CONFIG_TFTPD=y
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-CONFIG_APP_UDHCPD=y
-CONFIG_APP_DHCPRELAY=y
-CONFIG_APP_DUMPLEASES=y
-CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
-CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_APP_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-CONFIG_FEATURE_UDHCP_PORT=y
-# CONFIG_UDHCP_DEBUG is not set
-CONFIG_FEATURE_UDHCP_RFC3397=y
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_ZCIP=y
-CONFIG_TCPSVD=y
-CONFIG_TUNCTL=y
-CONFIG_FEATURE_TUNCTL_UG=y
-CONFIG_UDPSVD=y
-
-#
-# Print Utilities
-#
-CONFIG_LPD=y
-CONFIG_LPR=y
-CONFIG_LPQ=y
-
-#
-# Mail Utilities
-#
-CONFIG_MAKEMIME=y
-CONFIG_FEATURE_MIME_CHARSET="us-ascii"
-CONFIG_POPMAILDIR=y
-CONFIG_FEATURE_POPMAILDIR_DELIVERY=y
-CONFIG_REFORMIME=y
-CONFIG_FEATURE_REFORMIME_COMPAT=y
-CONFIG_SENDMAIL=y
-
-#
-# Process Utilities
-#
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-CONFIG_KILLALL5=y
-CONFIG_NMETER=y
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-CONFIG_PKILL=y
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-CONFIG_FEATURE_TOP_SMP_CPU=y
-CONFIG_FEATURE_TOP_DECIMALS=y
-CONFIG_FEATURE_TOP_SMP_PROCESS=y
-CONFIG_FEATURE_TOPMEM=y
-CONFIG_UPTIME=y
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-CONFIG_RUNSV=y
-CONFIG_RUNSVDIR=y
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-CONFIG_SV=y
-CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
-CONFIG_SVLOGD=y
-CONFIG_CHPST=y
-CONFIG_SETUIDGID=y
-CONFIG_ENVUIDGID=y
-CONFIG_ENVDIR=y
-CONFIG_SOFTLIMIT=y
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_BASH_COMPAT=y
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_READ_NCHARS=y
-CONFIG_ASH_READ_TIMEOUT=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_HUSH=y
-CONFIG_HUSH_HELP=y
-CONFIG_HUSH_INTERACTIVE=y
-CONFIG_HUSH_JOB=y
-CONFIG_HUSH_TICK=y
-CONFIG_HUSH_IF=y
-CONFIG_HUSH_LOOPS=y
-CONFIG_HUSH_CASE=y
-CONFIG_HUSH_FUNCTIONS=y
-# CONFIG_LASH is not set
-CONFIG_MSH=y
-
-#
-# Bourne Shell Options
-#
-CONFIG_SH_MATH_SUPPORT=y
-CONFIG_SH_MATH_SUPPORT_64=y
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_CTTYHACK=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_SYSLOGD_DUP=y
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
-CONFIG_LOGREAD=y
-CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/changelog.Debian 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,3 +1,13 @@
+pve-kernel-2.6.32 (2.6.32-22) unstable; urgency=low
+
+ * upgarde to debian squeeze kernel 2.6.32-24 (OpenVZ 2.6.32-dyomin)
+
+ * strip debug info
+
+ * remove default initrd image (no longer needed)
+
+ -- Proxmox Support Team <support at proxmox.com> Fri, 08 Oct 2010 09:27:20 +0200
+
pve-kernel-2.6.32 (2.6.32-21) unstable; urgency=low
* do not set CONFIG_DMAR_DEFAULT_ON
Deleted: pve-kernel-2.6.32/trunk/create-initrd-dir
===================================================================
--- pve-kernel-2.6.32/trunk/create-initrd-dir 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/create-initrd-dir 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-KVNAME=$1
-BASE=tmp
-
-
-set -e
-
-trap "error_exit" ERR
-
-error_exit() {
- echo "error exit"
- exit 99
-}
-
-add_libs() {
- set +e
- res=$( ldd $1 )
- err=$?
- set -e
-
- [ $err -ne 0 ] || echo "$res" |sed -e 's/.*=>[[:blank:]]*\([^[:blank:]]*\).*/\1/' -e 's/(0x.*)//' >>$BASE/tmp/libs
-}
-
-add_prog() {
- rm -f $BASE/$1
- cp $1 $BASE/$1
-
- add_libs $1
-}
-
-copy_libs() {
- list=$(sort -u $BASE/tmp/libs)
-
- for i in $list; do cp $i $BASE/$i; done
-}
-
-
-rm -rf $BASE
-mkdir $BASE
-
-BASEDIRS="bin dev devfs etc lib/tls lib/modules/$KVNAME/kernel/lib lib/modules/$KVNAME/kernel/drivers lib/modules/$KVNAME/kernel/drivers/usb lib/modules/$KVNAME/kernel/fs mnt sbin tmp usr/bin usr/share /usr/lib/i686/cmov/ usr/sbin proc sys"
-
-# create fs layout
-for i in $BASEDIRS; do install -d $BASE/$i; done
-
-ln -s lib $BASE/lib64
-
-# copy drivers
-cp -a data/lib/modules/$KVNAME/kernel $BASE/lib/modules/$KVNAME
-
-# we do not need sound inside initrd
-rm -rf $BASE/lib/modules/$KVNAME/kernel/sound
-# we do not need network inside initrd
-rm -rf $BASE/lib/modules/$KVNAME/kernel/net
-
-# remove unneded drivers
-UNNEEDED="atm auxdisplay bluetooth char connector edac hwmon infiniband isdn leds media mfd misc mmc mtd net parport pcmcia staging telephony video w1 wireless"
-for i in $UNNEEDED; do rm -rf $BASE/lib/modules/$KVNAME/kernel/drivers/$i; done
-
-depmod -b $BASE -v $KVNAME >/dev/null
-
-./find-firmware.pl $BASE/lib/modules/$KVNAME >fwlist.initrd
-mkdir $BASE/lib/firmware
-./assemble-firmware.pl fwlist.initrd ${BASE}/lib/firmware
-
-tar xpf busybox.tar -C $BASE
-
-cp /usr/bin/pcimodules $BASE/usr/bin
-cp /usr/bin/lspci $BASE/usr/bin
-install -D pci.ids $BASE/usr/share/misc/pci.ids
-
-add_libs $BASE/bin/busybox
-
-PROGS="lsof pcimodules lspci"
-for i in $PROGS; do
- add_prog `command -v $i`
-done;
-
-cp /sbin/lvm $BASE/sbin/lvm
-add_libs /sbin/lvm
-
-copy_libs
-
-install init $BASE/init
-install ejectcd.sh $BASE/sbin
-rm $BASE/linuxrc
-
-# create devices
-(cd $BASE/dev; MAKEDEV std generic md)
-#tar xzf /usr/lib/debootstrap/devices.tar.gz -C $BASE
-
-cp proxmox_splash.dat $BASE/bootsplash
-(cd $BASE; find . | cpio -o -H newc|gzip -9) > initrd.img-${KVNAME}
-
-du -sk initrd.img-${KVNAME}
-
Deleted: pve-kernel-2.6.32/trunk/ejectcd.sh
===================================================================
--- pve-kernel-2.6.32/trunk/ejectcd.sh 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/ejectcd.sh 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-i=$(grep iso9660 /proc/mounts);
-
-for try in 5 4 3 2 1; do
- echo "unmounting cdrom"
- if umount /mnt; then
- break
- fi
- if test -n $try; then
- echo "unmount failed -trying again in 5 seconds"
- sleep 5
- fi
-done
-
-if [ -n "$i" ]; then
- set $i
- eject $1
-fi
-
-echo "rebooting - please remove the CD"
-sleep 3
-echo b > /proc/sysrq-trigger
-sleep 100
\ No newline at end of file
Deleted: pve-kernel-2.6.32/trunk/init
===================================================================
--- pve-kernel-2.6.32/trunk/init 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/init 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,237 +0,0 @@
-#!/bin/sh
-
-# (C) 2009 Proxmox Server Solutions GmbH <support at proxmox.com>
-
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin
-
-# busybox needs full paths until proc is mounted
-
-/bin/echo "Proxmox startup"
-
-/bin/echo "mounting proc filesystem"
-/bin/mount -nt proc proc /proc
-
-echo "mounting sys filesystem"
-mount -nt sysfs sysfs /sys
-
-KERNEL_VER=`uname -r`
-
-parse_cmdline() {
- root=
- lvm2root=
- proxdebug=0
- for par in $(cat /proc/cmdline); do
- case $par in
- lvm2root=*)
- lvm2root=${par#lvm2root=}
- ;;
- root=/dev/mapper/*)
- lvm2root=${par#root=}
- ;;
- root=*)
- root=${par#root=}
- ;;
- proxdebug)
- proxdebug=1
- ;;
- esac
- done;
-}
-
-myreboot() {
- echo b > /proc/sysrq-trigger
- echo "rebooting..."
- sleep 100
- exit 0
-}
-
-debugsh() {
- getty 38400 tty1 -i -l /bin/sh -n
-}
-
-echo "comandline: $(cat /proc/cmdline)"
-parse_cmdline
-
-# use mdev as firmware loader
-echo /sbin/mdev >/proc/sys/kernel/hotplug
-
-DRIVERS="msdos isofs"
-echo "loading filesystem drivers: $FSDRIVERS"
-for mod in $DRIVERS; do
- modprobe "$mod"
-done
-
-for mod in $(pcimodules) ; do
- modprobe "$mod"
-done
-
-stdmod="usb-storage usbhid virtio_blk"
-for mod in $stdmod; do
- modprobe "$mod"
-done
-
-# wait for scsi scan
-modprobe scsi_wait_scan
-
-# we have no iscsi daemon, so we need to scan iscsi device manually.
-# else we cant boot from iscsi hba because devices are not detected.
-for i in /sys/class/scsi_host/host*; do
- host=${i##*/}
- if [ -d $i ] && [ -f $i/scan ] && [ -d /sys/class/iscsi_host/$host ] ; then
- echo "Scanning iSCSI $host"
- echo "- - -" > $i/scan
- fi
-done
-
-if [ -n "$lvm2root" ]; then
-
- echo -n "Finding device mapper major and minor numbers: "
-
- MAJOR=$(sed -n 's/^ *\([0-9]\+\) \+misc$/\1/p' /proc/devices)
- MINOR=$(sed -n 's/^ *\([0-9]\+\) \+device-mapper$/\1/p' /proc/misc)
- if test -n "$MAJOR" -a -n "$MINOR" ; then
- mkdir -p -m 755 /dev/mapper
- mknod -m 600 /dev/mapper/control c $MAJOR $MINOR
- fi
-
- echo "($MAJOR,$MINOR)"
-
- vg=${lvm2root}
- vg=${vg#/dev/mapper/}
- if [ "$vg" = "$1" ]; then
- echo "activating all volume groups"
- lvm vgchange --ignorelockingfailure -aly
- else
- # Split volume group from logical volume.
- vg=$(echo ${vg} | sed -e 's#\(.*\)\([^-]\)-[^-].*#\1\2#')
- # Reduce padded --'s to -'s
- vg=$(echo ${vg} | sed -e 's#--#-#g')
- echo "activating volume group $vg"
- lvm vgchange -aly --ignorelockingfailure ${vg}
- fi
-
- echo "trying to mount lvm root: ($lvm2root)"
-
- found=
- for try in 5 4 3 2 1; do
- for t in ext3 reiserfs auto; do
- if mount -n -t $t -r $lvm2root /mnt; then
- found=ok
- break;
- fi
- done
- if test -n "$found"; then
- break;
- fi
- if test $try -gt 1; then
- echo "testing again in 5 seconds"
- sleep 5
- fi
- done
-
-elif [ -n "$root" ]; then
-
- case $root in
- /dev/*)
- real_root=$root
- ;;
- *:*)
- dev_min=$((0x${root#*:}))
- dev_maj=$((0x${root%:*}))
- mknod /tmp/rootdev b $dev_maj $dev_min
- real_root=/tmp/rootdev
- ;;
- *)
- dev_min=$((0x$root & 255))
- dev_maj=$((0x$root >> 8))
- mknod /tmp/rootdev b $dev_maj $dev_min
- real_root=/tmp/rootdev
- ;;
- esac
-
- echo "trying to mount root: $real_root ($root)"
-
- found=
- for try in 5 4 3 2 1; do
- for t in ext3 reiserfs auto; do
- if mount -n -t $t -r $real_root /mnt; then
- found=ok
- break;
- fi
- done
- if test -n "$found"; then
- break;
- fi
- if test $try -gt 1; then
- echo "testing again in 5 seconds"
- sleep 5
- fi
- done
-
-else
-
- echo "searching for cdrom"
- cdrom=
-
- for try in 5 4 3 2 1; do
- for i in /sys/block/hd* /sys/block/sr* /sys/block/scd*; do
-
- if [ -d $i ] && [ $(cat $i/removable) = 1 ]; then
-
- path="/dev/${i##*/}"
- echo "testing cdrom $path"
- if mount -t iso9660 -o ro $path /mnt ; then
- if [ -r /mnt/id.txt ] && [ $(cat /mnt/id.txt) = proxmox-ve ]; then
- echo "found proxmox cdrom"
- cdrom=$path
- break
- fi
- fi
- umount /mnt
- fi
- done
- if test -n "$cdrom"; then
- break;
- fi
- if test $try -gt 1; then
- echo "testing again in 5 seconds"
- sleep 5
- fi
- done
-
- if [ -z $cdrom ]; then
- echo "no cdrom found - unable to continue (type exit or CTRL-D to reboot)"
- debugsh
- myreboot
- fi
-fi
-
-if [ $proxdebug -ne 0 ]; then
- echo "Debugging mode (type exit or CTRL-D to continue startup)"
- debugsh
-fi
-
-
-umount /sys
-
-if [ -x "/mnt/sbin/unconfigured.sh" ]; then
- # and run the installer
-
- chroot /mnt sbin/unconfigured.sh
-
- cd /
-
- # Send a SIGKILL to all processes, except for init.
- echo i >/proc/sysrq-trigger
-
- exec /sbin/ejectcd.sh
-
-else
- # or begin normal sysvinit
-
- umount /proc
-
- exec /sbin/switch_root -c /dev/console /mnt sbin/init
-fi
-
-
Deleted: pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-22.diff.gz
===================================================================
(Binary files differ)
Added: pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-24.diff.gz
===================================================================
(Binary files differ)
Property changes on: pve-kernel-2.6.32/trunk/linux-2.6_2.6.32-24.diff.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: pve-kernel-2.6.32/trunk/postinst.in
===================================================================
--- pve-kernel-2.6.32/trunk/postinst.in 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/postinst.in 2010-10-08 10:08:53 UTC (rev 5240)
@@ -5,9 +5,6 @@
# Ignore all invocations except when called on to configure.
exit 0 unless $ARGV[0] =~ /configure/;
-# do nothing if run from proxmox installer
-exit 0 if -e "/proxmox_install_mode";
-
my $imagedir = "/boot";
my $version = "@@KVNAME@@";
@@ -16,6 +13,9 @@
system("update-initramfs -c -t -b $imagedir -k $version");
+# do not proceed if run from proxmox installer
+exit 0 if -e "/proxmox_install_mode";
+
if (-x "/usr/sbin/grub") {
system("update-grub -y");
} elsif (-e "/etc/lilo.conf") {
Deleted: pve-kernel-2.6.32/trunk/proxmox_splash.dat
===================================================================
(Binary files differ)
Deleted: pve-kernel-2.6.32/trunk/sched-fix.diff
===================================================================
--- pve-kernel-2.6.32/trunk/sched-fix.diff 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/sched-fix.diff 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,45 +0,0 @@
-cfq-iosched: do not force idling for sync workload
-
-From: Konstantin Khlebnikov <khlebnikov at openvz.org>
-
-revert v2.6.32-108-gc04645e
-blkio: Wait on sync-noidle queue even if rq_noidle = 1
-by Vivek Goyal <vgoyal at redhat.com>
-
-and piece of v2.6.32-rc5-486-g8e55063
-cfq-iosched: fix corner cases in idling logic
-by Corrado Zoccolo <czoccolo at gmail.com>
-
-
-fix perfomance degradation for massive write-fsync pattern:
-# sysbench --test=fileio --file-num=1 --file-total-size=1G --file-fsync-all=on \
---file-test-mode=seqwr --max-time=10 --file-block-size=4096 --max-requests=0 run
-
-http://bugzilla.openvz.org/show_bug.cgi?id=1622
-
-Signed-off-by: Konstantin Khlebnikov <khlebnikov at openvz.org>
----
-
- block/cfq-iosched.c | 9 +--------
- 1 files changed, 1 insertions(+), 8 deletions(-)
-
-diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
-index 023f4e6..b68b633 100644
---- a/block/cfq-iosched.c
-+++ b/block/cfq-iosched.c
-@@ -3333,14 +3333,7 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
- else if (sync && cfqq_empty &&
- !cfq_close_cooperator(cfqd, cfqq)) {
- cfqd->noidle_tree_requires_idle |= !rq_noidle(rq);
-- /*
-- * Idling is enabled for SYNC_WORKLOAD.
-- * SYNC_NOIDLE_WORKLOAD idles at the end of the tree
-- * only if we processed at least one !rq_noidle request
-- */
-- if (cfqd->serving_type == SYNC_WORKLOAD
-- || cfqd->noidle_tree_requires_idle
-- || cfqq->cfqg->nr_cfqq == 1)
-+ if (cfqd->noidle_tree_requires_idle)
- cfq_arm_slice_timer(cfqd);
- }
- }
Deleted: pve-kernel-2.6.32/trunk/security-fix1.patch
===================================================================
--- pve-kernel-2.6.32/trunk/security-fix1.patch 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/security-fix1.patch 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,175 +0,0 @@
-commit c41d68a513c71e35a14f66d71782d27a79a81ea6
-Author: H. Peter Anvin <hpa at linux.intel.com>
-Date: Tue Sep 7 16:16:18 2010 -0700
-
- I fixed compat.h manually for the PVE build (dietmar at proxmox.com)
-
- compat: Make compat_alloc_user_space() incorporate the access_ok()
-
- compat_alloc_user_space() expects the caller to independently call
- access_ok() to verify the returned area. A missing call could
- introduce problems on some architectures.
-
- This patch incorporates the access_ok() check into
- compat_alloc_user_space() and also adds a sanity check on the length.
- The existing compat_alloc_user_space() implementations are renamed
- arch_compat_alloc_user_space() and are used as part of the
- implementation of the new global function.
-
- This patch assumes NULL will cause __get_user()/__put_user() to either
- fail or access userspace on all architectures. This should be
- followed by checking the return value of compat_access_user_space()
- for NULL in the callers, at which time the access_ok() in the callers
- can also be removed.
-
- Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
- Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
- Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
- Acked-by: Chris Metcalf <cmetcalf at tilera.com>
- Acked-by: David S. Miller <davem at davemloft.net>
- Acked-by: Ingo Molnar <mingo at elte.hu>
- Acked-by: Thomas Gleixner <tglx at linutronix.de>
- Acked-by: Tony Luck <tony.luck at intel.com>
- Cc: Andrew Morton <akpm at linux-foundation.org>
- Cc: Arnd Bergmann <arnd at arndb.de>
- Cc: Fenghua Yu <fenghua.yu at intel.com>
- Cc: H. Peter Anvin <hpa at zytor.com>
- Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
- Cc: Helge Deller <deller at gmx.de>
- Cc: James Bottomley <jejb at parisc-linux.org>
- Cc: Kyle McMartin <kyle at mcmartin.ca>
- Cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
- Cc: Paul Mackerras <paulus at samba.org>
- Cc: Ralf Baechle <ralf at linux-mips.org>
- Cc: <stable at kernel.org>
-
-diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h
-index f90edc8..9301a28 100644
---- a/arch/ia64/include/asm/compat.h
-+++ b/arch/ia64/include/asm/compat.h
-@@ -199,7 +199,7 @@ ptr_to_compat(void __user *uptr)
- }
-
- static __inline__ void __user *
--compat_alloc_user_space (long len)
-+arch_compat_alloc_user_space (long len)
- {
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
-diff --git a/arch/mips/include/asm/compat.h b/arch/mips/include/asm/compat.h
-index 613f691..dbc5106 100644
---- a/arch/mips/include/asm/compat.h
-+++ b/arch/mips/include/asm/compat.h
-@@ -145,7 +145,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = (struct pt_regs *)
- ((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
-diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
-index 02b77ba..efa0b60 100644
---- a/arch/parisc/include/asm/compat.h
-+++ b/arch/parisc/include/asm/compat.h
-@@ -147,7 +147,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- return (u32)(unsigned long)uptr;
- }
-
--static __inline__ void __user *compat_alloc_user_space(long len)
-+static __inline__ void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = ¤t->thread.regs;
- return (void __user *)regs->gr[30];
-diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
-index 396d21a..a11d4ea 100644
---- a/arch/powerpc/include/asm/compat.h
-+++ b/arch/powerpc/include/asm/compat.h
-@@ -134,7 +134,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = current->thread.regs;
- unsigned long usp = regs->gpr[1];
-diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
-index 104f200..a875c2f 100644
---- a/arch/s390/include/asm/compat.h
-+++ b/arch/s390/include/asm/compat.h
-@@ -181,7 +181,7 @@ static inline int is_compat_task(void)
-
- #endif
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- unsigned long stack;
-
-diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h
-index 5016f76..6f57325 100644
---- a/arch/sparc/include/asm/compat.h
-+++ b/arch/sparc/include/asm/compat.h
-@@ -167,7 +167,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = current_thread_info()->kregs;
- unsigned long usp = regs->u_regs[UREG_I6];
-diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
-index 306160e..1d9cd27 100644
---- a/arch/x86/include/asm/compat.h
-+++ b/arch/x86/include/asm/compat.h
-@@ -205,7 +205,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
- return (u32)(unsigned long)uptr;
- }
-
--static inline void __user *compat_alloc_user_space(long len)
-+static inline void __user *arch_compat_alloc_user_space(long len)
- {
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *)regs->sp - len;
-diff --git a/kernel/compat.c b/kernel/compat.c
-index e167efc..c9e2ec0 100644
---- a/kernel/compat.c
-+++ b/kernel/compat.c
-@@ -1126,3 +1126,24 @@ compat_sys_sysinfo(struct compat_sysinfo __user *info)
-
- return 0;
- }
-+
-+/*
-+ * Allocate user-space memory for the duration of a single system call,
-+ * in order to marshall parameters inside a compat thunk.
-+ */
-+void __user *compat_alloc_user_space(unsigned long len)
-+{
-+ void __user *ptr;
-+
-+ /* If len would occupy more than half of the entire compat space... */
-+ if (unlikely(len > (((compat_uptr_t)~0) >> 1)))
-+ return NULL;
-+
-+ ptr = arch_compat_alloc_user_space(len);
-+
-+ if (unlikely(!access_ok(VERIFY_WRITE, ptr, len)))
-+ return NULL;
-+
-+ return ptr;
-+}
-+EXPORT_SYMBOL_GPL(compat_alloc_user_space);
---- linux-2.6-2.6.32/include/linux/compat.h.orig 2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6-2.6.32/include/linux/compat.h 2010-09-17 15:34:13.000000000 +0200
-@@ -309,5 +309,7 @@
- asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
- int flags, int mode);
-
-+extern void __user *compat_alloc_user_space(unsigned long len);
-+
- #endif /* CONFIG_COMPAT */
- #endif /* _LINUX_COMPAT_H */
Deleted: pve-kernel-2.6.32/trunk/security-fix2.patch
===================================================================
--- pve-kernel-2.6.32/trunk/security-fix2.patch 2010-10-08 06:24:03 UTC (rev 5239)
+++ pve-kernel-2.6.32/trunk/security-fix2.patch 2010-10-08 10:08:53 UTC (rev 5240)
@@ -1,137 +0,0 @@
-commit 36d001c70d8a0144ac1d038f6876c484849a74de
-Author: H. Peter Anvin <hpa at linux.intel.com>
-Date: Tue Sep 14 12:42:41 2010 -0700
-
- x86-64, compat: Test %rax for the syscall number, not %eax
-
- On 64 bits, we always, by necessity, jump through the system call
- table via %rax. For 32-bit system calls, in theory the system call
- number is stored in %eax, and the code was testing %eax for a valid
- system call number. At one point we loaded the stored value back from
- the stack to enforce zero-extension, but that was removed in checkin
- d4d67150165df8bf1cc05e532f6efca96f907cab. An actual 32-bit process
- will not be able to introduce a non-zero-extended number, but it can
- happen via ptrace.
-
- Instead of re-introducing the zero-extension, test what we are
- actually going to use, i.e. %rax. This only adds a handful of REX
- prefixes to the code.
-
- Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
- Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
- Cc: <stable at kernel.org>
- Cc: Roland McGrath <roland at redhat.com>
- Cc: Andrew Morton <akpm at linux-foundation.org>
-
-diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index b86feab..84e3a4e 100644
---- a/arch/x86/ia32/ia32entry.S
-+++ b/arch/x86/ia32/ia32entry.S
-@@ -153,7 +153,7 @@ ENTRY(ia32_sysenter_target)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- CFI_REMEMBER_STATE
- jnz sysenter_tracesys
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- sysenter_do_call:
- IA32_ARG_FIXUP
-@@ -195,7 +195,7 @@ sysexit_from_sys_call:
- movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
- call audit_syscall_entry
- movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- movl %ebx,%edi /* reload 1st syscall arg */
- movl RCX-ARGOFFSET(%rsp),%esi /* reload 2nd syscall arg */
-@@ -248,7 +248,7 @@ sysenter_tracesys:
- call syscall_trace_enter
- LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
- RESTORE_REST
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
- jmp sysenter_do_call
- CFI_ENDPROC
-@@ -314,7 +314,7 @@ ENTRY(ia32_cstar_target)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- CFI_REMEMBER_STATE
- jnz cstar_tracesys
-- cmpl $IA32_NR_syscalls-1,%eax
-+ cmpq $IA32_NR_syscalls-1,%rax
- ja ia32_badsys
- cstar_do_call:
- IA32_ARG_FIXUP 1
-@@ -367,7 +367,7 @@ cstar_tracesys:
- LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
- RESTORE_REST
- xchgl %ebp,%r9d
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
- jmp cstar_do_call
- END(ia32_cstar_target)
-@@ -425,7 +425,7 @@ ENTRY(ia32_syscall)
- orl $TS_COMPAT,TI_status(%r10)
- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
- jnz ia32_tracesys
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja ia32_badsys
- ia32_do_call:
- IA32_ARG_FIXUP
-@@ -444,7 +444,7 @@ ia32_tracesys:
- call syscall_trace_enter
- LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
- RESTORE_REST
-- cmpl $(IA32_NR_syscalls-1),%eax
-+ cmpq $(IA32_NR_syscalls-1),%rax
- ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
- jmp ia32_do_call
- END(ia32_syscall)
-
-commit eefdca043e8391dcd719711716492063030b55ac
-Author: Roland McGrath <roland at redhat.com>
-Date: Tue Sep 14 12:22:58 2010 -0700
-
- x86-64, compat: Retruncate rax after ia32 syscall entry tracing
-
- In commit d4d6715, we reopened an old hole for a 64-bit ptracer touching a
- 32-bit tracee in system call entry. A %rax value set via ptrace at the
- entry tracing stop gets used whole as a 32-bit syscall number, while we
- only check the low 32 bits for validity.
-
- Fix it by truncating %rax back to 32 bits after syscall_trace_enter,
- in addition to testing the full 64 bits as has already been added.
-
- Reported-by: Ben Hawkes <hawkes at sota.gen.nz>
- Signed-off-by: Roland McGrath <roland at redhat.com>
- Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
-
-diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 84e3a4e..518bb99 100644
---- a/arch/x86/ia32/ia32entry.S
-+++ b/arch/x86/ia32/ia32entry.S
-@@ -50,7 +50,12 @@
- /*
- * Reload arg registers from stack in case ptrace changed them.
- * We don't reload %eax because syscall_trace_enter() returned
-- * the value it wants us to use in the table lookup.
-+ * the %rax value we should see. Instead, we just truncate that
-+ * value to 32 bits again as we did on entry from user mode.
-+ * If it's a new value set by user_regset during entry tracing,
-+ * this matches the normal truncation of the user-mode value.
-+ * If it's -1 to make us punt the syscall, then (u32)-1 is still
-+ * an appropriately invalid value.
- */
- .macro LOAD_ARGS32 offset, _r9=0
- .if \_r9
-@@ -60,6 +65,7 @@
- movl \offset+48(%rsp),%edx
- movl \offset+56(%rsp),%esi
- movl \offset+64(%rsp),%edi
-+ movl %eax,%eax /* zero extension */
- .endm
-
- .macro CFI_STARTPROC32 simple
More information about the pve-devel
mailing list