diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-02-28 21:07:47 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-02-28 21:07:47 +0100 |
| commit | 2270ab615ba4127482061b49acbe42a5cc5abc0b (patch) | |
| tree | 5255917e6e39e33d80e0c41f85f605cfa6f1b64b | |
| parent | 5758b964133cbe33080d1c319238b31a54dc670e (diff) | |
| parent | ad7da3ec893b2201867ffab5f872fda28e34ec87 (diff) | |
| download | util-vserver-netns-2270ab615ba4127482061b49acbe42a5cc5abc0b.tar.gz util-vserver-netns-2270ab615ba4127482061b49acbe42a5cc5abc0b.tar.bz2 util-vserver-netns-2270ab615ba4127482061b49acbe42a5cc5abc0b.zip | |
Merge commit '1.2' into debian
* commit '1.2':
vservers-default: use posix shell syntax
| -rw-r--r-- | vservers-default | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vservers-default b/vservers-default index 51e5ca4..5888844 100644 --- a/vservers-default +++ b/vservers-default @@ -21,7 +21,7 @@ LOCKFILE="$name" # Include default configuration -if [[ -r "/etc/vservers/.defaults/apps/vserver-startup/default" ]]; then +if [ -r "/etc/vservers/.defaults/apps/vserver-startup/default" ]; then . "/etc/vservers/.defaults/apps/vserver-startup/default" fi @@ -33,8 +33,8 @@ else flavor="${name#vserver[-.]}" fi -if [[ "default" != "$flavor" && - -r "/etc/vservers/.defaults/apps/vserver-startup/$flavor" ]]; then +if [ "default" != "$flavor" -a + -r "/etc/vservers/.defaults/apps/vserver-startup/$flavor" ]; then . "/etc/vservers/.defaults/apps/vserver-startup/$flavor" fi |