From 76dd12c9a5f20db18ce3f7dce47f9178ba9d8a33 Mon Sep 17 00:00:00 2001 From: Mate Lakat Date: Tue, 28 Oct 2014 14:56:49 +0100 Subject: [PATCH] XenServer: Fix initramfs scripts During bashate -ing some files with .sh extension has been modified, which are interpreted with /bin/sh, which takes a different syntax. Fixing the issue: - rename the files, so they are not picked up - use syntax that's understood by sh Change-Id: I617b24813df86687ca33745d0c940b0c659f2e14 --- nodepool/scripts/convert_node_to_xenserver.sh | 4 ++-- ...lper_initramfs_hook.sh => xenserver_helper_initramfs_hook} | 2 +- ...tramfs_premount.sh => xenserver_helper_initramfs_premount} | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) rename nodepool/scripts/{xenserver_helper_initramfs_hook.sh => xenserver_helper_initramfs_hook} (95%) rename nodepool/scripts/{xenserver_helper_initramfs_premount.sh => xenserver_helper_initramfs_premount} (97%) diff --git a/nodepool/scripts/convert_node_to_xenserver.sh b/nodepool/scripts/convert_node_to_xenserver.sh index 6ea16b1128..4b367b19bd 100755 --- a/nodepool/scripts/convert_node_to_xenserver.sh +++ b/nodepool/scripts/convert_node_to_xenserver.sh @@ -163,11 +163,11 @@ function get_state { } function create_resizing_initramfs_config { - cp "$THIS_DIR/xenserver_helper_initramfs_hook.sh" \ + cp "$THIS_DIR/xenserver_helper_initramfs_hook" \ /usr/share/initramfs-tools/hooks/resize chmod +x /usr/share/initramfs-tools/hooks/resize - cp "$THIS_DIR/xenserver_helper_initramfs_premount.sh" \ + cp "$THIS_DIR/xenserver_helper_initramfs_premount" \ /usr/share/initramfs-tools/scripts/local-premount/resize chmod +x /usr/share/initramfs-tools/scripts/local-premount/resize } diff --git a/nodepool/scripts/xenserver_helper_initramfs_hook.sh b/nodepool/scripts/xenserver_helper_initramfs_hook similarity index 95% rename from nodepool/scripts/xenserver_helper_initramfs_hook.sh rename to nodepool/scripts/xenserver_helper_initramfs_hook index 6ce9d4477a..328b197cdf 100644 --- a/nodepool/scripts/xenserver_helper_initramfs_hook.sh +++ b/nodepool/scripts/xenserver_helper_initramfs_hook @@ -4,7 +4,7 @@ set -e PREREQ="" -function prereqs { +prereqs () { echo "${PREREQ}" } diff --git a/nodepool/scripts/xenserver_helper_initramfs_premount.sh b/nodepool/scripts/xenserver_helper_initramfs_premount similarity index 97% rename from nodepool/scripts/xenserver_helper_initramfs_premount.sh rename to nodepool/scripts/xenserver_helper_initramfs_premount index e17f37d436..3f7dc9b874 100644 --- a/nodepool/scripts/xenserver_helper_initramfs_premount.sh +++ b/nodepool/scripts/xenserver_helper_initramfs_premount @@ -5,7 +5,8 @@ set -ex PREREQ="" # Output pre-requisites -function prereqs { +prereqs() +{ echo "$PREREQ" }