From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Thu, 16 Dec 2010 06:34:46 +0000 (-0500)
Subject: fix postinstall script, alter vserver config as Daniel suggested
X-Git-Tag: linux-2.6-32-3~3
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=7d909b03a24f3abb910162c814efa14f8d435fee

fix postinstall script, alter vserver config as Daniel suggested
---

diff --git a/config-vserver b/config-vserver
index fcc5c88bb..2b0b943b0 100644
--- a/config-vserver
+++ b/config-vserver
@@ -1,23 +1,22 @@
+CONFIG_CFS_HARD_LIMITS=y
 # CONFIG_BLK_DEV_VROOT is not set
-# CONFIG_CFS_HARD_LIMITS is not set
-# CONFIG_TAGGING_GID16 is not set
-# CONFIG_TAGGING_INTERN is not set
+
+# CONFIG_VSERVER_AUTO_LBACK is not set
+# CONFIG_VSERVER_AUTO_SINGLE is not set
+CONFIG_VSERVER_COWBL=y
+# CONFIG_VSERVER_VTIME is not set
+# CONFIG_VSERVER_DEVICE is not set
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
 # CONFIG_TAGGING_NONE is not set
 # CONFIG_TAGGING_UID16 is not set
+# CONFIG_TAGGING_GID16 is not set
+CONFIG_TAGGING_ID24=y
+# CONFIG_TAGGING_INTERN is not set
 # CONFIG_TAG_NFSD is not set
-# CONFIG_VSERVER_DEBUG is not set
-# CONFIG_VSERVER_DEVICE is not set
-# CONFIG_VSERVER_IDLELIMIT is not set
 # CONFIG_VSERVER_PRIVACY is not set
-# CONFIG_VSERVER_VTIME is not set
-CONFIG_TAGGING_ID24=y
+CONFIG_VSERVER_CONTEXTS=256
+CONFIG_VSERVER_WARN=y
+# CONFIG_VSERVER_DEBUG is not set
 CONFIG_VSERVER=y
-CONFIG_VSERVER_AUTO_LBACK=y
-CONFIG_VSERVER_AUTO_SINGLE=y
-CONFIG_VSERVER_CONTEXTS=768
-CONFIG_VSERVER_COWBL=y
-CONFIG_VSERVER_HARDCPU=y
-CONFIG_VSERVER_IDLETIME=y
-CONFIG_VSERVER_PROC_SECURE=y
 CONFIG_VSERVER_SECURITY=y
-CONFIG_VSERVER_WARN=y
diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 18824bf6c..5cc4a87b1 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -1548,32 +1548,25 @@ fi\
 %else\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\
 %endif}\
-#### Planet-Lab ####
-%if "%{distro}" == "Fedora" && %{distrorelease} >= 12
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\
 if [ -x /sbin/weak-modules ]\
 then\
     /sbin/weak-modules --add-kernel %{KVERREL}%{?1:.%{1}} || exit $?\
 fi\
-%endif
-#### Planet-Lab ####
-
-#### Planet-Lab ####
+%endif\
 # make some useful links
-pushd /boot > /dev/null ; {
-        ln -sf config-%{KVERREL}%{?1:.%{1}} config
-        ln -sf config-%{KVERREL}%{?1:.%{1}} configsmp
-        ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-boot
-        ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-bootsmp
-        ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-boot
-        ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-bootsmp
-}
-popd > /dev/null
-
+pushd /boot\
+ln -sf config-%{KVERREL}%{?1:.%{1}} config\
+ln -sf config-%{KVERREL}%{?1:.%{1}} configsmp\
+ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-boot\
+ln -sf initrd-%{KVERREL}%{?1:.%{1}}.img initrd-bootsmp\
+ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-boot\
+ln -sf vmlinuz-%{KVERREL}%{?1:.%{1}} kernel-bootsmp\
+popd\
 # ask for a reboot
-mkdir -p /etc/planetlab
-touch /etc/planetlab/update-reboot
-#### Planet-Lab ####
+mkdir -p /etc/planetlab\
+touch /etc/planetlab/update-reboot\
 %{nil}
 
 #