ba7af56283
xl(1) runs the hotplug scripts in parallel. This causes failures when the next free vnd device is selected. Locking modeled after the Linux block hotplug script.
52 lines
1.5 KiB
Text
52 lines
1.5 KiB
Text
$NetBSD: patch-hotplug_NetBSD_Makefile,v 1.2 2016/04/04 14:45:12 bad Exp $
|
|
|
|
--- hotplug/NetBSD/Makefile.orig 2015-11-03 10:11:18.000000000 +0100
|
|
+++ hotplug/NetBSD/Makefile 2016-03-25 15:21:34.000000000 +0100
|
|
@@ -3,12 +3,13 @@
|
|
|
|
# Xen script dir and scripts to go there.
|
|
XEN_SCRIPTS =
|
|
+XEN_SCRIPTS += locking.sh
|
|
XEN_SCRIPTS += block
|
|
XEN_SCRIPTS += vif-bridge
|
|
XEN_SCRIPTS += vif-ip
|
|
|
|
XEN_SCRIPT_DATA =
|
|
-XEN_RCD_PROG = rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog
|
|
+#XEN_RCD_PROG = rc.d/xencommons rc.d/xendomains rc.d/xen-watchdog
|
|
|
|
.PHONY: all
|
|
all:
|
|
@@ -21,10 +22,11 @@
|
|
|
|
.PHONY: install-scripts
|
|
install-scripts:
|
|
- $(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
|
|
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)
|
|
+ $(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts
|
|
set -e; for i in $(XEN_SCRIPTS); \
|
|
do \
|
|
- $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
|
|
+ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts; \
|
|
done
|
|
set -e; for i in $(XEN_SCRIPT_DATA); \
|
|
do \
|
|
@@ -33,12 +35,12 @@
|
|
|
|
.PHONY: install-rcd
|
|
install-rcd:
|
|
- $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
|
|
- set -e; for i in $(XEN_RCD_PROG); \
|
|
- do \
|
|
- $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
|
|
- done
|
|
- $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(INITD_DIR)/xen-hotplugpath.sh
|
|
+# $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
|
|
+# set -e; for i in $(XEN_RCD_PROG); \
|
|
+# do \
|
|
+# $(INSTALL_PROG) $$i $(DESTDIR)$(INITD_DIR); \
|
|
+# done
|
|
+# $(INSTALL_DATA) ../common/hotplugpath.sh $(DESTDIR)$(INITD_DIR)/xen-hotplugpath.sh
|
|
|
|
.PHONY: clean
|
|
clean:
|