Accepting request 50931 from Virtualization

Accepted submit request 50931 from user jfehlig

OBS-URL: https://build.opensuse.org/request/show/50931
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=60

libvirt.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Oct 13 17:44:27 MDT 2010 - jfehlig@novell.com
+
+- cannot restart dead libvirtd without manually removing pidfile
+  modified libvirtd.init
+  bnc#645755
+
+-------------------------------------------------------------------
+Mon Oct 11 19:04:21 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Fix package dependencies so can be installed without
+  pulling excess of optional components 
+
+-------------------------------------------------------------------
+Tue Oct  5 16:29:42 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Support dropping capabilities with cap-ng library in 
+  openSUSE >= 11.3
+
 -------------------------------------------------------------------
 Tue Sep 28 14:20:32 MDT 2010 - jfehlig@novell.com
 

libvirt.spec

@@ -39,7 +39,11 @@
 %define with_selinux         1
 %define with_apparmor        0
 # options
+%if 0%{?suse_version} >= 1130
+%define with_capng           1
+%else
 %define with_capng           0
+%endif
 %define with_netcf           0
 %define with_udev            0
 %define with_hal             0
@@ -118,6 +122,9 @@ BuildRequires:  libnl-devel
 %if %{with_esx}
 BuildRequires:  libcurl-devel
 %endif
+%if %{with_capng}
+BuildRequires:	libcap-ng-devel
+%endif
 # Only for directory ownership:
 BuildRequires:  gtk-doc
 Url:            http://libvirt.org/
@@ -129,20 +136,20 @@ Release:        1
 Summary:        A C toolkit to interract with the virtualization capabilities of Linux
 # The client side, i.e. shared libs and virsh are in a subpackage
 Requires:       %{name}-client = %{version}-%{release}
-Requires:       bridge-utils
-Requires:       iptables
-Requires:       lvm2
+Recommends:       bridge-utils
+Recommends:       iptables
+Recommends:       lvm2
 Requires:       parted
 Requires:       virt-utils
 Recommends:     logrotate
-Requires:       dnsmasq
-Requires:       open-iscsi
-Requires:       nfs-client
+Recommends:     dnsmasq
+Recommends:       open-iscsi
+Recommends:       nfs-client
 %if %{with_hal}
 Requires:       hal
 %endif
 %if 0%{?suse_version} > 1110
-Requires:       polkit >= 0.9
+Recommends:       polkit >= 0.9
 %else
 Requires:       PolicyKit >= 0.6
 %endif
@@ -183,7 +190,7 @@ Requires:       readline
 Requires:       ncurses
 # So remote clients can access libvirt over SSH tunnel
 # (client invokes 'nc' against the UNIX socket on the server)
-Requires:       netcat-openbsd
+Recommends:       netcat-openbsd
 Requires:       cyrus-sasl
 Recommends:     cyrus-sasl-digestmd5
 

libvirtd.init

@@ -19,6 +19,7 @@
 
 
 LIBVIRTD_BIN=/usr/sbin/libvirtd
+LIBVIRTD_PIDFILE=/var/run/libvirtd.pid
 test -x $LIBVIRTD_BIN || { echo "$LIBVIRD_BIN not installed";
          if [ "$1" = "stop" ]; then exit 0;
 	 else exit 5; fi; }
@@ -30,6 +31,16 @@ rc_reset
 
 case "$1" in
     start)
+        if [ -e $LIBVIRTD_PIDFILE ]; then
+                if checkproc $LIBVIRTD_BIN ; then
+                        echo -n "libvirtd is already running."
+			rc_status -v
+                        exit
+                else
+                        echo "Removing stale PID file $LIBVIRTD_PIDFILE."
+                        rm -f $LIBVIRTD_PIDFILE
+                fi
+        fi
         echo -n "Starting libvirtd "
         startproc $LIBVIRTD_BIN -d -l
         rc_status -v
@@ -37,6 +48,7 @@ case "$1" in
     stop)
         echo -n "Shutting down libvirtd "
         killproc -TERM $LIBVIRTD_BIN > /dev/null 2>&1
+        rm -f $LIBVIRTD_PIDFILE
         rc_status -v
         ;;
     try-restart)