mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
merge with xen-unstable.hg
This commit is contained in:
awilliam@xenbuild.aw committed
commit
b4fa7c40e9
327 files changed
+7773
-4486
No files matched your search
@@ -50,11 +50,16 @@ HOTPLUGS=install-hotplug
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
|
||||
.PHONY: install
|
||||
install: all install-initd install-configs install-scripts $(HOTPLUGS)
|
||||
|
||||
.PHONY: install-initd
|
||||
install-initd:
|
||||
[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
|
||||
[ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
|
||||
@@ -62,6 +67,7 @@ install-initd:
|
||||
$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
|
||||
$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
|
||||
|
||||
.PHONY: install-configs
|
||||
install-configs: $(XEN_CONFIGS)
|
||||
[ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR)
|
||||
@@ -72,6 +78,7 @@ install-configs: $(XEN_CONFIGS)
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(XEN_CONFIG_DIR); \
|
||||
done
|
||||
|
||||
.PHONY: install-scripts
|
||||
install-scripts:
|
||||
[ -d $(DESTDIR)$(XEN_SCRIPT_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
|
||||
@@ -84,6 +91,7 @@ install-scripts:
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
|
||||
done
|
||||
|
||||
.PHONY: install-hotplug
|
||||
install-hotplug:
|
||||
[ -d $(DESTDIR)$(XEN_HOTPLUG_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_HOTPLUG_DIR)
|
||||
@@ -92,6 +100,7 @@ install-hotplug:
|
||||
$(INSTALL_PROG) $$i $(DESTDIR)$(XEN_HOTPLUG_DIR); \
|
||||
done
|
||||
|
||||
.PHONY: install-udev
|
||||
install-udev:
|
||||
[ -d $(DESTDIR)$(UDEV_RULES_DIR) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
|
||||
@@ -102,4 +111,5 @@ install-udev:
|
||||
ln -sf ../$$i . ) \
|
||||
done
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
@@ -24,6 +24,13 @@ Gentoo doesn't have ifup/ifdown; appropriate alternatives are defined in
|
||||
xen-network-common.sh.
|
||||
|
||||
|
||||
ip
|
||||
--
|
||||
|
||||
Newer ip commands (from iproute2) do not accept the abbreviated syntax "ip r a
|
||||
..." etc. "ip route add ..." must be used instead.
|
||||
|
||||
|
||||
sed
|
||||
---
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ check_sharing()
|
||||
then
|
||||
toskip="^$"
|
||||
else
|
||||
toskip="^[^ ]* [^ ]* [^ ]* ro "
|
||||
toskip="^[^ ]* [^ ]* [^ ]* ro[, ]"
|
||||
fi
|
||||
|
||||
for file in $(cat /proc/mounts | grep -v "$toskip" | cut -f 1 -d ' ')
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# chkconfig: 2345 98 01
|
||||
# description: Starts and stops the Xen control daemon.
|
||||
|
||||
if ! [ -e /proc/xen/privcmd ]; then
|
||||
if ! grep -q "control_d" /proc/xen/capabilities ; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
||||
@@ -29,11 +29,11 @@ case "$command" in
|
||||
online)
|
||||
ifconfig ${vif} ${main_ip} netmask 255.255.255.255 up
|
||||
echo 1 >/proc/sys/net/ipv4/conf/${vif}/proxy_arp
|
||||
ipcmd='a'
|
||||
ipcmd='add'
|
||||
;;
|
||||
offline)
|
||||
ifdown ${vif}
|
||||
ipcmd='d'
|
||||
ipcmd='del'
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -41,7 +41,7 @@ if [ "${ip}" ] ; then
|
||||
# If we've been given a list of IP addresses, then add routes from dom0 to
|
||||
# the guest using those addresses.
|
||||
for addr in ${ip} ; do
|
||||
ip r ${ipcmd} ${addr} dev ${vif} src ${main_ip}
|
||||
ip route ${ipcmd} ${addr} dev ${vif} src ${main_ip}
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
@@ -261,12 +261,6 @@ function vtpm_create_instance () {
|
||||
|
||||
if [ "$REASON" == "create" ]; then
|
||||
vtpm_reset $instance
|
||||
elif [ "$REASON" == "resume" ]; then
|
||||
vtpm_setup $instance
|
||||
else
|
||||
#default case for 'now'
|
||||
#vtpm_reset $instance
|
||||
true
|
||||
fi
|
||||
xenstore_write $XENBUS_PATH/instance $instance
|
||||
}
|
||||
|
||||