diff -Naur xen-4.0.0.orig/Makefile xen-4.0.0/Makefile --- xen-4.0.0.orig/Makefile 2010-04-07 19:45:00.213682713 -0500 +++ xen-4.0.0/Makefile 2010-04-07 19:46:31.153646200 -0500 @@ -201,7 +201,7 @@ rm -f $(D)$(CONFIG_DIR)/udev/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(CONFIG_DIR)/udev/xend.rules - rm -f $(D)$(CONFIG_DIR)/sysconfig/xendomains + rm -f $(D)$(CONFIG_DIR)/default/xendomains rm -rf $(D)/var/run/xen* $(D)/var/lib/xen* rm -rf $(D)/boot/*xen* rm -rf $(D)/lib/modules/*xen* diff -Naur xen-4.0.0.orig/tools/hotplug/Linux/init.d/xend xen-4.0.0/tools/hotplug/Linux/init.d/xend --- xen-4.0.0.orig/tools/hotplug/Linux/init.d/xend 2010-04-07 19:45:20.143684411 -0500 +++ xen-4.0.0/tools/hotplug/Linux/init.d/xend 2010-04-07 19:48:44.363652137 -0500 @@ -51,8 +51,8 @@ case "$1" in start) - mkdir -p /var/lock/subsys - touch /var/lock/subsys/xend + mkdir -p /var/lock + touch /var/lock/xend test -z "$XENSTORED_ROOTDIR" || export XENSTORED_ROOTDIR test -z "$XENCONSOLED_TRACE" || export XENCONSOLED_TRACE [[ "$XENSTORED_TRACE" == @(yes|on|1) ]] && export XENSTORED_TRACE @@ -62,7 +62,7 @@ ;; stop) xend stop - rm -f /var/lock/subsys/xend + rm -f /var/lock/xend ;; status) xend status diff -Naur xen-4.0.0.orig/tools/hotplug/Linux/init.d/xendomains xen-4.0.0/tools/hotplug/Linux/init.d/xendomains --- xen-4.0.0.orig/tools/hotplug/Linux/init.d/xendomains 2010-04-07 19:45:20.143684411 -0500 +++ xen-4.0.0/tools/hotplug/Linux/init.d/xendomains 2010-04-07 19:49:57.263642453 -0500 @@ -34,8 +34,8 @@ exit 0 fi -LOCKFILE=/var/lock/subsys/xendomains -XENDOM_CONFIG=/etc/sysconfig/xendomains +LOCKFILE=/var/lock/xendomains +XENDOM_CONFIG=/etc/default/xendomains test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; diff -Naur xen-4.0.0.orig/tools/hotplug/Linux/Makefile xen-4.0.0/tools/hotplug/Linux/Makefile --- xen-4.0.0.orig/tools/hotplug/Linux/Makefile 2010-04-07 19:45:20.133684657 -0500 +++ xen-4.0.0/tools/hotplug/Linux/Makefile 2010-04-07 19:54:07.913725850 -0500 @@ -62,11 +62,11 @@ .PHONY: install-initd install-initd: [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d - [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig + [ -d $(DESTDIR)$(CONFIG_DIR)/default ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/default $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d - $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xend + $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/default/xend $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d - $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains + $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/default/xendomains .PHONY: install-scripts install-scripts: diff -Naur xen-4.0.0.orig/tools/xenballoon/xenballoond xen-4.0.0/tools/xenballoon/xenballoond --- xen-4.0.0.orig/tools/xenballoon/xenballoond 2010-04-07 19:45:19.383765360 -0500 +++ xen-4.0.0/tools/xenballoon/xenballoond 2010-04-07 19:54:59.923642036 -0500 @@ -21,7 +21,7 @@ # If xenbus is running and the /usr/bin/xenstore-* tools are installed, # "xenbus is enabled". # -# Parameters are documented in /etc/sysconfig/xenballoon.conf. Although +# Parameters are documented in /etc/default/xenballoon.conf. Although # some are not used with directed ballooning, all must be set properly. # If xenbus is enabled, some of these parameters may be overridden by values # set by domain0 via xenbus. @@ -237,7 +237,7 @@ fi preswapnow=0 -. /etc/sysconfig/xenballoon.conf +. /etc/default/xenballoon.conf while true; do diff -Naur xen-4.0.0.orig/tools/xenballoon/xenballoond.init xen-4.0.0/tools/xenballoon/xenballoond.init --- xen-4.0.0.orig/tools/xenballoon/xenballoond.init 2010-04-07 19:45:19.383765360 -0500 +++ xen-4.0.0/tools/xenballoon/xenballoond.init 2010-04-07 19:55:30.013724961 -0500 @@ -28,8 +28,8 @@ [ -f /proc/xen/capabilities ] && \ grep -q "control_d" /proc/xen/capabilities && exit 0 -if [ -f /etc/sysconfig/xenballoon.conf ]; then - . /etc/sysconfig/xenballoon.conf +if [ -f /etc/default/xenballoon.conf ]; then + . /etc/default/xenballoon.conf fi # Check that balloon driver is present diff -Naur xen-4.0.0.orig/tools/xenballoon/xenballoond.README xen-4.0.0/tools/xenballoon/xenballoond.README --- xen-4.0.0.orig/tools/xenballoon/xenballoond.README 2010-04-07 19:45:19.383765360 -0500 +++ xen-4.0.0/tools/xenballoon/xenballoond.README 2010-04-07 19:55:53.583825217 -0500 @@ -59,10 +59,10 @@ Instructions to install/deploy xenballoond (in Redhat-based system): - in each guest: - ensure pre-requisites are met (see above) - - place xenballoon.conf in /etc/sysconfig + - place xenballoon.conf in /etc/default - place xenballoond in /usr/sbin - copy xenballoond.init to /etc/rc.d/init.d/xenballoond (note file rename) - - edit /etc/sysconfig/xenballoond.conf as desired (especially note that + - edit /etc/default/xenballoond.conf as desired (especially note that selfballooning defaults as off) - start xenballoond with "service xenballoond start", and/or configure xenballoond to start at init (e.g. "chkconfig xenballoond on")