Merge remote-tracking branch 'origin/dev' into dev

pull/355/head
wulabing 2020-01-02 16:08:20 +08:00
commit bce3abda46
1 changed files with 6 additions and 6 deletions

View File

@ -174,23 +174,23 @@ dependency_install(){
fi fi
${INS} -y install rng-tools ${INS} -y install rng-tools
judge "rng-tools 安装" # judge "rng-tools 安装"
${INS} -y install haveged ${INS} -y install haveged
judge "haveged 安装" # judge "haveged 安装"
sed -i -r '/^HRNGDEVICE/d;/#HRNGDEVICE=\/dev\/null/a HRNGDEVICE=/dev/urandom' /etc/default/rng-tools sed -i -r '/^HRNGDEVICE/d;/#HRNGDEVICE=\/dev\/null/a HRNGDEVICE=/dev/urandom' /etc/default/rng-tools
if [[ "${ID}" == "centos" ]];then if [[ "${ID}" == "centos" ]];then
systemctl start rngd && systemctl enable rngd systemctl start rngd && systemctl enable rngd
judge "rng-tools 启动" # judge "rng-tools 启动"
systemctl start haveged && systemctl enable haveged systemctl start haveged && systemctl enable haveged
judge "haveged 启动" # judge "haveged 启动"
else else
systemctl start rng-tools && systemctl enable rng-tools systemctl start rng-tools && systemctl enable rng-tools
judge "rng-tools 启动" # judge "rng-tools 启动"
systemctl start haveged && systemctl enable haveged systemctl start haveged && systemctl enable haveged
judge "haveged 启动" # judge "haveged 启动"
fi fi
} }
basic_optimization(){ basic_optimization(){