Skip to content

cleanup: remove orphan OpenSSH overlay artifacts#279

Merged
F5OEO merged 1 commit intoF5OEO:futurefrom
gretel:pr/cleanup-ssh-overlay
Apr 20, 2026
Merged

cleanup: remove orphan OpenSSH overlay artifacts#279
F5OEO merged 1 commit intoF5OEO:futurefrom
gretel:pr/cleanup-ssh-overlay

Conversation

@gretel
Copy link
Copy Markdown

@gretel gretel commented Apr 9, 2026

Source-tree leftovers from the OpenSSH period missed by the earlier defconfig cleanup. Shipped to every Tezuka board via overlay_base/ but referenced by nothing on the target (no sshd, no openssh package).

  • Delete board/tezuka/common/overlay_base/etc/ssh/sshd_config (562 bytes, referenced by no init script)
  • Delete board/tezuka/common/overlay_base/etc/init.d/S55hostkeys (backs up non-existent ssh_host_* to /mnt/jffs2)
  • Trim S21misc: drop the "restore OpenSSH host keys from jffs2" block; the separate authorized_keys restore block is preserved and re-commented for Dropbear (/root/.ssh is Dropbear's default pubkey path)

Matrix CI: 12/12 boards build green. Hardware-validated on FISH Ball Rev.A (/etc/ssh/ gone, S55hostkeys gone from /etc/init.d/, Dropbear continues to work).

@gretel gretel marked this pull request as ready for review April 9, 2026 15:38
@gretel gretel force-pushed the pr/cleanup-ssh-overlay branch 2 times, most recently from db81ec2 to 24d62a3 Compare April 16, 2026 02:11
Three source-tree leftovers from the OpenSSH-then-Dropbear churn of March
2026 (gretel PR F5OEO#260 / revert a1e0ad3) that were missed by the earlier
defconfig cleanup in 58fe62f:

1. board/tezuka/common/overlay_base/etc/ssh/sshd_config
   562-byte OpenSSH server config file referenced by nothing on the
   target: no sshd, no openssh-server package, no init script starts it.
   Shipped into /etc/ssh/sshd_config on every boot via the common
   overlay hierarchy, regardless of which defconfig is building, on all
   12 Tezuka boards.

2. board/tezuka/common/overlay_base/etc/init.d/S55hostkeys
   Init script that copies /etc/ssh/ssh_host_* to /mnt/jffs2/etc/ssh/
   for persistence across reboots. No-op without OpenSSH (which
   generates those keys).  Dropbear manages its own host keys under
   /etc/dropbear/ via the `-R` flag passed by S50dropbear.

3. The "Restore OpenSSH host keys from jffs2" block inside S21misc
   (six lines, with a misleading comment). Removed.  The separate
   authorized_keys restore block in the same script is preserved and
   re-commented to clarify it is Dropbear's default pubkey location
   (/root/.ssh/authorized_keys), not OpenSSH-specific.

Net effect on the target rootfs: /etc/ssh/sshd_config no longer ships,
S55hostkeys is gone from /etc/init.d/, and S21misc no longer probes for
non-existent ssh_host_* files.  Dropbear's own host-key lifecycle is
untouched.  User authorized_keys persistence via jffs2 also untouched.

Orphan host-key files left behind in /mnt/jffs2/etc/ssh/ on previously-
deployed targets remain on disk until manually deleted — harmless but
noise.  A follow-up field note may be appropriate for operators who
want to tidy up.

Signed-off-by: Tom Hensel <[email protected]>
@gretel gretel force-pushed the pr/cleanup-ssh-overlay branch from 24d62a3 to 76d3144 Compare April 16, 2026 21:39
@F5OEO F5OEO merged commit 8d4cd39 into F5OEO:future Apr 20, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants