rootfs/config: Simplify config files

Remove redundant `|| true` and use single equals in string test for consistency. Signed-off-by: James O. D. Hunt <[email protected]>
kata-containers · Nov 29, 2018 · 751f395 · 751f395
1 parent c8950d4
commit 751f395
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/rootfs-builder/alpine/config.sh b/rootfs-builder/alpine/config.sh
@@ -23,4 +23,4 @@ INIT_PROCESS=kata-agent
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=()
 
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp"
diff --git a/rootfs-builder/centos/config.sh b/rootfs-builder/centos/config.sh
@@ -27,12 +27,12 @@ PACKAGES="iptables"
 #Optional packages:
 # systemd: An init system that will start kata-agent if kata-agent
 #          itself is not configured as init process.
-[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
+[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd"
 
 # Init process must be one of {systemd,kata-agent}
 INIT_PROCESS=systemd
 # List of zero or more architectures to exclude from build,
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=()
 
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp"
diff --git a/rootfs-builder/clearlinux/config.sh b/rootfs-builder/clearlinux/config.sh
@@ -20,12 +20,12 @@ PACKAGES="iptables-bin libudev0-shim"
 #Optional packages:
 # systemd: An init system that will start kata-agent if kata-agent
 #          itself is not configured as init process.
-[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
+[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd"
 
 # Init process must be one of {systemd,kata-agent}
 INIT_PROCESS=systemd
 # List of zero or more architectures to exclude from build,
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=(ppc64le)
 
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp"
diff --git a/rootfs-builder/euleros/config.sh b/rootfs-builder/euleros/config.sh
@@ -15,7 +15,7 @@ PACKAGES="iptables"
 #Optional packages:
 # systemd: An init system that will start kata-agent if kata-agent
 #          itself is not configured as init process.
-[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
+[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd"
 
 # Init process must be one of {systemd,kata-agent}
 INIT_PROCESS=systemd
@@ -26,4 +26,4 @@ ARCH_EXCLUDE_LIST=()
 # For more info see: https://github.com/kata-containers/osbuilder/issues/190
 BUILD_CAN_FAIL=1
 
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp"
diff --git a/rootfs-builder/fedora/config.sh b/rootfs-builder/fedora/config.sh
@@ -14,10 +14,10 @@ PACKAGES="iptables"
 #Optional packages:
 # systemd: An init system that will start kata-agent if kata-agent
 #          itself is not configured as init process.
-[ "$AGENT_INIT" == "no" ] && PACKAGES+=" systemd" || true
+[ "$AGENT_INIT" = "no" ] && PACKAGES+=" systemd"
 
 # Init process must be one of {systemd,kata-agent}
 INIT_PROCESS=systemd
 ARCH_EXCLUDE_LIST=()
 
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp" || true
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp"
diff --git a/rootfs-builder/ubuntu/config.sh b/rootfs-builder/ubuntu/config.sh
@@ -30,4 +30,4 @@ INIT_PROCESS=systemd
 # as reported by  `uname -m`
 ARCH_EXCLUDE_LIST=()
 
-[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp2" || true
+[ "$SECCOMP" = "yes" ] && PACKAGES+=" libseccomp2"