gh_mirrors/reinstall
1
0
Fork 0
mirror of https://github.com/bin456789/reinstall.git synced 2025-01-18 20:39:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: 修复了非红帽系统装了 python2 时，生成密码报错

Browse Source 
fixes #178
This commit is contained in:
bin456789 2024-10-18 10:35:05 +08:00
parent bb2c0b94a7
commit 508661d676
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
reinstall.sh
View File

@ -1870,15 +1870,18 @@ save_password() {
# alpine # alpine
if is_have_cmd busybox && busybox mkpasswd --help 2>&1 | grep -wq sha512; then if is_have_cmd busybox && busybox mkpasswd --help 2>&1 | grep -wq sha512; then
crypted=$(printf '%s' "$password" | busybox mkpasswd -m sha512) crypted=$(printf '%s' "$password" | busybox mkpasswd -m sha512)
# centos 7
elif is_have_cmd python2; then
crypted=$(python2 -c "import crypt; print(crypt.crypt('$password', crypt.mksalt(crypt.METHOD_SHA512)))")
# others # others
elif install_pkg openssl && openssl passwd --help 2>&1 | grep -wq '\-6'; then elif install_pkg openssl && openssl passwd --help 2>&1 | grep -wq '\-6'; then
crypted=$(printf '%s' "$password" | openssl passwd -6 -stdin) crypted=$(printf '%s' "$password" | openssl passwd -6 -stdin)
# debian 9 / ubuntu 16 # debian 9 / ubuntu 16
elif is_have_cmd apt-get && install_pkg whois && mkpasswd -m help | grep -wq sha-512; then elif is_have_cmd apt-get && install_pkg whois && mkpasswd -m help | grep -wq sha-512; then
crypted=$(printf '%s' "$password" | mkpasswd -m sha-512 --stdin) crypted=$(printf '%s' "$password" | mkpasswd -m sha-512 --stdin)
# centos 7
# crypt.mksalt 是 python3 的
# 红帽把它 backport 到了 centos7 的 python2 上
# 在其它发行版的 python2 上运行会出错
elif is_have_cmd yum && is_have_cmd python2; then
crypted=$(python2 -c "import crypt, sys; print(crypt.crypt(sys.argv[1], crypt.mksalt(crypt.METHOD_SHA512)))" "$password")
else else
error_and_exit "Could not generate sha512 password." error_and_exit "Could not generate sha512 password."
fi fi