diff mbox series

[master,scarthgap,poky] rootfs-postcommands.bbclass: Only set DROPBEAR_RSAKEY_DIR once

Message ID CAKDoKkPr57uXMpmDVZba_WCgH47hbRxU0HmOp6B27xQ2wh-MrQ@mail.gmail.com
State New
Headers show
Series [master,scarthgap,poky] rootfs-postcommands.bbclass: Only set DROPBEAR_RSAKEY_DIR once | expand

Commit Message

Michael Glembotzki April 22, 2024, 2:46 p.m. UTC 
If DROPBEAR_RSAKEY_DIR has already been set before, e.g. by overwriting
the file dropbear.default, the line will still be appended a second time.

DROPBEAR_RSAKEY_DIR="/path/to/dropbear"
DROPBEAR_EXTRA_ARGS="-B"
DROPBEAR_RSAKEY_DIR=/var/lib/dropbear

Signed-off-by: Michael Glembotzki <Michael.Glembotzki@iris-sensing.com>
---
 meta/classes-recipe/rootfs-postcommands.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

"DROPBEAR_RSAKEY_DIR=/var/lib/dropbear"
>> ${IMAGE_ROOTFS}/etc/default/dropbear
+                               fi
                        fi
                fi
        fi

Comments

patchtest@automation.yoctoproject.org April 22, 2024, 3:05 p.m. UTC | #1 
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/master-scarthgap-poky-rootfs-postcommands.bbclass-Only-set-DROPBEAR_RSAKEY_DIR-once.patch

FAIL: test mbox format: Series has malformed diff lines. Create the series again using git-format-patch and ensure it applies using git am (test_mbox.TestMbox.test_mbox_format)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: Python-unidiff parse error (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: Patch cannot be merged (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: Parse error Hunk diff line expected: ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key
SKIP: test Signed-off-by presence: Parse error Hunk diff line expected: ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key
SKIP: test Upstream-Status presence: Parse error Hunk diff line expected: ${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: Python-unidiff parse error (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
diff mbox series

Patch

diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass
b/meta/classes-recipe/rootfs-postcommands.bbclass
index e81b69a239..920da94ba2 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -206,7 +206,9 @@  read_only_rootfs_hook () {
                # Also tweak the key location for dropbear in the same way.
                if [ -d ${IMAGE_ROOTFS}/etc/dropbear ]; then
                        if [ ! -e
${IMAGE_ROOTFS}/etc/dropbear/dropbear_rsa_host_key
]; then
-                               echo "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear"
>> ${IMAGE_ROOTFS}/etc/default/dropbear
+                               if ! grep -q "^DROPBEAR_RSAKEY_DIR="
${IMAGE_ROOTFS}/etc/default/dropbear ; then
+                                       echo