* [cip-dev] [isar-cip-core][PATCH v5] initramfs-overlay-hook: Check file system of INITRAMFS_OVERLAY_STORAGE_DEVICE
@ 2024-07-23 12:59 Clara Kowalsky
2024-07-31 17:01 ` Jan Kiszka
0 siblings, 1 reply; 4+ messages in thread
From: Clara Kowalsky @ 2024-07-23 12:59 UTC (permalink / raw)
To: cip-dev; +Cc: quirin.gylstorff, Clara Kowalsky
In case of ext*, this detects and fixes file system errors in the
partition device before doing the partition mount.
If the partition turns out to be broken, the factory state is recovered.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
.../initramfs-overlay-hook/files/overlay.hook | 11 +++++++++--
.../files/overlay.script.tmpl | 11 ++++++++++-
.../files/overlay_recovery_action.script | 14 ++++++++++++++
.../initramfs-overlay-hook_0.1.bb | 8 +++++++-
4 files changed, 40 insertions(+), 4 deletions(-)
create mode 100644 recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
index 8b00ecf..6f634c5 100644
--- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
+++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
@@ -22,6 +22,13 @@ esac
. /usr/share/initramfs-tools/hook-functions
+hook_error() {
+ echo "(ERROR): $1" >&2
+ exit 1
+}
+
manual_add_modules overlay
-copy_exec /usr/bin/mountpoint
-copy_exec /usr/bin/awk
+copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found"
+copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found"
+copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found"
+copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found"
diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
index 42eb59c..c6f69b9 100644
--- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
+++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
@@ -31,12 +31,21 @@ ovl_partition_device="${INITRAMFS_OVERLAY_STORAGE_DEVICE}"
ovl_storage_path="${INITRAMFS_OVERLAY_STORAGE_PATH}"
ovl_lower_dirs="${INITRAMFS_OVERLAY_PATHS}"
ovl_mount_option="${INITRAMFS_OVERLAY_MOUNT_OPTION}"
+ovl_recovery_script="/scripts/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}"
root_mount_storage=${rootmnt}${ovl_storage_path}
storage_mount_point="$(echo "${ovl_storage_path}" | awk -F/ '{print FS$2}' )"
+partition_fstype=$(get_fstype "${ovl_partition_device}")
if ! mountpoint -q "${rootmnt}${storage_mount_point}"; then
- if ! mount -t $(get_fstype ${ovl_partition_device}) \
+ case $partition_fstype in
+ ext*)
+ if ! e2fsck -p -f "$ovl_partition_device" && [ -f "$ovl_recovery_script" ] && [ -x "$ovl_recovery_script" ]; then
+ "$ovl_recovery_script" "$partition_fstype" "$ovl_partition_device"
+ fi
+ ;;
+ esac
+ if ! mount -t ${partition_fstype} \
-o ${ovl_mount_option} \
${ovl_partition_device} \
${rootmnt}${storage_mount_point}; then
diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script b/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
new file mode 100644
index 0000000..d13111d
--- /dev/null
+++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2024
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+
+partition_fstype="$1"
+ovl_partition_device="$2"
+
+mke2fs -t "$partition_fstype" "$ovl_partition_device"
diff --git a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
index 955748f..7097130 100644
--- a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
+++ b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
@@ -12,9 +12,12 @@
inherit dpkg-raw
+INITRAMFS_OVERLAY_RECOVERY_SCRIPT ??= "overlay_recovery_action.script"
+
SRC_URI += " \
file://overlay.hook \
file://overlay.script.tmpl \
+ file://${INITRAMFS_OVERLAY_RECOVERY_SCRIPT} \
"
# The variable INITRAMFS_OVERLAY_PATHS contains the directories which are
@@ -35,7 +38,8 @@ TEMPLATE_FILES = "overlay.script.tmpl"
TEMPLATE_VARS += " INITRAMFS_OVERLAY_STORAGE_PATH \
INITRAMFS_OVERLAY_PATHS \
INITRAMFS_OVERLAY_STORAGE_DEVICE \
- INITRAMFS_OVERLAY_MOUNT_OPTION"
+ INITRAMFS_OVERLAY_MOUNT_OPTION \
+ INITRAMFS_OVERLAY_RECOVERY_SCRIPT"
DEBIAN_DEPENDS = "initramfs-tools, awk, coreutils, util-linux"
@@ -48,4 +52,6 @@ do_install() {
"${D}/usr/share/initramfs-tools/hooks/overlay"
install -m 0755 "${WORKDIR}/overlay.script" \
"${D}/usr/share/initramfs-tools/scripts/local-bottom/overlay"
+ install -m 0755 "${WORKDIR}/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}" \
+ "${D}/usr/share/initramfs-tools/scripts"
}
--
2.45.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [cip-dev] [isar-cip-core][PATCH v5] initramfs-overlay-hook: Check file system of INITRAMFS_OVERLAY_STORAGE_DEVICE
2024-07-23 12:59 [cip-dev] [isar-cip-core][PATCH v5] initramfs-overlay-hook: Check file system of INITRAMFS_OVERLAY_STORAGE_DEVICE Clara Kowalsky
@ 2024-07-31 17:01 ` Jan Kiszka
2024-08-01 7:26 ` Clara Kowalsky
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2024-07-31 17:01 UTC (permalink / raw)
To: Clara Kowalsky, cip-dev; +Cc: quirin.gylstorff
On 23.07.24 14:59, Clara Kowalsky wrote:
> In case of ext*, this detects and fixes file system errors in the
> partition device before doing the partition mount.
> If the partition turns out to be broken, the factory state is recovered.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> .../initramfs-overlay-hook/files/overlay.hook | 11 +++++++++--
> .../files/overlay.script.tmpl | 11 ++++++++++-
> .../files/overlay_recovery_action.script | 14 ++++++++++++++
> .../initramfs-overlay-hook_0.1.bb | 8 +++++++-
> 4 files changed, 40 insertions(+), 4 deletions(-)
> create mode 100644 recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
>
> diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
> index 8b00ecf..6f634c5 100644
> --- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
> @@ -22,6 +22,13 @@ esac
>
> . /usr/share/initramfs-tools/hook-functions
>
> +hook_error() {
> + echo "(ERROR): $1" >&2
> + exit 1
> +}
> +
> manual_add_modules overlay
> -copy_exec /usr/bin/mountpoint
> -copy_exec /usr/bin/awk
> +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found"
> +copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found"
> +copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found"
> +copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found"
Is there no "copy_exec_and_complain+fail_if_missing"? This pattern looks
like it does not scale very well across all our scripts (including isar
upstream).
> diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
> index 42eb59c..c6f69b9 100644
> --- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
> @@ -31,12 +31,21 @@ ovl_partition_device="${INITRAMFS_OVERLAY_STORAGE_DEVICE}"
> ovl_storage_path="${INITRAMFS_OVERLAY_STORAGE_PATH}"
> ovl_lower_dirs="${INITRAMFS_OVERLAY_PATHS}"
> ovl_mount_option="${INITRAMFS_OVERLAY_MOUNT_OPTION}"
> +ovl_recovery_script="/scripts/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}"
>
> root_mount_storage=${rootmnt}${ovl_storage_path}
> storage_mount_point="$(echo "${ovl_storage_path}" | awk -F/ '{print FS$2}' )"
> +partition_fstype=$(get_fstype "${ovl_partition_device}")
>
> if ! mountpoint -q "${rootmnt}${storage_mount_point}"; then
> - if ! mount -t $(get_fstype ${ovl_partition_device}) \
> + case $partition_fstype in
> + ext*)
> + if ! e2fsck -p -f "$ovl_partition_device" && [ -f "$ovl_recovery_script" ] && [ -x "$ovl_recovery_script" ]; then
Why testing both -f and -x?
> + "$ovl_recovery_script" "$partition_fstype" "$ovl_partition_device"
> + fi
> + ;;
> + esac
> + if ! mount -t ${partition_fstype} \
> -o ${ovl_mount_option} \
> ${ovl_partition_device} \
> ${rootmnt}${storage_mount_point}; then
> diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script b/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
> new file mode 100644
> index 0000000..d13111d
> --- /dev/null
> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
> @@ -0,0 +1,14 @@
> +#!/bin/sh
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2024
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +
> +partition_fstype="$1"
> +ovl_partition_device="$2"
> +
> +mke2fs -t "$partition_fstype" "$ovl_partition_device"
> diff --git a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
> index 955748f..7097130 100644
> --- a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
> +++ b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
> @@ -12,9 +12,12 @@
>
> inherit dpkg-raw
>
> +INITRAMFS_OVERLAY_RECOVERY_SCRIPT ??= "overlay_recovery_action.script"
> +
> SRC_URI += " \
> file://overlay.hook \
> file://overlay.script.tmpl \
> + file://${INITRAMFS_OVERLAY_RECOVERY_SCRIPT} \
> "
>
> # The variable INITRAMFS_OVERLAY_PATHS contains the directories which are
> @@ -35,7 +38,8 @@ TEMPLATE_FILES = "overlay.script.tmpl"
> TEMPLATE_VARS += " INITRAMFS_OVERLAY_STORAGE_PATH \
> INITRAMFS_OVERLAY_PATHS \
> INITRAMFS_OVERLAY_STORAGE_DEVICE \
> - INITRAMFS_OVERLAY_MOUNT_OPTION"
> + INITRAMFS_OVERLAY_MOUNT_OPTION \
> + INITRAMFS_OVERLAY_RECOVERY_SCRIPT"
>
> DEBIAN_DEPENDS = "initramfs-tools, awk, coreutils, util-linux"
>
> @@ -48,4 +52,6 @@ do_install() {
> "${D}/usr/share/initramfs-tools/hooks/overlay"
> install -m 0755 "${WORKDIR}/overlay.script" \
> "${D}/usr/share/initramfs-tools/scripts/local-bottom/overlay"
> + install -m 0755 "${WORKDIR}/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}" \
> + "${D}/usr/share/initramfs-tools/scripts"
> }
Looks good otherwise.
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [cip-dev] [isar-cip-core][PATCH v5] initramfs-overlay-hook: Check file system of INITRAMFS_OVERLAY_STORAGE_DEVICE
2024-07-31 17:01 ` Jan Kiszka
@ 2024-08-01 7:26 ` Clara Kowalsky
2024-08-02 11:00 ` Jan Kiszka
0 siblings, 1 reply; 4+ messages in thread
From: Clara Kowalsky @ 2024-08-01 7:26 UTC (permalink / raw)
To: Jan Kiszka, cip-dev; +Cc: quirin.gylstorff
On 31.07.24 19:01, Jan Kiszka wrote:
> On 23.07.24 14:59, Clara Kowalsky wrote:
>> In case of ext*, this detects and fixes file system errors in the
>> partition device before doing the partition mount.
>> If the partition turns out to be broken, the factory state is recovered.
>>
>> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
>> ---
>> .../initramfs-overlay-hook/files/overlay.hook | 11 +++++++++--
>> .../files/overlay.script.tmpl | 11 ++++++++++-
>> .../files/overlay_recovery_action.script | 14 ++++++++++++++
>> .../initramfs-overlay-hook_0.1.bb | 8 +++++++-
>> 4 files changed, 40 insertions(+), 4 deletions(-)
>> create mode 100644 recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
>>
>> diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>> index 8b00ecf..6f634c5 100644
>> --- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>> @@ -22,6 +22,13 @@ esac
>>
>> . /usr/share/initramfs-tools/hook-functions
>>
>> +hook_error() {
>> + echo "(ERROR): $1" >&2
>> + exit 1
>> +}
>> +
>> manual_add_modules overlay
>> -copy_exec /usr/bin/mountpoint
>> -copy_exec /usr/bin/awk
>> +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not found"
>> +copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found"
>> +copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found"
>> +copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found"
>
> Is there no "copy_exec_and_complain+fail_if_missing"? This pattern looks
> like it does not scale very well across all our scripts (including isar
> upstream).
>
I have not found anything like this that covers both in one command.
>> diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>> index 42eb59c..c6f69b9 100644
>> --- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>> @@ -31,12 +31,21 @@ ovl_partition_device="${INITRAMFS_OVERLAY_STORAGE_DEVICE}"
>> ovl_storage_path="${INITRAMFS_OVERLAY_STORAGE_PATH}"
>> ovl_lower_dirs="${INITRAMFS_OVERLAY_PATHS}"
>> ovl_mount_option="${INITRAMFS_OVERLAY_MOUNT_OPTION}"
>> +ovl_recovery_script="/scripts/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}"
>>
>> root_mount_storage=${rootmnt}${ovl_storage_path}
>> storage_mount_point="$(echo "${ovl_storage_path}" | awk -F/ '{print FS$2}' )"
>> +partition_fstype=$(get_fstype "${ovl_partition_device}")
>>
>> if ! mountpoint -q "${rootmnt}${storage_mount_point}"; then
>> - if ! mount -t $(get_fstype ${ovl_partition_device}) \
>> + case $partition_fstype in
>> + ext*)
>> + if ! e2fsck -p -f "$ovl_partition_device" && [ -f "$ovl_recovery_script" ] && [ -x "$ovl_recovery_script" ]; then
>
> Why testing both -f and -x?
I was thinking, what if someone sets INITRAMFS_OVERLAY_RECOVERY_SCRIPT
to an empty string? Then ovl_recovery_script would be a directory and
the next line would give a permission denied.
Clara
>
>> + "$ovl_recovery_script" "$partition_fstype" "$ovl_partition_device"
>> + fi
>> + ;;
>> + esac
>> + if ! mount -t ${partition_fstype} \
>> -o ${ovl_mount_option} \
>> ${ovl_partition_device} \
>> ${rootmnt}${storage_mount_point}; then
>> diff --git a/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script b/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
>> new file mode 100644
>> index 0000000..d13111d
>> --- /dev/null
>> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
>> @@ -0,0 +1,14 @@
>> +#!/bin/sh
>> +#
>> +# CIP Core, generic profile
>> +#
>> +# Copyright (c) Siemens AG, 2024
>> +#
>> +# Authors:
>> +# Clara Kowalsky <clara.kowalsky@siemens.com>
>> +#
>> +
>> +partition_fstype="$1"
>> +ovl_partition_device="$2"
>> +
>> +mke2fs -t "$partition_fstype" "$ovl_partition_device"
>> diff --git a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
>> index 955748f..7097130 100644
>> --- a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
>> +++ b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.1.bb
>> @@ -12,9 +12,12 @@
>>
>> inherit dpkg-raw
>>
>> +INITRAMFS_OVERLAY_RECOVERY_SCRIPT ??= "overlay_recovery_action.script"
>> +
>> SRC_URI += " \
>> file://overlay.hook \
>> file://overlay.script.tmpl \
>> + file://${INITRAMFS_OVERLAY_RECOVERY_SCRIPT} \
>> "
>>
>> # The variable INITRAMFS_OVERLAY_PATHS contains the directories which are
>> @@ -35,7 +38,8 @@ TEMPLATE_FILES = "overlay.script.tmpl"
>> TEMPLATE_VARS += " INITRAMFS_OVERLAY_STORAGE_PATH \
>> INITRAMFS_OVERLAY_PATHS \
>> INITRAMFS_OVERLAY_STORAGE_DEVICE \
>> - INITRAMFS_OVERLAY_MOUNT_OPTION"
>> + INITRAMFS_OVERLAY_MOUNT_OPTION \
>> + INITRAMFS_OVERLAY_RECOVERY_SCRIPT"
>>
>> DEBIAN_DEPENDS = "initramfs-tools, awk, coreutils, util-linux"
>>
>> @@ -48,4 +52,6 @@ do_install() {
>> "${D}/usr/share/initramfs-tools/hooks/overlay"
>> install -m 0755 "${WORKDIR}/overlay.script" \
>> "${D}/usr/share/initramfs-tools/scripts/local-bottom/overlay"
>> + install -m 0755 "${WORKDIR}/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}" \
>> + "${D}/usr/share/initramfs-tools/scripts"
>> }
>
> Looks good otherwise.
>
> Jan
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [cip-dev] [isar-cip-core][PATCH v5] initramfs-overlay-hook: Check file system of INITRAMFS_OVERLAY_STORAGE_DEVICE
2024-08-01 7:26 ` Clara Kowalsky
@ 2024-08-02 11:00 ` Jan Kiszka
0 siblings, 0 replies; 4+ messages in thread
From: Jan Kiszka @ 2024-08-02 11:00 UTC (permalink / raw)
To: Clara Kowalsky, cip-dev; +Cc: quirin.gylstorff
On 01.08.24 09:26, Clara Kowalsky wrote:
>
>
> On 31.07.24 19:01, Jan Kiszka wrote:
>> On 23.07.24 14:59, Clara Kowalsky wrote:
>>> In case of ext*, this detects and fixes file system errors in the
>>> partition device before doing the partition mount.
>>> If the partition turns out to be broken, the factory state is recovered.
>>>
>>> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
>>> ---
>>> .../initramfs-overlay-hook/files/overlay.hook | 11 +++++++++--
>>> .../files/overlay.script.tmpl | 11 ++++++++++-
>>> .../files/overlay_recovery_action.script | 14 ++++++++++++++
>>> .../initramfs-overlay-hook_0.1.bb | 8 +++++++-
>>> 4 files changed, 40 insertions(+), 4 deletions(-)
>>> create mode 100644
>>> recipes-initramfs/initramfs-overlay-hook/files/overlay_recovery_action.script
>>>
>>> diff --git
>>> a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>>> b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>>> index 8b00ecf..6f634c5 100644
>>> --- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>>> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.hook
>>> @@ -22,6 +22,13 @@ esac
>>>
>>> . /usr/share/initramfs-tools/hook-functions
>>>
>>> +hook_error() {
>>> + echo "(ERROR): $1" >&2
>>> + exit 1
>>> +}
>>> +
>>> manual_add_modules overlay
>>> -copy_exec /usr/bin/mountpoint
>>> -copy_exec /usr/bin/awk
>>> +copy_exec /usr/bin/mountpoint || hook_error "/usr/bin/mountpoint not
>>> found"
>>> +copy_exec /usr/bin/awk || hook_error "/usr/bin/awk not found"
>>> +copy_exec /usr/sbin/e2fsck || hook_error "/usr/sbin/e2fsck not found"
>>> +copy_exec /usr/sbin/mke2fs || hook_error "/usr/sbin/mke2fs not found"
>>
>> Is there no "copy_exec_and_complain+fail_if_missing"? This pattern looks
>> like it does not scale very well across all our scripts (including isar
>> upstream).
>>
> I have not found anything like this that covers both in one command.
>
>>> diff --git
>>> a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>>> b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>>> index 42eb59c..c6f69b9 100644
>>> --- a/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>>> +++ b/recipes-initramfs/initramfs-overlay-hook/files/overlay.script.tmpl
>>> @@ -31,12 +31,21 @@
>>> ovl_partition_device="${INITRAMFS_OVERLAY_STORAGE_DEVICE}"
>>> ovl_storage_path="${INITRAMFS_OVERLAY_STORAGE_PATH}"
>>> ovl_lower_dirs="${INITRAMFS_OVERLAY_PATHS}"
>>> ovl_mount_option="${INITRAMFS_OVERLAY_MOUNT_OPTION}"
>>> +ovl_recovery_script="/scripts/${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}"
>>>
>>> root_mount_storage=${rootmnt}${ovl_storage_path}
>>> storage_mount_point="$(echo "${ovl_storage_path}" | awk -F/ '{print
>>> FS$2}' )"
>>> +partition_fstype=$(get_fstype "${ovl_partition_device}")
>>>
>>> if ! mountpoint -q "${rootmnt}${storage_mount_point}"; then
>>> - if ! mount -t $(get_fstype ${ovl_partition_device}) \
>>> + case $partition_fstype in
>>> + ext*)
>>> + if ! e2fsck -p -f "$ovl_partition_device" && [ -f
>>> "$ovl_recovery_script" ] && [ -x "$ovl_recovery_script" ]; then
>>
>> Why testing both -f and -x?
>
> I was thinking, what if someone sets INITRAMFS_OVERLAY_RECOVERY_SCRIPT
> to an empty string? Then ovl_recovery_script would be a directory and
> the next line would give a permission denied.
>
OK - but in that case, "file://${INITRAMFS_OVERLAY_RECOVERY_SCRIPT}"
will make things fail much earlier.
Jan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-02 11:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-23 12:59 [cip-dev] [isar-cip-core][PATCH v5] initramfs-overlay-hook: Check file system of INITRAMFS_OVERLAY_STORAGE_DEVICE Clara Kowalsky
2024-07-31 17:01 ` Jan Kiszka
2024-08-01 7:26 ` Clara Kowalsky
2024-08-02 11:00 ` Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox