Merge pull request xapi-project#5 from jonludlam/novncterm-wrapper

No vncterm-wrapper

Author: djs55

Makefile

@@ -35,7 +35,6 @@ install:
 	install -D ./dist/build/xenopsd_simulator/xenopsd_simulator $(DESTDIR)/$(SBINDIR)/xenopsd_simulator
 	install -D ./dist/build/xenguest/xenguest $(DESTDIR)/$(LIBEXECDIR)/xenguest
 	install -D ./scripts/vif $(DESTDIR)/$(SCRIPTSDIR)/vif
-	install -D ./scripts/vncterm-wrapper $(DESTDIR)/$(LIBEXECDIR)/vncterm-wrapper
 	install -D ./scripts/qemu-dm-wrapper $(DESTDIR)/$(LIBEXECDIR)/qemu-dm-wrapper
 	install -D ./scripts/qemu-vif-script $(DESTDIR)/$(LIBEXECDIR)/qemu-vif-script
 	install -D ./scripts/setup-vif-rules $(DESTDIR)/$(LIBEXECDIR)/setup-vif-rules
@@ -55,7 +54,6 @@ uninstall:
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/xenguest
 	rm -f $(DESTDIR)/$(ETCDIR)/xenopsd.conf
 	rm -f $(DESTDIR)/$(SCRIPTSDIR)/vif
-	rm -f $(DESTDIR)/$(LIBEXECDIR)/vncterm-wrapper
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/qemu-dm-wrapper
 	rm -f $(DESTDIR)/$(LIBEXECDIR)/setup-vif-rules
 	rm -f $(DESTDIR)/$(ETCDIR)/xcp/network.conf

lib/path.ml

@@ -17,7 +17,6 @@ let vif_script = ref "/usr/lib/xcp/scripts/vif"
 let qemu_vif_script = ref "/usr/lib/xcp/scripts/qemu-vif-script"
 let vbd_script = ref "/etc/xen/scripts/block"
 let pci_flr_script = ref "/usr/lib/xcp/lib/pci-flr"
-let vncterm_wrapper = ref "/usr/lib/xcp/lib/vncterm-wrapper"
 let vncterm = ref "/usr/lib/xcp/lib/vncterm"
 let xenguest = ref "/usr/lib/xcp/lib/xenguest"
 let qemu_dm_wrapper = ref "/usr/lib/xcp/lib/qemu-dm-wrapper"
@@ -39,7 +38,6 @@ let essentials = [
 	R_OK, "network-conf", network_conf, "path to the network backend switch";
 	X_OK, "vif-script", vif_script, "path to the vif backend script";
 	X_OK, "qemu-vif-script", qemu_vif_script, "path to the qemu vif script";
-	X_OK, "vncterm-wrapper", vncterm_wrapper, "path to the vncterm-wrapper script";
 	X_OK, "vncterm", vncterm, "path to the vncterm binary";
 	X_OK, "xenguest", xenguest, "path to the xenguest binary";
 	X_OK, "qemu-dm-wrapper", qemu_dm_wrapper, "path to the qemu-dm-wrapper script";

scripts/make-custom-xenopsd.conf

@@ -5,18 +5,30 @@
 
 install -D ./xenopsd.conf ${DESTDIR}/${ETCDIR}/xenopsd.conf
 
-cat >> ${DESTDIR}/${ETCDIR}/xenopsd.conf <<EOT
+# Find xen:
+for i in xen xen-4.1 xen-4.2 xen-4.3; do
+        if [ -d /usr/lib/$i ]; then myxen=$i; fi
+done
 
+# Find a group
+for i in root wheel xapi xendev; do
+	egrep -i "^$i" /etc/group > /dev/null && group=$i
+done
 
+cat >> ${DESTDIR}/${ETCDIR}/xenopsd.conf <<EOT
 # Locations of the necessary scripts, generated from xenopsd:Makefile
 # on $(date)
-xenguest=${DESTDIR}/${LIBEXECDIR}/xenguest
-network-conf=${DESTDIR}/${ETCDIR}/xcp/network.conf
-vif-script=${DESTDIR}/${SCRIPTSDIR}/vif
-qemu-vif-script=${DESTDIR}/${SCRIPTSDIR}/qemu-vif-script
-vncterm-wrapper=${DESTDIR}/${LIBEXECDIR}/vncterm-wrapper
-qemu-dm-wrapper=${DESTDIR}/${LIBEXECDIR}/qemu-dm-wrapper
-setup-vif-rules=${DESTDIR}/${LIBEXECDIR}/setup-vif-rules
+xenguest=${LIBEXECDIR}/xenguest
+network-conf=${ETCDIR}/xcp/network.conf
+vif-script=${SCRIPTSDIR}/vif
+qemu-vif-script=${SCRIPTSDIR}/qemu-vif-script
+qemu-dm-wrapper=${LIBEXECDIR}/qemu-dm-wrapper
+setup-vif-rules=${LIBEXECDIR}/setup-vif-rules
+hvmloader=/usr/lib/${myxen}/boot/hvmloader
+pygrub=/usr/lib/${myxen}/bin/pygrub
+sockets-group=$group
+vncterm=${LIBEXECDIR}/vncterm
+eliloader=${LIBEXECDIR}/eliloader
 EOT
 
 echo You may now run:

scripts/vncterm-wrapper

@@ -869,15 +869,16 @@ let save ~xs domid =
 	| None     -> ()
 
 let start ?statefile ~xs ?ip domid =
+        debug "In PV_Vnc.start";
 	let ip = Opt.default "127.0.0.1" ip in
-	let l = [ string_of_int domid; (* absorbed by vncterm-wrapper *)
-		  (* everything else goes straight through to vncterm: *)
-		  "-x"; sprintf "/local/domain/%d/console" domid;
+	let l = [ "-x"; sprintf "/local/domain/%d/console" domid;
 		  "-T"; (* listen for raw connections *)
 		  "-v"; ip ^ ":1";
 		] @ load_args statefile in
 	(* Now add the close fds wrapper *)
-	let pid = Forkhelpers.safe_close_and_exec None None None [] !Path.vncterm_wrapper l in
+	let pid = Forkhelpers.safe_close_and_exec None None None [] !Path.vncterm l in
+	let path = vnc_pid_path domid in
+	xs.Xs.write path (string_of_int (Forkhelpers.getpid pid));
 	Forkhelpers.dontwaitpid pid
 
 let stop ~xs domid =

xc/device.ml

@@ -48,9 +48,6 @@ disable-logging-for=http
 # Path to the PCI FLR script
 # pci-flr-script=/opt/xensource/libexec/pci-flr
 
-# Path to the vncterm wrapper script
-# vncterm-wrapper=/opt/xensource/libexec/vncterm-wrapper
-
 # Path to the vncterm binary
 # vncterm=/usr/lib/xen/bin/vncterm