From 9a59c0a2d65dde87839e9d184a9e561885b8b743 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 23 Aug 2011 17:10:38 +0200 Subject: Moving removal of openssh-server host keys from chroot_hacks to a hook, that way it can be easily skipped if desired. --- functions/defaults.sh | 2 ++ scripts/build/lb_chroot_hacks | 4 ---- share/hooks/005-remove-openssh-server-host-keys.chroot | 10 ++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100755 share/hooks/005-remove-openssh-server-host-keys.chroot diff --git a/functions/defaults.sh b/functions/defaults.sh index de79d5c75..5538dfbae 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -587,6 +587,7 @@ Set_defaults () LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-file-cache \ update-apt-xapian-index \ update-mlocate-database \ + remove-openssh-server-host-keys \ remove-python-py}" ;; @@ -595,6 +596,7 @@ Set_defaults () update-apt-xapian-index \ update-mlocate-database \ remove-gnome-icon-cache \ + remove-openssh-server-host-keys \ remove-python-py}" ;; esac diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index 57f5769fa..501352f15 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -140,10 +140,6 @@ do esac done -# Removing openssh-server hostkeys, -# they are regenerated by live-config. -rm -f chroot/etc/ssh/ssh_host_*_key chroot/etc/ssh/ssh_host_*_key.pub - # Removing udev mac caching rule rm -f chroot/etc/udev/rules.d/*persistent-net.rules diff --git a/share/hooks/005-remove-openssh-server-host-keys.chroot b/share/hooks/005-remove-openssh-server-host-keys.chroot new file mode 100755 index 000000000..862704981 --- /dev/null +++ b/share/hooks/005-remove-openssh-server-host-keys.chroot @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +# Remove OpenSSH Host Keys. +# +# This removes openssh-server host keys, they are regenerated by live-config +# on system start. + +rm -f /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub -- cgit v1.2.3