# HG changeset patch
# User Alastair Tse <atse@xxxxxxxxxxxxx>
# Date 1167920758 0
# Node ID b071319927b6d939bc119666f24ed34acd1bd587
# Parent f3c3f9bd798eaf9d72c9ac5799e1f2e52f076e59
Switch hotplug scripts to use /bin/bash rather than /bin/sh.
Hotplug scripts include certain bash-isms that are not supported under
some distros' default shell (eg. Ubuntu 6.10's use of dash)
Signed-off-by: Alastair Tse <atse@xxxxxxxxxxxxx>
---
tools/examples/blktap | 2 +-
tools/examples/block | 2 +-
tools/examples/block-enbd | 2 +-
tools/examples/block-nbd | 2 +-
tools/examples/external-device-migrate | 2 +-
tools/examples/network-bridge | 2 +-
tools/examples/network-nat | 2 +-
tools/examples/network-route | 2 +-
tools/examples/vif-bridge | 2 +-
tools/examples/vif-common.sh | 8 ++++----
tools/examples/vif-nat | 2 +-
tools/examples/vif-route | 2 +-
tools/examples/vtpm | 2 +-
tools/examples/vtpm-delete | 2 +-
tools/examples/xen-backend.agent | 2 +-
tools/examples/xen-hotplug-cleanup | 2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/blktap
--- a/tools/examples/blktap Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/blktap Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright (c) 2005, XenSource Ltd.
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/block
--- a/tools/examples/block Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/block Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
dir=$(dirname "$0")
. "$dir/block-common.sh"
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/block-enbd
--- a/tools/examples/block-enbd Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/block-enbd Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Usage: block-enbd [bind server ctl_port |unbind node]
#
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/block-nbd
--- a/tools/examples/block-nbd Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/block-nbd Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Usage: block-nbd [bind server ctl_port |unbind node]
#
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/external-device-migrate
--- a/tools/examples/external-device-migrate Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/external-device-migrate Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright (c) 2005 IBM Corporation
#
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/network-bridge
--- a/tools/examples/network-bridge Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/network-bridge Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#============================================================================
# Default Xen network start/stop script.
# Xend calls a network script when it starts.
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/network-nat
--- a/tools/examples/network-nat Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/network-nat Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#============================================================================
# Default Xen network start/stop script when using NAT.
# Xend calls a network script when it starts.
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/network-route
--- a/tools/examples/network-route Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/network-route Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#============================================================================
# Default Xen network start/stop script.
# Xend calls a network script when it starts.
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/vif-bridge
--- a/tools/examples/vif-bridge Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/vif-bridge Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#============================================================================
# /etc/xen/vif-bridge
#
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/vif-common.sh
--- a/tools/examples/vif-common.sh Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/vif-common.sh Thu Jan 04 14:25:58 2007 +0000
@@ -64,7 +64,7 @@ fi
fi
-function frob_iptable()
+frob_iptable()
{
if [ "$command" == "online" ]
then
@@ -89,7 +89,7 @@ If you are using iptables, this may affe
# to those coming from the specified networks, though we allow DHCP requests
# as well.
#
-function handle_iptable()
+handle_iptable()
{
# Check for a working iptables installation. Checking for the iptables
# binary is not sufficient, because the user may not have the appropriate
@@ -123,7 +123,7 @@ function handle_iptable()
# Print the IP address currently in use at the given interface, or nothing if
# the interface is not up.
#
-function ip_of()
+ip_of()
{
ip addr show "$1" | awk "/^.*inet.*$1\$/{print \$2}" | sed -n '1 s,/.*,,p'
}
@@ -137,7 +137,7 @@ function ip_of()
# to these scripts, or eth0 by default. This function will call fatal if no
# such interface could be found.
#
-function dom0_ip()
+dom0_ip()
{
local nd=${netdev:-eth0}
local result=$(ip_of "$nd")
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/vif-nat
--- a/tools/examples/vif-nat Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/vif-nat Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#============================================================================
# /etc/xen/vif-nat
#
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/vif-route
--- a/tools/examples/vif-route Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/vif-route Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#============================================================================
# /etc/xen/vif-route
#
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/vtpm
--- a/tools/examples/vtpm Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/vtpm Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
dir=$(dirname "$0")
. "$dir/vtpm-hotplug-common.sh"
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/vtpm-delete
--- a/tools/examples/vtpm-delete Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/vtpm-delete Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This scripts must be called the following way:
# vtpm-delete <domain name>
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/xen-backend.agent
--- a/tools/examples/xen-backend.agent Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/xen-backend.agent Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
PATH=/etc/xen/scripts:$PATH
diff -r f3c3f9bd798e -r b071319927b6 tools/examples/xen-hotplug-cleanup
--- a/tools/examples/xen-hotplug-cleanup Thu Jan 04 13:05:09 2007 +0000
+++ b/tools/examples/xen-hotplug-cleanup Thu Jan 04 14:25:58 2007 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
dir=$(dirname "$0")
. "$dir/xen-hotplug-common.sh"
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home