From 53fe81e752c59bf526237ea2a1a3e7879d479c9b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 27 Jun 2012 09:32:22 +0200 Subject: modules.d/*/module-setup.sh: combine and specify type for installs To speedup image creation, combine dracut_install calls and specify the exact type. E.g. inst_script instead of the generic inst. --- modules.d/95ssh-client/module-setup.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'modules.d/95ssh-client') diff --git a/modules.d/95ssh-client/module-setup.sh b/modules.d/95ssh-client/module-setup.sh index 8d62b2dd..5a38f8ff 100755 --- a/modules.d/95ssh-client/module-setup.sh +++ b/modules.d/95ssh-client/module-setup.sh @@ -37,14 +37,14 @@ inst_sshenv() # Copy over ssh key and knowhosts if needed [[ $sshkey ]] && { - inst $sshkey - [[ -f /root/.ssh/known_hosts ]] && inst /root/.ssh/known_hosts - [[ -f /etc/ssh/ssh_known_hosts ]] && inst /etc/ssh/ssh_known_hosts + inst_simple $sshkey + [[ -f /root/.ssh/known_hosts ]] && inst_simple /root/.ssh/known_hosts + [[ -f /etc/ssh/ssh_known_hosts ]] && inst_simple /etc/ssh/ssh_known_hosts } # Copy over root and system-wide ssh configs. - [[ -f /root/.ssh/config ]] && inst /root/.ssh/config - [[ -f /etc/ssh/ssh_config ]] && inst /etc/ssh/ssh_config + [[ -f /root/.ssh/config ]] && inst_simple /root/.ssh/config + [[ -f /etc/ssh/ssh_config ]] && inst_simple /etc/ssh/ssh_config return 0 } @@ -55,8 +55,7 @@ install() { return 1 } - inst ssh - inst scp + dracut_install ssh scp inst_sshenv } -- cgit v1.2.3