From a053becf4a9dc4e9c75002eacb43f59179016cb0 Mon Sep 17 00:00:00 2001 From: bugclerk <40872210+bugclerk@users.noreply.github.com> Date: Wed, 18 Sep 2024 14:11:37 -0700 Subject: [PATCH] Remove hostname and mailname from update file (#719) This has potential to cause user confusion on fresh install as the hostname will be appended as comment to SSH host keys. Removing hostname file causes SSH host keys to have comment of root@localhost. (cherry picked from commit 81d290e6a96930352e8e6b6eb8f0246bc0c432dd) (cherry picked from commit 548cc1afe3837670e7ac715882988435b8ad87dc) Co-authored-by: Andrew Walker --- scale_build/image/mtree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scale_build/image/mtree.py b/scale_build/image/mtree.py index d776624a..9b1c2399 100644 --- a/scale_build/image/mtree.py +++ b/scale_build/image/mtree.py @@ -19,8 +19,10 @@ 'etc/exports', 'etc/ftpusers', 'etc/idmapd.conf', + 'etc/hostname', 'etc/hosts', 'etc/krb5.conf', + 'etc/mailname', 'etc/motd', 'etc/nscd.conf', 'etc/resolv.conf', @@ -66,8 +68,6 @@ def _do_mtree_impl(mtree_file_path, version): '-c', '--format=mtree', '--exclude', './etc/fstab', '--exclude', './etc/group', - '--exclude', './etc/hostname', - '--exclude', './etc/hostname', '--exclude', './etc/machine-id', '--exclude', './etc/nsswitch.conf', '--exclude', './etc/passwd',