From 3a4667a3d09712ab7e523981db16716600905a2e Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 14 Dec 2008 15:37:33 -0600 Subject: [PATCH] Change -f checks to -e for /dev nodes Check that dropbear exists before starting it --- ChangeLog | 4 ++++ netboot/linuxrc.x | 27 +++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad5421b..95d7f05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 14 Dec 2008; Andrew Gaffney netboot/linuxrc.x: + Change -f checks to -e for /dev nodes Check that dropbear exists before + starting it + 14 Dec 2008; Andrew Gaffney gen_compile.sh: Explicitly set UTILS_{CC,LD,AS} if UTILS_CROSS_COMPILE is set diff --git a/netboot/linuxrc.x b/netboot/linuxrc.x index b607fe2..e982202 100644 --- a/netboot/linuxrc.x +++ b/netboot/linuxrc.x @@ -53,12 +53,12 @@ StartUp() { /sbin/mdev -s # have mdev populate /dev #// Create standard (non-mdev) devices - if [ ! -f /dev/md0 ] + if [ ! -e /dev/md0 ] then makedevs /dev/md b 9 0 0 7 fi - if [ ! -f /dev/tty0 ] + if [ ! -e /dev/tty0 ] then makedevs /dev/tty c 4 0 0 12 fi @@ -93,16 +93,19 @@ StartUp() { #// Hostname hostname netboot - #// Setup dropbear (sshd) - echo -e "" - mkdir /etc/dropbear - echo -e ">>> Generating RSA hostkey ..." - dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key - echo -e "" - echo -e ">>> Generating DSS hostkey ..." - dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key - echo -e "" - dropbear + if [ -n "`which dropbear 2>/dev/null`" ] + then + # Setup dropbear (sshd) + echo -e "" + mkdir /etc/dropbear + echo -e ">>> Generating RSA hostkey ..." + dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key + echo -e "" + echo -e ">>> Generating DSS hostkey ..." + dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key + echo -e "" + dropbear + fi #// Misc tasks chmod +x /bin/net-setup -- 2.26.2