Index: debian/univention-xen.univention-config-registry-variables =================================================================== --- debian/univention-xen.univention-config-registry-variables (Revision 21493) +++ debian/univention-xen.univention-config-registry-variables (Arbeitskopie) @@ -81,3 +81,15 @@ Description[en]=Enable/Disable the Xen XMLRPC service via TCP/IP socket [no] Type=bool Categories=service-xen + +[xen/dom0/min_mem] +Description[de]=Minimaler Speicher (in MB) für dom0. +Description[en]=Lowest permissible memory level (in MB) for dom0. +Type=int +Categories=service-xen + +[xen/dom0/ballooning] +Description[de]=Aktiviere Auto-Ballooning in dom0. +Description[en]=Enable auto-ballooning of dom0. +Type=bool +Categories=service-xen Index: debian/postinst =================================================================== --- debian/postinst (Revision 21493) +++ debian/postinst (Arbeitskopie) @@ -31,14 +31,25 @@ univention-config-registry set xen/repository?"file:///var/lib/univention-server-cdrom" -eval "$(univention-config-registry shell kernel/modules)" +eval "$(univention-config-registry shell kernel/modules server/role)" echo "$kernel_modules" | grep xen-evtchn >/dev/null if [ $? = 1 ]; then univention-config-registry set kernel/modules="$kernel_modules;xen-evtchn" fi +case "$server_role" in +domaincontroller_*) # domaincontroller_master domaincontroller_backup domaincontroller_slave + ucr set xen/dom0/min_mem?"1024" xen/dom0/ballooning?"no" grub/xenhopt?"dom0_mem=1024M dom0_max_vcpus=1 dom0_vcpus_pin" + ;; +memberserver) + ucr set xen/dom0/min_mem?"512" xen/dom0/ballooning?"no" grub/xenhopt?"dom0_mem=512M dom0_max_vcpus=1 dom0_vcpus_pin" + ;; +*) # mobileclient mobile_client managed_client fatclient basesystem + ucr set xen/dom0/min_mem?"196" xen/dom0/ballooning?"yes" + ;; +esac + #DEBHELPER# exit 0 - Index: debian/changelog =================================================================== --- debian/changelog (Revision 21493) +++ debian/changelog (Arbeitskopie) @@ -1,3 +1,9 @@ +univention-xen (3.0.6-2) unstable; urgency=low + + * Disbale ballooning on DCs (Bug #20013) + + -- Philipp Hahn Tue, 14 Dec 2010 17:34:00 +0100 + univention-xen (3.0.5-1) unstable; urgency=low * allow univention-kernel-image-2.6.18-xen as dom0 meta package. Bug Index: conffiles/etc/xen/xend-config.sxp =================================================================== --- conffiles/etc/xen/xend-config.sxp (Revision 21493) +++ conffiles/etc/xen/xend-config.sxp (Arbeitskopie) @@ -221,11 +221,11 @@ # dom0-min-mem is the lowest permissible memory level (in MB) for dom0. # This is a minimum both for auto-ballooning (as enabled by # enable-dom0-ballooning below) and for xm mem-set when applied to dom0. -(dom0-min-mem 196) +(dom0-min-mem @%@xen/dom0/min_mem@%@) # Whether to enable auto-ballooning of dom0 to allow domUs to be created. # If enable-dom0-ballooning = no, dom0 will never balloon out. -(enable-dom0-ballooning yes) +(enable-dom0-ballooning @%@xen/dom0/ballooning@%@) # In SMP system, dom0 will use dom0-cpus # of CPUS # If dom0-cpus = 0, dom0 will take all cpus available