diff -Naur xen-3.4.2.orig/Makefile xen-3.4.2/Makefile --- xen-3.4.2.orig/Makefile 2009-11-10 09:12:55.000000000 -0600 +++ xen-3.4.2/Makefile 2009-12-16 12:41:36.379987221 -0600 @@ -201,7 +201,7 @@ rm -f $(D)/etc/udev/xen-backend.rules rm -f $(D)/etc/udev/rules.d/xend.rules rm -f $(D)/etc/udev/xend.rules - rm -f $(D)/etc/sysconfig/xendomains + rm -f $(D)/etc/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-3.4.2.orig/tools/hotplug/Linux/init.d/xend xen-3.4.2/tools/hotplug/Linux/init.d/xend --- xen-3.4.2.orig/tools/hotplug/Linux/init.d/xend 2009-11-10 09:12:56.000000000 -0600 +++ xen-3.4.2/tools/hotplug/Linux/init.d/xend 2009-12-16 12:50:43.509986900 -0600 @@ -48,14 +48,14 @@ case "$1" in start) - mkdir -p /var/lock/subsys - touch /var/lock/subsys/xend + mkdir -p /var/lock + touch /var/lock/xend xend start await_daemons_up ;; stop) xend stop - rm -f /var/lock/subsys/xend + rm -f /var/lock/xend ;; status) xend status diff -Naur xen-3.4.2.orig/tools/hotplug/Linux/init.d/xendomains xen-3.4.2/tools/hotplug/Linux/init.d/xendomains --- xen-3.4.2.orig/tools/hotplug/Linux/init.d/xendomains 2009-11-10 09:12:56.000000000 -0600 +++ xen-3.4.2/tools/hotplug/Linux/init.d/xendomains 2009-12-16 12:49:07.100033102 -0600 @@ -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; @@ -182,11 +182,11 @@ parseln() { - if [[ "$1" =~ "\(domain" ]]; then + if [[ "$1" =~ "(domain" ]]; then name=;id= - else if [[ "$1" =~ "\(name" ]]; then + else if [[ "$1" =~ "(name" ]]; then name=$(echo $1 | sed -e 's/^.*(name \(.*\))$/\1/') - else if [[ "$1" =~ "\(domid" ]]; then + else if [[ "$1" =~ "(domid" ]]; then id=$(echo $1 | sed -e 's/^.*(domid \(.*\))$/\1/') fi; fi; fi diff -Naur xen-3.4.2.orig/tools/hotplug/Linux/Makefile xen-3.4.2/tools/hotplug/Linux/Makefile --- xen-3.4.2.orig/tools/hotplug/Linux/Makefile 2009-11-10 09:12:56.000000000 -0600 +++ xen-3.4.2/tools/hotplug/Linux/Makefile 2009-12-16 12:44:38.349987730 -0600 @@ -64,10 +64,10 @@ .PHONY: install-initd install-initd: [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d - [ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig + [ -d $(DESTDIR)/etc/default ] || $(INSTALL_DIR) $(DESTDIR)/etc/default $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d - $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains + $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/default/xendomains .PHONY: install-scripts install-scripts: diff -Naur xen-3.4.2.orig/tools/xenballoon/xenballoond xen-3.4.2/tools/xenballoon/xenballoond --- xen-3.4.2.orig/tools/xenballoon/xenballoond 2009-11-10 09:12:57.000000000 -0600 +++ xen-3.4.2/tools/xenballoon/xenballoond 2009-12-16 12:43:48.261279429 -0600 @@ -20,7 +20,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. @@ -166,7 +166,7 @@ xenstore_enabled=false fi -. /etc/sysconfig/xenballoon.conf +. /etc/default/xenballoon.conf while true; do diff -Naur xen-3.4.2.orig/tools/xenballoon/xenballoond.init xen-3.4.2/tools/xenballoon/xenballoond.init --- xen-3.4.2.orig/tools/xenballoon/xenballoond.init 2009-11-10 09:12:57.000000000 -0600 +++ xen-3.4.2/tools/xenballoon/xenballoond.init 2009-12-16 12:42:58.753757709 -0600 @@ -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-3.4.2.orig/tools/xenballoon/xenballoond.README xen-3.4.2/tools/xenballoon/xenballoond.README --- xen-3.4.2.orig/tools/xenballoon/xenballoond.README 2009-11-10 09:12:57.000000000 -0600 +++ xen-3.4.2/tools/xenballoon/xenballoond.README 2009-12-16 12:43:26.639987569 -0600 @@ -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")