aboutsummaryrefslogtreecommitdiffstats
path: root/tools/hotplug
Commit message (Collapse)AuthorAgeFilesLines
...
* libxl: rename libxl__yajl_gen_allocOlaf Hering2012-02-291-0/+1
| | | | | | | | | libxl__yajl_gen_alloc() is called by generic code, rename it to libx_yajl_gen_alloc(). Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: remove 4 from default runlevel in xencommonsOlaf Hering2012-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | LSB defines runlevel 4 as "reserved for local use, default is normal/full multiuser" The current behaviour of insserv in openSuSE 11.4 and SLES11SP2 is that xencommons gets a symlink in /etc/init.d/rc4.d/ due to the 4 in the Default-Start: line. As a result insserv will print a warning: insserv: warning: current stop runlevel(s) (2 3 5) of script `xencommons' overwrites defaults (2 3 4 5). Since the local admin is responsible to create all symlinks manually in /etc/init.d/rc4.d/ the xencommons script should not automatically enable itself in runlevel 4. So, remove the 4 from Default-Start: line. Note: This change will not automatically remove old/stale xencommon symlinks in /etc/init.d/rc4.d/ during a package upgrade. Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* xl: use json output by defaultIan Campbell2012-02-071-8/+13
| | | | | | | | | | | | | | | | | | | | | Move the sxp producing code off into a separate file. It is supported for legacy reasons and needn't be updated other than the improve compatibility with xm. libxl_domain_config is not currently generated by the IDL (adding the necessary support for Array types is on my to do list) so hand code the json generation function for now. Since this rather directly exposes a libxl data structure it's not clear what sort of forward compatibility guarantees we can make. However it seems like it should be as stable as libxl's own API (which we are looking to stabilise) (Gratuitous string.h include needed for memset in libxl_util.h) Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <Ian.Jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: xencommons init script: Fix setting XENSTORED_ROOTDIRJim Fehlig2012-01-261-1/+1
| | | | | | | | | Due to a logic bug, XENSTORED_ROOTDIR was not being set to default value when zero length. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* hotplug: remove debug messages from NetBSD hotplug scriptsRoger Pau Monne2011-12-153-9/+0
| | | | | | | | | | Remove unecessary debug messages from NetBSD hotplug scripts, left error messages only. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Ian Jackson <ian.jackson.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Linux/xencommons: Use oxenstored by default when availableIan Campbell2011-12-162-2/+16
| | | | | | | | | | | | | | | | oxenstored is an ocaml implementation of the xenstore daemon. It is faster, more scalable and more reliable than the C xenstored. In particular the transaction model in oxenstored does not involve taking a complete copy of the database and aborting on any (even non-conflicting) other change. There is a paper on the design and implementation of oxenstored at http://gazagnaire.org/pub/GH09.pdf which includes a performance evaluation and comparison with the C daemon etc. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: init.d/Linux/xencommons: load evtchn and gntdev modulesOlaf Hering2011-12-011-0/+5
| | | | | | | | | | There is currently no code in the kernel to trigger autoload of the evtchn or gntdev drivers. Load them manually during xencommons start. Handle both pvops and xenlinux module names. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: init.d/Linux/xencommons: run script only when neededOlaf Hering2011-12-011-2/+11
| | | | | | | | | | | | | Currently xencommons prints an error that /proc/xen/capabilities does not exist when started on a non-xen kernel. Update the xencommons script to run only when needed: - do not run if /proc/xen does not exist - check if /proc/xen/capabilities exists before doing the grep for dom0 Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* xend NetBSD init script: fixed problem when restarting xendRoger Pau Monne2011-07-181-2/+5
| | | | | | | | When restarting xend, the rc.d script was unable to find the pid of the running xend, so no process was restarted. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: xencommons NetBSD init script: Multiple bugfixes and improvementsRoger Pau Monne2011-07-151-12/+33
| | | | | | | | | | | | | Added a cleanup of the xenstore database, to purge old entries, prevented the restart of xenstore and set Domain-0 name. Also replaced the sleep 5 (wait for xenstore to come up) with the method used in the linux init script. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Christoph Egger <Christoph.Egger@amd.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: fix shared loop device detection in block hotplug scriptZhigang Wang2011-07-081-1/+1
| | | | | | | | | | | | We need to cope with 0 or more '0' prefixed to '$dev': # stat -c '%D' "/system.img" 13 # losetup -a /dev/loop0: [0013]:12062248 (/system.img) Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: Improved LSB headers in init.d scriptsFabio Fantoni2011-07-083-10/+10
| | | | | | | xendomains service now working also without xend service Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* make xendomains service save/migrate vms under /etc/xen/auto onlyZhigang Wang2011-06-211-2/+2
| | | | | | | | | | | | | | | Currently, xendomains service will save or migrate all the running domains in the host on stop. Change XENDOMAINS_AUTO_ONLY=true. Then on service stop, it will only save or migrate all VMs under XENDOMAINS_AUTO (/etc/xen/auto), but always shutdown all the running VMs. It's a way to cleanly shutdown all the running VMs on system reboot. If you want to save/migrate a VM, create a link to /etc/xen/auto. Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: Fix hotplug hook script arrangements not to always failIan Jackson2011-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | The new feature introduced in 23401:a44b12ee2fd3 was broken; it in general always fails, at least if there are no hotplug scripts. If there are no hooks, call_hooks ends up running this: [ -x ".....*.hook" ] && . "..... *.hook" This does not directly trigger set -e and sigerr. However, it is the last command exected in call_hooks. So the return status of call_hooks is an error, and thus a sigerr happens when call_hooks returns. The bug affects xl and xm. However xl does not detect failure of the hotplug script. Change the script to use if...then rather than &&, as the latter has very confusing and undesirable semantics. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: start all xen daemons in runlevel 2Fabio Fantoni2011-05-263-6/+6
| | | | | | | Signed-off-by: Fabio Fantoni <fabio.fantoni@heliman.it> Acked-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: support vif-post.d hook arrangementsW. Michael Petullo2011-05-255-0/+35
| | | | | | | | New feature: you can drop hook scripts into /etc/xen/scripts/vif-post.d/*.hook Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* hotplug: fix busy loop device detectionOlaf Hering2011-05-201-2/+2
| | | | | | | | | | | | | | | | | | | Improve busy loop device detection after changeset 22773:02c0af2bf280 The intention is not to find the file to be mounted in the losetup -a output. What matters are existing mounted files with the same dev:inode as the new file. So the fix is to apply variable expansion which happens only without double quotes. Otherwise $dev will contain newlines for hardlinked files, as mentioned in the commit message from the changeset above. losetup -a does also truncate long filenames to 62 chars due to ioctl limitations. This part is fixed with 2.6.37 where the filename can be obtained from sysfs. As a result very long filenames will be missed. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* build: Make XEN_ROOT an absolute path.Keir Fraser2011-03-174-4/+4
| | | | | | | | Otherwise make can search the path relative to certain standard paths such as /usr/include (e.g., the line '-include $(XEN_ROOT)/.config' in Config.mk suffers from this). Signed-off-by: Keir Fraser <keir@xen.org>
* tools/hotplug/Linux: Use correct device name for vifs in setup scriptsIan Jackson2011-02-113-28/+28
| | | | | | | | | | | | | | In vif-common.sh, set the shell variable "dev" to the new interface name when interfaces are renamed, and consistently use this variable in all the vif scripts. This fixes hotplug of renamed interfaces. From: Stefano Stabellini <stefano.stabellini@eu.citrix.com> From: Patrick Scharrenberg <pittipatti@web.de> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Patrick Scharrenberg <pittipatti@web.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: set mtu from bridge also on vif interfaceOlaf Hering2011-02-071-0/+5
| | | | | | | | | | | | Apply mtu size from bridge interface also in vif interface. This depends on a kernel change which allows arbitrary mtu sizes until the frontend driver has connected to the backend driver. Without this kernel change, the vif mtu size will be limited to 1500 even with this change to the vif-bridge script. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <Ian.Campbell@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: Fix proxy arp messing about to use correct deviceMichael Young2011-02-011-1/+1
| | | | | | | | | | | | | | | | | Fix an anomaly in /etc/xen/scripts/network-route. Currently this script contains netdev=${netdev:-eth${vifnum}} ie. netdev is set to eth${vifnum} by default. Unfortunately vifnum is not set anywhere in the xen code so the default is actually the broken "eth". And anyway the vif number (which is what vifnum ought to be) is not relevant. The patch changes the default to eth0 (which is what the comment at the top of the file says it should be). Signed-off-by: Michael Young <m.a.young@durham.ac.uk> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* libxl: rename xenstored pid file on LinuxChristoph Egger2011-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | Changset 22806:eefb8e971be5 broke 'xl'. After starting the xenstored, xenconsoled, xenbackendd and running xl create I get this: libxl: error: libxl.c:53:libxl_ctx_init Is xenstore daemon running? failed to stat /var/run/xenstore.pid: No such file or directory cannot init xl context The reason for the failure is that the NetBSD startup script creates the file /var/run/xenstored.pid but libxl checks for /var/run/xenstore.pid Attached patch makes this consistent across Linux and NetBSD by changing the Linux name (to the more-conventional food.pid form). Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: fix completely wrong attempts to stop xenwatchdogduser virtual2011-01-251-4/+5
| | | | | | | | | | | "xen-watchdog stop" attempts to kill non existing "watchdogd" but misses the running "xenwatchdogd". This also provokes errors during install and Debian package management. Signed-off-by: user virtual <virtualusr@gmail.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: allow hardlinked files for block device imagesOlaf Hering2011-01-171-2/+2
| | | | | | | | | | | | | | | | | | | tools/hotplug/Linux/block change for this losetup -a output: (inode 12 is listed twice due to hardlinks) /dev/loop0: [0809]:139267 (/abuild/vdisk-sles11_2-disk0) /dev/loop1: [0809]:139266 (/abuild/vdisk-sles11_1-disk1) /dev/loop3: [0809]:139267 (/abuild/vdisk-sles11_2-disk0) /dev/loop5: [0809]:139273 (/abuild/vdisk-sles11_5-disk1) /dev/loop8: [0809]:12 (/abuild/bootiso-xenpaging-sles11_5.iso) /dev/loop10: [0809]:12 (/abuild/bootiso-xenpaging-sles11_4.iso) /dev/loop11: [0809]:139271 (/abuild/vdisk-sles11_4-disk0) Without this change, $dev would contain /dev/loop8\n/dev/loop10 Applies to 4.0 and 4.1 Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
* tools/hotplug/Linux: start xen daemons in runlevel 2.Ian Campbell2011-01-171-2/+2
| | | | | | | | | | | | | This is the default runlevel on a Debian system. In addition update-rc.d complains: update-rc.d: warning: xencommons stop runlevel arguments (0 1 6) do not match LSB Default-Stop values (1) and it seems reasonable to stop the daemons during shutdown or reboot so make that change as well. Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
* tools/hotplug/NetBSD: update netbsd scripts (interface names)Christoph Egger2011-01-172-2/+2
| | | | | | | | | | | | | | sysctl fail due to the '.' in the interface name: Jan 10 00:02:26 paris /netbsd: xvif108.0: could not attach sysctl nodes Jan 10 00:02:57 paris /netbsd: sysctl_createv: sysctl_create(xvif108.0) returned 22 The kernel driver have recently been fixed and attached patch updates to the hotplug scripts accordingly. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: only apply dummy MAC address to virtual devices.Ian Campbell2011-01-044-10/+20
| | | | | | | | | | | Avoid applying to the bridge and physical network device. This should un-break dom0 networking in the old xend-creates-bridge setup (problem introduced in 22493:937488219719). Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: read /etc/default/xencommons if appropriateIan Jackson2010-12-221-1/+7
| | | | | | | | | | | | | | | | Since 22187:c41252a55a0a we have been installing our example xencommons settings file in either /etc/sysconfig or /etc/default, depending on whether /etc/sysconfig exists. However I omitted to add the code to /etc/init.d/xencommons to actually read either version of the file, although every other init script seems to have it. An effect of this misplaced/unread file is that the automatic tests don't cause xenconsoled to collect serial logs, because the tester edits whichever file actually exists. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: Avoid dependency on iptables conntrack module.Keir Fraser2010-12-171-4/+4
| | | | | | | | | | | Checking for RELATED,ESTABLISHED traffic being sent to a domU requires connection tracking, which adds unexpected (to most users) load to dom0. Heavily loaded systems can fill the conntrack tables. So avoid this, be more liberal in what we accept, and leave it to domU to police its own input. Signed-off-by: Keir Fraser <keir@xen.org>
* tools/hotplug: Do not recursively invoke xenstore_write on errorIan Campbell2010-12-161-5/+13
| | | | | | | This fixes a possible infinite recursion. From: Ian Campbell <Ian.Campbell@citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: force release lock if holder process is gone (fix)Kouya Shimura2010-12-151-1/+1
| | | | | | | | | 22508:57907b28e51a was unsafe for mutual exclusion. There is a case that the owner file doesn't exist yet when an atomic mkdir operation fails. Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* blktap2: fix up non-ASCII characters in 21129:bf74d9c31674Ian Jackson2010-12-151-6/+6
| | | | | | | 21129:bf74d9c31674 contained UTF-8-encoded nonbreaking spaces. Sorry for not noticing this. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: Do not mind if "ip link set" fails on vif backendsIan Jackson2010-12-141-1/+1
| | | | | | | | | | | | | | | | | Most versions of netback do not support setting the MAC address. This means that c/s 937488219719 causes the hotplug script to break for vifs, even as it fixes the bridge-wrong-MAC-address problem for tap devices (used for emulated nics). The mac-setting operation is not necessary for vifs since they are hardcoded to fe:ff* anyway. As a band-aid, add "|| true" to the call to ip link, so that this error does not cause the hotplug operation to fail. There will still be an error message printed until we can fix this better. Suggested-by: Ian Campbell <Ian.Campbell@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: forced to release lock if holder process is goneKouya Shimura2010-12-141-0/+6
| | | | | | | | | When a script using locking.sh is stopped by ctrl-C, the lock file remains. We have to wait 100 seconds for releasing the lock at the next time. Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Fix /vm/uuid xenstore leak on tapdisk2 device cleanupChunyan Liu2010-12-131-4/+6
| | | | | | | | | | | While doing block-detach blktap2 disk, tap2 device info is not cleared from xenstore /vm/uuid/xxx. The reason is in xen-hotplug-cleanup script: when $vm_dev does not exist, $(xenstore-read "$vm_dev" 2>/dev/null) is also "", won't enter the block. So, change to use cmd return value to check existence. Signed-off-by Chunyan Liu <cyliu@novell.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> committer: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
* tools/hotplug/Linux: Ensure tap devices receive a dummy MAC address.Ian Campbell2010-12-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a tap device is not given an explicit MAC address it will generate one randomly. The behaviour of the Linux bridge is to pickup the lowest MAC address of any port for use in for ARP, STP etc. If the tap device's randomly generated MAC address happens to be the lowest then this can cause all manner of strange networking glitches in both domain 0 and guests when the bridge suddenly takes over from the previously used MAC address. We choose FE:FF:FF:FF:FF:FF as it the numerically largest non-broadcast address. This ensures that the physical NIC device's port will have the lowest MAC address and therefore be the one picked up by the bridge. vif devices already have a MAC address of FE:FF:FF:FF:FF:FF set by netback already but there is no harm in forcing it a second time in the hotplug script. tap devices are added by the "add" event and therefore we should call setup_bridge_port then as well as for "online" which is caused by vif devices. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug/Linux: supply --physdev-is-bridged in iptables runesSander Eikelenboom2010-11-101-2/+2
| | | | | | | | | | | | With newer (pvops) kernels logs get flooded with this iptables warning: physdev match: using --physdev-out in the OUTPUT, FORWARD and POSTROUTING chains for non-bridged traffic is not supported anymore Using the --physdev-is-bridged option prevents this. See also: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571634#10 Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: Linux udev rules adjustmentJan Beulich2010-09-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While earlier this year some work was done to eliminate libxc's creation of nodes under /dev (as in some cases it actually got things wrong), I just found that tapdisk2 does exactly the same. While I'm not currently aiming at removing this code, I want to at least suggest some adjustments to the provided rules file. First of all, the present rule KERNEL=="blktap[0-9]*", NAME="xen/%k" matches both blktap1's devices and blktap2's ring devices, resulting in whoever comes last replacing what was there before (e.g. a tap2:aio: attach will replace bltap1's /dev/blktap0 [i.e. the main control device] with the ring device of the new virtual disk). Therefore we should add a subsystem qualifier there. Second, at some udev versions default to using 0660 as the permissions on nodes it creates. The kernel (with devtmpfs) defaults to 0600, and hence I'd suggest to also make this explicit in the rules. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Boris Derzhavets <bderzhavets@yahoo.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools, build system: Make changing distro-specific layout aspects easier2010-09-204-11/+45
| | | | | | | | | | | Introduce CONFIG_LEAF_DIR, SUBSYS_DIR, INITD_DIR variables to cope better with variation between distributions. See docs/misc/distro_mapping.txt for details. Signed-off-by: Bruce Edge <bruce.edge@gmail.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: 21549:8bcaec29574e breaks vif-script with arguments.Brendan Cully2010-08-181-1/+1
| | | | | | | | | | For example, (vif-script 'vif-bridge bridge=eth1') in xend-config.sxp will cause vif-setup to attempt to execute 'vif-bridge bridge=eth1' due to a quoting mismatch. The fix appears to be to remove the extra quotes around "$script" in vif-setup. Signed-off-by: Brendan Cully <brendan@cs.ubc.ca> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug, Use udev rules instead of qemu script to setup the bridge.Anthony Perard2010-08-093-28/+67
| | | | | | | | | | | | | | | | | From: Anthony PERARD <anthony.perard@citrix.com> This patch adds a second argument to vif-bridge script. It can be "vif" or "tap". "vif" give the default behavior and "tap" just add the interface to the found bridge when the action is "add". Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- tools/hotplug/Linux/vif-bridge | 20 ++++++--- tools/hotplug/Linux/vif-common.sh | 70 ++++++++++++++++++++++++--------- tools/hotplug/Linux/xen-backend.rules | 5 +- tools/libxl/libxl.c | 6 +- 4 files changed, 70 insertions(+), 31 deletions(-)
* # HG changeset patchOlaf Hering2010-07-261-1/+1
| | | | | | | | | | | | | | # User Olaf Hering <olaf@aepfle.de> # Date 1280140115 -3600 # Node ID 8c3e1e8ddd599371d882b17996be88b545119ccb # Parent 2092c06f9467747da608c448ddd01e2f1f82290a tools/hotplug: init.d should test for /proc/xen/capabilities being a file Correct test for /proc/xen/capabilities It is a file, not a directory. Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug etc.: remove Default-Enabled from LSB headerIan Jackson2010-07-263-3/+0
| | | | | | | | | | | | | "Default-Enabled:" is not a LSB keyword. Remove it from the LSB section. This avoids an openSuSE buildcheck warning and we are not aware of any reason why it should be kept. From: Olaf Hering <olaf@aepfle.de> Signed-off-by: Olaf Hering <olaf@aepfle.de> Modified-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: add LSB header to xen-watchdog runlevel scriptOlaf Hering2010-07-261-0/+11
| | | | | Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: Install udev rules into rules.dOlaf Hering2010-07-231-2/+1
| | | | | | | | Install rules straight into /etc/udev/rules.d udev version 029 since mid 2004 uses this directory already. Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: correct xend initscript dependency in LSB partOlaf Hering2010-07-231-2/+2
| | | | | | | | Add missing dependencies to runlevel script xend requires at least xenstored Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools and Makefiles: introduce and use new SYSCONFIG_DIR variableOlaf Hering2010-07-231-3/+3
| | | | | | | | | | | | On SuSE the configuration files in /etc/sysconfig/ will be updated in a smart way from templates found in /var/adm/fillup-templates/ Introduce new variable SYSCONFIG_DIR for Linux installations. Now only one place needs patching, or it can be specified as option to make(1). Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools/hotplug: xencommons: xenconsoled tracingIan Jackson2010-07-091-1/+1
| | | | | | | cut and paste error lead to using the xenstored command line syntax for xenconsoled. Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
* tools/hotplug: locking.sh script: fix lock directory remains on error bugIan Jackson2010-07-061-1/+7
| | | | | | | | _release_lock should be used instead of release_lock. sigerr is introduced so that it can be redefined by xen-hotplug-common.sh to a version which writes error status to xenstore. Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
* tools: init.d/xencommons: Wait for xenstored to start before setting dom0 nameIan Jackson2010-06-291-1/+19
| | | | | | | | | On one of my boxes, the xenstore-write setting dom0's name starts before xenstored is actually ready to handle the connection properly, resulting in the name set failing. Wait for xenstored to be up and responding to reads before continuing, timing out after 30 seconds. Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>