[pve-devel] r6502 - in qemu-server/pve2: . PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-08-19 09:39:51 +0200 (Fri, 19 Aug 2011)
New Revision: 6502

Modified:
   qemu-server/pve2/ChangeLog
   qemu-server/pve2/Makefile
   qemu-server/pve2/PVE/QemuServer.pm
   qemu-server/pve2/qemu.init.d
Log:
	* qemu.init.d: create /var/run/qemu-server and
	/var/lock/qemu-server



Modified: qemu-server/pve2/ChangeLog
===================================================================
--- qemu-server/pve2/ChangeLog	2011-08-19 06:22:25 UTC (rev 6501)
+++ qemu-server/pve2/ChangeLog	2011-08-19 07:39:51 UTC (rev 6502)
@@ -1,3 +1,8 @@
+2011-08-19  Proxmox Support Team  <support at proxmox.com>
+
+	* qemu.init.d: create /var/run/qemu-server and
+	/var/lock/qemu-server
+
 2011-08-18  Proxmox Support Team  <support at proxmox.com>
 
 	* PVE/QemuServer.pm (print_drive_full): enable aio by default.

Modified: qemu-server/pve2/Makefile
===================================================================
--- qemu-server/pve2/Makefile	2011-08-19 06:22:25 UTC (rev 6501)
+++ qemu-server/pve2/Makefile	2011-08-19 07:39:51 UTC (rev 6502)
@@ -73,8 +73,6 @@
 	install -d ${DESTDIR}/usr/share/man/man5
 	install -d ${DESTDIR}/usr/share/${PACKAGE}
 	install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE}
-	install -d ${DESTDIR}/var/run/${PACKAGE}
-	install -d ${DESTDIR}/var/lock/${PACKAGE}
 	make -C PVE install
 	install -m 0755 qm ${DESTDIR}${SBINDIR}
 	install -m 0755 qmigrate ${DESTDIR}${SBINDIR}

Modified: qemu-server/pve2/PVE/QemuServer.pm
===================================================================
--- qemu-server/pve2/PVE/QemuServer.pm	2011-08-19 06:22:25 UTC (rev 6501)
+++ qemu-server/pve2/PVE/QemuServer.pm	2011-08-19 07:39:51 UTC (rev 6502)
@@ -2135,8 +2135,6 @@
 
 	check_lock ($conf) if !$skiplock;
 
-	mkpath $var_run_tmpdir;
-    
 	if (check_running ($vmid)) {
 	    my $msg = "VM $vmid already running - start failed\n" ;
 	    syslog ('err', $msg);

Modified: qemu-server/pve2/qemu.init.d
===================================================================
--- qemu-server/pve2/qemu.init.d	2011-08-19 06:22:25 UTC (rev 6501)
+++ qemu-server/pve2/qemu.init.d	2011-08-19 07:39:51 UTC (rev 6502)
@@ -23,6 +23,13 @@
 	(egrep '^flags.*vmx' /proc/cpuinfo >/dev/null && modprobe -q kvm-intel) || 
 	echo "unable to load kvm module"
 
+	# recent distributions use tmpfs for /var/run
+	# and /var/lock to avoid to clean it up on every boot.
+	# they also assume that init scripts will create
+	# required subdirectories for proper operations
+	mkdir -p /var/run/qemu-server
+	mkdir -p /var/lock/qemu-server
+
 	$PROG startall
 	;;
   stop)