diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-03 09:51:18 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-03 09:51:18 +0000 |
| commit | 0905327a930b29a78c96b376af5c0ca53dffe30c (patch) | |
| tree | ee746e34144326c64d167db9c58b1eb381da03e6 | |
| parent | 5f5bf4e5600299ccc3042e0d19fb263ea24bbd1f (diff) | |
| download | definitions-0905327a930b29a78c96b376af5c0ca53dffe30c.tar.gz | |
HACK: don't use -x
there's a bug with baserock's grep that means we can't use -x
without -x this validation won't work correctly, so busybox needs
to be fixed in baserock and then this patch needs to be reverted
| -rw-r--r-- | openstack.configure | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openstack.configure b/openstack.configure index 49e8cbd8..a8ae5554 100644 --- a/openstack.configure +++ b/openstack.configure @@ -28,11 +28,13 @@ set -u octet='\(\(2[0-5]\?[0-5]\?\)\|\(1[0-9]\?[0-9]\?\)\|\([0-9]\)\)' valid_ip() { - echo -n "$1" | grep -xq $octet.$octet.$octet.$octet + #echo -n "$1" | grep -xq $octet.$octet.$octet.$octet + echo -n "$1" | grep -q $octet.$octet.$octet.$octet } valid_hostname() { - echo -n "$1" | grep -xq '[a-zA-Z0-9.-]\+' + #echo -n "$1" | grep -xq '[a-zA-Z0-9.-]\+' + echo -n "$1" | grep -q '[a-zA-Z0-9.-]\+' } append_host() { |