summaryrefslogtreecommitdiffstats
path: root/modules.d/80cms
diff options
context:
space:
mode:
Diffstat (limited to 'modules.d/80cms')
-rwxr-xr-xmodules.d/80cms/cmssetup.sh2
-rwxr-xr-xmodules.d/80cms/module-setup.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/modules.d/80cms/cmssetup.sh b/modules.d/80cms/cmssetup.sh
index 5e5b926..8050f2b 100755
--- a/modules.d/80cms/cmssetup.sh
+++ b/modules.d/80cms/cmssetup.sh
@@ -158,7 +158,7 @@ processcmsfile() {
[[ $CMSCONFFILE ]] || CMSCONFFILE=$(getarg "CMSCONFFILE=")
# Parse configuration
-if [ -n "$CMSDASD" -a -n "$CMSCONFFILE" ]; then
+if [ -n "$CMSDASD" ] && [ -n "$CMSCONFFILE" ]; then
if readcmsfile "$CMSDASD" "$CMSCONFFILE"; then
ln -s /run/initramfs/"$CMSCONFFILE" /tmp/"$CMSCONFFILE"
ln -s /run/initramfs/"$CMSCONFFILE" /tmp/cms.conf
diff --git a/modules.d/80cms/module-setup.sh b/modules.d/80cms/module-setup.sh
index 5b33cd1..920f0a0 100755
--- a/modules.d/80cms/module-setup.sh
+++ b/modules.d/80cms/module-setup.sh
@@ -3,7 +3,7 @@
# called by dracut
check() {
arch=${DRACUT_ARCH:-$(uname -m)}
- [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
+ [ "$arch" = "s390" ] || [ "$arch" = "s390x" ] || return 1
require_binaries chzdev lszdev || return 1
return 255
}
@@ -11,7 +11,7 @@ check() {
# called by dracut
depends() {
arch=${DRACUT_ARCH:-$(uname -m)}
- [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1
+ [ "$arch" = "s390" ] || [ "$arch" = "s390x" ] || return 1
echo znet bash
return 0
}