[gentoo-commits] gentoo-x86 commit in app-emulation/libvirt/files: libvirtd.init-r1

[Diego Petteno (flameeyes)]

flameeyes    10/08/01 19:32:03

  Modified:             libvirtd.init-r1
  Log:
  Make the init script pass the KRB5_KTNAME variable to libvirtd so that it actually works as documented for RedHat/Fedora with mit-krb5. Also use more advanced awk commands to avoid greps and possibly misreading based on domain names.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  app-emulation/libvirt/files/libvirtd.init-r1

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/files/libvirtd.init-r1?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/files/libvirtd.init-r1?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/files/libvirtd.init-r1?r1=1.2&r2=1.3

Index: libvirtd.init-r1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/files/libvirtd.init-r1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libvirtd.init-r1	7 Jul 2010 21:59:31 -0000	1.2
+++ libvirtd.init-r1	1 Aug 2010 19:32:03 -0000	1.3
@@ -14,16 +14,22 @@
 }
 
 libvirtd_dom_list() {
-    libvirtd_virsh list | grep running | awk '{ print $1 }'
+    # Make sure that it wouldn't be confused if the domain name
+    # contains the word running.
+    libvirtd_virsh list | awk '$3 == "running" { print $1 }'
 }
 
 libvirtd_dom_count() {
-    libvirtd_dom_list | wc -l
+    # Make sure that it wouldn't be confused if the domain name
+    # contains the word running.
+    libvirtd_virsh list | awk '$3 == "running" { count++ } END { print count }'
 }
 
 start() {
     ebegin "Starting libvirtd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
+    start-stop-daemon --start \
+        --env KRB5_KTNAME=/etc/libvirt/krb5.tab \
+        --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS}
     eend $?
 }