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-04 15:36:11 +0000 |
| commit | a408bd6c36462e2bf37e442763d71d036aeeb39f (patch) | |
| tree | 2189eb4527abfe3d7a61463d23febc944f4f7c35 /openstack.configure | |
| parent | 0938fd0d7699526909b2b1316be34ec34a402e1e (diff) | |
| download | definitions-a408bd6c36462e2bf37e442763d71d036aeeb39f.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
Diffstat (limited to 'openstack.configure')
| -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() { |