Merge branch 'github-pull-51'

For different implementations of fsck for different filesystems, it may
be necessary to pass non-standard options. Or even rewrite all options
passed to fsck.

* github-pull-51:
  feature/fsck: Add fsck arguments support

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

features/fsck/README.md

@@ -7,3 +7,7 @@ appear that cannot be fixed, a shell will be opened for repair.
 ## Boot parameters
 
 - `no-fsck`, `fastboot` disables fsck execution.
+
+## Parameters
+
+- **FSCK_ARGS** -- Specifies fsck arguments. By default `-p`.

features/fsck/config.mk

@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 FSCK_DATADIR ?= $(FEATURESDIR)/fsck/data
 FSCK_FILES ?=
+FSCK_ARGS ?=

features/fsck/data/lib/uevent/handlers/040-mountdev

@@ -5,7 +5,6 @@
 . shell-locks
 . shell-source
 
-FSCK_ARGS="-p"
 source_if_exists /etc/sysconfig/fsck
 
 . /etc/init.d/functions
@@ -30,7 +29,7 @@ handler()
 
 	rootdelay_pause
 
-	action "Checking filesystem [$MOUNTDEV]:" fsck -t noloop,noswap -T "$MOUNTDEV" -- $FSCK_ARGS ||
+	action "Checking filesystem [$MOUNTDEV]:" fsck -t noloop,noswap -T "$MOUNTDEV" -- ${FSCK_ARGS-} ||
 		rc=$?
 
 	if [ "$rc" = 0 ] || [ "$rc" = 1 ]; then

features/fsck/rules.mk

@@ -5,11 +5,17 @@ $(call assign-shell-once,FSCK_RUNTIME_FILES,$(FEATURESDIR)/fsck/bin/find-files)
 PUT_FEATURE_DIRS  += $(FSCK_DATADIR)
 PUT_FEATURE_FILES += $(FSCK_FILES) $(FSCK_RUNTIME_FILES)
 
+ifeq ($(FSCK_ARGS),)
+FSCK_ARGS = -p
+
 VENDOR =
 ifneq ($(wildcard /etc/os-release),)
 VENDOR := $(shell sed -n -e 's/^ID=//p' /etc/os-release)
 endif
 
 ifeq ($(VENDOR),altlinux)
-$(call set-sysconfig,fsck,FSCK_ARGS,-p -y)
+FSCK_ARGS += -y
+endif
 endif
+
+$(call set-sysconfig,fsck,FSCK_ARGS,$(FSCK_ARGS))