| @@ -1,7 +1,5 @@
-Index: libvirt-0.9.0/daemon/libvirtd.conf
-===================================================================
---- libvirt-0.9.0.orig/daemon/libvirtd.conf
-+++ libvirt-0.9.0/daemon/libvirtd.conf
+--- libvirt-0.9.12/daemon/libvirtd.conf.orig 2012-03-30 04:45:28.000000000 +0200
++++ libvirt-0.9.12/daemon/libvirtd.conf 2012-06-10 18:13:41.408007191 +0200
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@@ -13,26 +11,9 @@
# Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to
-@@ -53,11 +53,9 @@
-
- # Flag toggling mDNS advertizement of the libvirt service.
- #
--# Alternatively can disable for all services on a host by
--# stopping the Avahi daemon
--#
--# This is enabled by default, uncomment this to disable it
--#mdns_adv = 0
-+# Disabled by default. To enable, ensure the Avahi daemon is
-+# running and uncomment this flag.
-+#mdns_adv = 1
-
- # Override the default mDNS advertizement name. This must be
- # unique on the immediate broadcast network.
-Index: libvirt-0.9.3/daemon/libvirtd.c
-===================================================================
---- libvirt-0.9.3/daemon/libvirtd.c.orig 2011-07-04 03:21:27.000000000 +0200
-+++ libvirt-0.9.3/daemon/libvirtd.c 2011-07-08 21:47:18.553145124 +0200
-@@ -897,7 +897,7 @@
+--- libvirt-0.9.12/daemon/libvirtd-config.c.orig 2012-06-10 18:40:38.840007171 +0200
++++ libvirt-0.9.12/daemon/libvirtd-config.c 2012-06-10 18:40:59.132007092 +0200
+@@ -237,7 +237,7 @@
return NULL;
}
@@ -41,12 +22,3 @@
data->listen_tcp = 0;
if (!(data->tls_port = strdup(LIBVIRTD_TLS_PORT)))
-@@ -934,7 +934,7 @@
- #endif
- data->auth_tls = REMOTE_AUTH_NONE;
-
-- data->mdns_adv = 1;
-+ data->mdns_adv = 0;
-
- data->min_workers = 5;
- data->max_workers = 20;
|
| @@ -1,7 +1,72 @@
-Index: libvirt-0.9.2/tools/libvirt-guests.init.sh
-===================================================================
---- libvirt-0.9.2.orig/tools/libvirt-guests.init.sh
-+++ libvirt-0.9.2/tools/libvirt-guests.init.sh
+--- libvirt-0.9.10/tools/Makefile.am.orig 2012-02-06 03:50:50.000000000 +0100
++++ libvirt-0.9.10/tools/Makefile.am 2012-02-18 20:04:09.061686815 +0100
+@@ -182,24 +182,24 @@
+ uninstall-local: uninstall-init uninstall-systemd
+
+ install-sysconfig:
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
++ $(MKDIR_P) $(DESTDIR)$(localstatedir)/adm/fillup-templates
+ $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
++ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests
+
+ uninstall-sysconfig:
+- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
++ rm -f $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirt-guests
++ rmdir $(DESTDIR)$(localstatedir)/adm/fillup-templates ||:
+
+ EXTRA_DIST += libvirt-guests.init.sh
+
+ install-initscript: libvirt-guests.init
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init.d
+ $(INSTALL_SCRIPT) libvirt-guests.init \
+- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests
++ $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests
+
+ uninstall-initscript:
+- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests
+- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d ||:
++ rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests
++ rmdir $(DESTDIR)$(sysconfdir)/init.d ||:
+
+
+ if LIBVIRT_INIT_SCRIPT_RED_HAT
+--- libvirt-0.9.10/daemon/Makefile.am.orig 2012-02-06 03:50:50.000000000 +0100
++++ libvirt-0.9.10/daemon/Makefile.am 2012-02-18 20:25:45.329739548 +0100
+@@ -249,9 +249,9 @@
+ rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
+
+ install-sysconfig:
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
++ $(MKDIR_P) $(DESTDIR)$(localstatedir)/adm/fillup-templates
+ $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
+- $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
++ $(DESTDIR)$(localstatedir)/adm/fillup-templates/sysconfig.libvirtd
+ uninstall-sysconfig:
+ rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+ rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+@@ -270,13 +270,13 @@
+ BUILT_SOURCES += libvirtd.init
+
+ install-init-redhat: install-sysconfig libvirtd.init
+- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d
++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/init.d
+ $(INSTALL_SCRIPT) libvirtd.init \
+- $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
++ $(DESTDIR)$(sysconfdir)/init.d/libvirtd
+
+ uninstall-init-redhat: uninstall-sysconfig
+- rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd
+- rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :
++ rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirtd
++ rmdir $(DESTDIR)$(sysconfdir)/init.d || :
+ else
+ install-init-redhat:
+ uninstall-init-redhat:
+--- libvirt-0.9.12/tools/libvirt-guests.init.sh.orig 2012-03-06 14:59:21.000000000 +0100
++++ libvirt-0.9.12/tools/libvirt-guests.init.sh 2012-06-10 18:33:12.636007308 +0200
@@ -4,10 +4,10 @@
#
### BEGIN INIT INFO
@@ -35,12 +100,15 @@
# Source gettext library.
# Make sure this file is recognized as having translations: _("dummy")
. "@bindir@"/gettext.sh
-@@ -50,12 +49,10 @@ test -f "$sysconfdir"/sysconfig/libvirt-
+@@ -52,15 +51,13 @@
LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
-RETVAL=0
-
+ # retval COMMAND ARGUMENTS...
+ # run command with arguments and convert non-zero return value to 1 and set
+ # the global return variable
retval() {
"$@"
if [ $? -ne 0 ]; then
@@ -49,21 +117,21 @@
return 1
else
return 0
-@@ -77,12 +74,31 @@ run_virsh_c() {
- ( export LC_ALL=C; run_virsh "$@" )
+@@ -103,6 +100,24 @@
+ fi
}
-+await_daemon_up()
-+{
-+ uri=$1
-+ i=1
-+ rets=10
++await_daemon_up()
++{
++ uri=$1
++ i=1
++ rets=10
+ run_virsh $uri list > /dev/null 2>&1
+ while [ $? -ne 0 -a $i -lt $rets ]; do
-+ sleep 1
-+ echo -n .
-+ i=$(($i + 1))
-+ run_virsh $uri list > /dev/null 2>&1
++ sleep 1
++ echo -n .
++ i=$(($i + 1))
++ run_virsh $uri list > /dev/null 2>&1
+ done
+ if [ $i -eq $rets ]; then
+ echo $"libvirt-guests unable to connect to URI: $uri"
@@ -71,38 +139,21 @@
+ fi
+ return 0
+}
-+
- list_guests() {
- uri=$1
+ # list_guests URI PERSISTENT
+ # List running guests on URI.
+ # PERSISTENT argument options:
+@@ -115,7 +130,7 @@
- list=$(run_virsh_c "$uri" list)
+ list=$(run_virsh_c "$uri" list --uuid $persistent)
if [ $? -ne 0 ]; then
- RETVAL=1
+ rc_failed 1
return 1
fi
-@@ -90,7 +106,7 @@ list_guests() {
- for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do
- uuid=$(run_virsh_c "$uri" dominfo "$id" | awk '/^UUID:/{print $2}')
- if [ -z "$uuid" ]; then
-- RETVAL=1
-+ rc_failed 1
- return 1
- fi
- uuids="$uuids $uuid"
-@@ -117,7 +133,7 @@ guest_is_on() {
- guest_running=false
- info=$(run_virsh_c "$uri" dominfo "$uuid")
- if [ $? -ne 0 ]; then
-- RETVAL=1
-+ rc_failed 1
- return 1
- fi
+@@ -189,6 +204,12 @@
-@@ -159,6 +175,12 @@ start() {
- continue
- fi
+ test_connect "$uri" || continue
+ await_daemon_up $uri
+ if [ $? -ne 0 ]; then
@@ -113,16 +164,16 @@
eval_gettext "Resuming guests on \$uri URI..."; echo
for guest in $list; do
name=$(guest_name "$uri" "$guest")
-@@ -245,7 +267,7 @@ stop() {
- if [ $SHUTDOWN_TIMEOUT -le 0 ]; then
- gettext "Shutdown action requested but SHUTDOWN_TIMEOUT was not set"
+@@ -394,7 +415,7 @@
+ if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then
+ gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0"
echo
- RETVAL=6
+ rc_failed 6
return
fi
fi
-@@ -315,14 +337,13 @@ gueststatus() {
+@@ -504,14 +525,13 @@
rh_status() {
if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo
@@ -138,17 +189,15 @@
fi
}
-@@ -366,4 +387,4 @@ case "$1" in
+@@ -555,4 +575,4 @@
|
