diff options
8 files changed, 56 insertions, 26 deletions
diff --git a/stretch-arm64-alip/customization/includes.chroot/etc/rc.local b/stretch-arm64-alip/customization/includes.chroot/etc/rc.local index 1f1d743..4e613ff 100755 --- a/stretch-arm64-alip/customization/includes.chroot/etc/rc.local +++ b/stretch-arm64-alip/customization/includes.chroot/etc/rc.local @@ -11,10 +11,13 @@ # # By default this script does nothing. -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server -# workaround for https://bugs.debian.org/850614 -test -f /etc/ssh/ssh_host_dsa_key || ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa +# Generate the SSH keys if non-existent +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-arm64-blend/customization/includes.chroot/etc/rc.local b/stretch-arm64-blend/customization/includes.chroot/etc/rc.local index bedc8cf..4e613ff 100755 --- a/stretch-arm64-blend/customization/includes.chroot/etc/rc.local +++ b/stretch-arm64-blend/customization/includes.chroot/etc/rc.local @@ -11,7 +11,13 @@ # # By default this script does nothing. + # Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-arm64-developer/customization/includes.chroot/etc/rc.local b/stretch-arm64-developer/customization/includes.chroot/etc/rc.local index 1f1d743..4e613ff 100755 --- a/stretch-arm64-developer/customization/includes.chroot/etc/rc.local +++ b/stretch-arm64-developer/customization/includes.chroot/etc/rc.local @@ -11,10 +11,13 @@ # # By default this script does nothing. -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server -# workaround for https://bugs.debian.org/850614 -test -f /etc/ssh/ssh_host_dsa_key || ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa +# Generate the SSH keys if non-existent +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-arm64-installer/customization/includes.chroot/etc/rc.local b/stretch-arm64-installer/customization/includes.chroot/etc/rc.local index 1f1d743..4e613ff 100755 --- a/stretch-arm64-installer/customization/includes.chroot/etc/rc.local +++ b/stretch-arm64-installer/customization/includes.chroot/etc/rc.local @@ -11,10 +11,13 @@ # # By default this script does nothing. -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server -# workaround for https://bugs.debian.org/850614 -test -f /etc/ssh/ssh_host_dsa_key || ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa +# Generate the SSH keys if non-existent +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-armhf-alip/customization/includes.chroot/etc/rc.local b/stretch-armhf-alip/customization/includes.chroot/etc/rc.local index 1f1d743..4e613ff 100755 --- a/stretch-armhf-alip/customization/includes.chroot/etc/rc.local +++ b/stretch-armhf-alip/customization/includes.chroot/etc/rc.local @@ -11,10 +11,13 @@ # # By default this script does nothing. -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server -# workaround for https://bugs.debian.org/850614 -test -f /etc/ssh/ssh_host_dsa_key || ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa +# Generate the SSH keys if non-existent +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-armhf-blend/customization/includes.chroot/etc/rc.local b/stretch-armhf-blend/customization/includes.chroot/etc/rc.local index bedc8cf..4e613ff 100755 --- a/stretch-armhf-blend/customization/includes.chroot/etc/rc.local +++ b/stretch-armhf-blend/customization/includes.chroot/etc/rc.local @@ -11,7 +11,13 @@ # # By default this script does nothing. + # Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-armhf-developer/customization/includes.chroot/etc/rc.local b/stretch-armhf-developer/customization/includes.chroot/etc/rc.local index 1f1d743..4e613ff 100755 --- a/stretch-armhf-developer/customization/includes.chroot/etc/rc.local +++ b/stretch-armhf-developer/customization/includes.chroot/etc/rc.local @@ -11,10 +11,13 @@ # # By default this script does nothing. -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server -# workaround for https://bugs.debian.org/850614 -test -f /etc/ssh/ssh_host_dsa_key || ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa +# Generate the SSH keys if non-existent +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 diff --git a/stretch-armhf-installer/customization/includes.chroot/etc/rc.local b/stretch-armhf-installer/customization/includes.chroot/etc/rc.local index 1f1d743..4e613ff 100755 --- a/stretch-armhf-installer/customization/includes.chroot/etc/rc.local +++ b/stretch-armhf-installer/customization/includes.chroot/etc/rc.local @@ -11,10 +11,13 @@ # # By default this script does nothing. -# Generate the SSH keys if non-existent -test -f /etc/ssh/ssh_host_rsa_key || dpkg-reconfigure openssh-server -# workaround for https://bugs.debian.org/850614 -test -f /etc/ssh/ssh_host_dsa_key || ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa +# Generate the SSH keys if non-existent +if [ ! -f /etc/ssh/ssh_host_rsa_key ] +then + # else ssh service start in dpkg-reconfigure will fail + systemctl stop ssh.socket||true + dpkg-reconfigure openssh-server +fi exit 0 |