dropbear_install: clean up installation, work with musl

This commit is contained in:
Andrew J. Hesford 2023-09-08 22:27:52 -04:00
parent 620e6d9197
commit 2670f819f2

View file

@ -72,32 +72,34 @@ build ()
# #
# Are we even needed? # Are we even needed?
if [ ! -r "/etc/dropbear/root_key" -o ! -s "/etc/dropbear/root_key" ]; then if [ ! -r "/etc/dropbear/root_key" ] || [ ! -s "/etc/dropbear/root_key" ]; then
echo "There is no root key in /etc/dropbear/root_key existent; exit" echo "There is no root key in /etc/dropbear/root_key; abort"
return 0 return 0
fi fi
# if TMPDIR is set leave it alone otherwise set # Make sure TMPDIR is defined and exists
[ -z "$TMPDIR" ] && TMPDIR='/tmp/dropbear_initrd_encrypt' [ -n "$TMPDIR" ] || TMPDIR='/tmp/dropbear_initrd_encrypt'
mkdir -p "$TMPDIR"
# check if TMPDIR exsists if not make it # Make sure /etc/dropbear exists
[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR" mkdir -p /etc/dropbear
[ -d /etc/dropbear ] && mkdir -p /etc/dropbear
use_dropbear_keys || copy_openssh_keys || generate_keys use_dropbear_keys || copy_openssh_keys || generate_keys
display_fingerprints display_fingerprints
add_checked_modules "/drivers/net/" add_checked_modules "/drivers/net/"
add_binary "rm" add_binary "rm"
add_binary "killall"
add_binary "dropbear" add_binary "dropbear"
add_dir "/root/.ssh" add_dir "/root/.ssh"
cat /etc/dropbear/root_key > "${BUILDROOT}"/root/.ssh/authorized_keys cat /etc/dropbear/root_key > "${BUILDROOT}"/root/.ssh/authorized_keys
add_full_dir "/etc/dropbear" add_full_dir "/etc/dropbear"
add_file "/lib/libnss_files.so.2"
for f in /lib/libnss_files.so.*; do
[ -f "$f" ] && add_file "$f"
done
add_dir "/var/run" add_dir "/var/run"
add_dir "/var/log" add_dir "/var/log"