diff --git a/.gitignore b/.gitignore index 8fe9fcf..2fc4603 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /root_overlay/root/key /root_overlay/bin/test.py /root_overlay/bin/poll_desfire +/root_overlay/etc/wpa_supplicant +/root_overlay/root/.ssh/authorized_keys diff --git a/Makefile b/Makefile index 88acb35..85017d1 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,13 @@ sdcard.img: buildroot/.config root_overlay: root_overlay/bin/test.py root_overlay: root_overlay/etc/door_tokens root_overlay: root_overlay/etc/dropbear/dropbear_ecdsa_host_key +root_overlay: root_overlay/etc/wpa_supplicant/wpa_supplicant.conf root_overlay: root_overlay/root/.ssh/authorized_keys root_overlay: root_overlay/root/key root_overlay/root/.ssh/authorized_keys: ~/.ssh/id_rsa.pub - cp ^< $@ + mkdir -p `dirname $@` + cp $< $@ buildroot/.config: config ln -sf ../config $@ @@ -35,6 +37,11 @@ root_overlay/etc/dropbear/dropbear_ecdsa_host_key: mkdir -p `dirname $@` ssh-keygen -t ecdsa -f $@ +root_overlay/etc/wpa_supplicant/wpa_supplicant.conf: + mkdir -p `dirname $@` + @echo "Please enter the passphrase for the space wifi:" + wpa_passphrase Space > $@ + clean: make -C buildroot clean rm -f sdcard.img diff --git a/config b/config index ec5d11a..ecbb1eb 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Buildroot 2021.02-rc2-dirty Configuration +# Buildroot 2021.02-rc2 Configuration # BR2_HAVE_DOT_CONFIG=y BR2_EXTERNAL_DOOR_PI_PATH="/home/apo/Projects/Hackerspace/DoorPi/br_external" @@ -445,9 +445,9 @@ BR2_ROOTFS_SKELETON_DEFAULT=y # BR2_ROOTFS_SKELETON_CUSTOM is not set BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" -BR2_TARGET_GENERIC_PASSWD_SHA256=y -# BR2_TARGET_GENERIC_PASSWD_SHA512 is not set -BR2_TARGET_GENERIC_PASSWD_METHOD="sha-256" +# BR2_TARGET_GENERIC_PASSWD_SHA256 is not set +BR2_TARGET_GENERIC_PASSWD_SHA512=y +BR2_TARGET_GENERIC_PASSWD_METHOD="sha-512" BR2_INIT_BUSYBOX=y # BR2_INIT_SYSV is not set # BR2_INIT_OPENRC is not set @@ -463,8 +463,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt" # BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES is not set # BR2_ROOTFS_MERGED_USR is not set -BR2_TARGET_ENABLE_ROOT_LOGIN=y -BR2_TARGET_GENERIC_ROOT_PASSWD="hello" +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set BR2_SYSTEM_BIN_SH_BUSYBOX=y # BR2_SYSTEM_BIN_SH_BASH is not set # BR2_SYSTEM_BIN_SH_DASH is not set diff --git a/root_overlay/root/.ssh/authorized_keys b/root_overlay/root/.ssh/authorized_keys deleted file mode 100644 index 34a6e24..0000000 --- a/root_overlay/root/.ssh/authorized_keys +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5pAEc3dFnR7zDtdIaH3ICBQincnxs7HlIi+JEfl3M23S/wkQASE9hDpNwAF/CRu9u2cjnXgHNqVG0TkKyjWgfXk9tTpyVBNw8QkHQ75TpbKsuhWQm/LgYb874j4+2pDGxLLdVVuY1c73vNQqkHL0xS3aG/dtvCc7XMNg5VRWdwL3WPhkmuBQK7JYUkUnf+dZWS91oJWZHd/OEU/H9p147UGw3ffLQ9H+IKxl3pvEMKz8Aeca1sDtSS0Z2LXzh3au5KynMR6KHBX9QUM3Bkoy20QqnNZz/sQX04NrOigoPDOFRlOaeIXeZvecZRP7LnTy7JviWFylMwziwzEJslDLN apo@mae