]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
rootfs-postcommands.bbclass: Only set DROPBEAR_RSAKEY_DIR once
authorMichael Glembotzki <m.glembo@gmail.com>
Mon, 22 Apr 2024 16:39:38 +0000 (18:39 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 23 Apr 2024 12:40:18 +0000 (13:40 +0100)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes-recipe/rootfs-postcommands.bbclass

index e81b69a239b528c6b9bd5f3e50342c003aaca422..920da94ba2c8e4ef1afa011e88f695a9fe9a7457 100644 (file)
@@ -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 "DROPBEAR_RSAKEY_DIR=/var/lib/dropbear" >> ${IMAGE_ROOTFS}/etc/default/dropbear
+                               fi
                        fi
                fi
        fi