mirror of
https://github.com/ovh/debian-cis.git
synced 2024-12-22 14:05:23 +01:00
Fix empty fstab test (#134)
Signed-off-by: Tarik Megzari <tarik.megzari@corp.ovh.com> Co-authored-by: Thibault Dewailly <thibault.dewailly@corp.ovh.com>
This commit is contained in:
parent
c8fcfed248
commit
1341622335
@ -415,9 +415,9 @@ is_kernel_option_enabled() {
|
||||
is_a_partition() {
|
||||
local PARTITION=$1
|
||||
FNRET=128
|
||||
if [ ! -f /etc/fstab ] || [ -n "$(sed '/^#/d' /etc/fstab)" ]; then
|
||||
if [ ! -f /etc/fstab ] || [ -z "$(sed '/^#/d' /etc/fstab)" ]; then
|
||||
debug "/etc/fstab not found or empty, searching mountpoint"
|
||||
if mountpoint "$PARTITION" | grep -qE ".*is a mountpoint.*"; then
|
||||
if mountpoint -q "$PARTITION"; then
|
||||
FNRET=0
|
||||
fi
|
||||
else
|
||||
@ -448,8 +448,8 @@ is_mounted() {
|
||||
has_mount_option() {
|
||||
local PARTITION=$1
|
||||
local OPTION=$2
|
||||
if [ ! -f /etc/fstab ] || [ -n "$(sed '/^#/d' /etc/fstab)" ]; then
|
||||
debug "/etc/fstab not found or empty, readin current mount options"
|
||||
if [ ! -f /etc/fstab ] || [ -z "$(sed '/^#/d' /etc/fstab)" ]; then
|
||||
debug "/etc/fstab not found or empty, reading current mount options"
|
||||
has_mounted_option "$PARTITION" "$OPTION"
|
||||
else
|
||||
if grep "[[:space:]]${PARTITION}[[:space:]]" /etc/fstab | grep -vE "^#" | awk '{print $4}' | grep -q "bind"; then
|
||||
|
@ -2,15 +2,14 @@
|
||||
# run-shellcheck
|
||||
test_audit() {
|
||||
describe Running on blank host
|
||||
register_test retvalshouldbe 1
|
||||
dismiss_count_for_test
|
||||
register_test retvalshouldbe 0
|
||||
# shellcheck disable=2154
|
||||
run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||
|
||||
ln -s /dev/shm /run/shm
|
||||
|
||||
describe Partition symlink
|
||||
register_test retvalshouldbe 1
|
||||
register_test retvalshouldbe 0
|
||||
run resolved /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||
|
||||
# Cleanup
|
||||
|
@ -3,14 +3,13 @@
|
||||
test_audit() {
|
||||
describe Running on blank host
|
||||
register_test retvalshouldbe 0
|
||||
dismiss_count_for_test
|
||||
# shellcheck disable=2154
|
||||
run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||
|
||||
ln -s /dev/shm /run/shm
|
||||
|
||||
describe Partition symlink
|
||||
register_test retvalshouldbe 1
|
||||
register_test retvalshouldbe 0
|
||||
run resolved /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||
|
||||
# Cleanup
|
||||
|
@ -3,14 +3,13 @@
|
||||
test_audit() {
|
||||
describe Running on blank host
|
||||
register_test retvalshouldbe 0
|
||||
dismiss_count_for_test
|
||||
# shellcheck disable=2154
|
||||
run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||
|
||||
ln -s /dev/shm /run/shm
|
||||
|
||||
describe Partition symlink
|
||||
register_test retvalshouldbe 1
|
||||
register_test retvalshouldbe 0
|
||||
run resolved /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
|
||||
|
||||
# Cleanup
|
||||
|
Loading…
Reference in New Issue
Block a user