From 525d560d69e32fd4bda92788e253aaeaa683ecfc Mon Sep 17 00:00:00 2001 From: Brandon Ros Date: Thu, 17 Dec 2020 00:09:49 -0500 Subject: [PATCH 1/2] refactor --- .gitignore | 2 + ovl/etc/.default_boot_services | 0 ovl/etc/local.d/headless.start | 43 ++++++++++++++++++++++ ovl/etc/network/interfaces | 12 ------ ovl/etc/resolv.conf | 2 - ovl/etc/runlevels/default/headless | 1 - ovl/etc/runlevels/default/local | 1 + ovl/etc/wpa_supplicant/wpa_supplicant.conf | 4 -- ovl/usr/local/bin/headless.sh | 20 ---------- ovl/usr/local/etc/init.d/headless | 10 ----- 10 files changed, 46 insertions(+), 49 deletions(-) create mode 100644 .gitignore create mode 100644 ovl/etc/.default_boot_services create mode 100755 ovl/etc/local.d/headless.start delete mode 100644 ovl/etc/network/interfaces delete mode 100644 ovl/etc/resolv.conf delete mode 120000 ovl/etc/runlevels/default/headless create mode 120000 ovl/etc/runlevels/default/local delete mode 100644 ovl/etc/wpa_supplicant/wpa_supplicant.conf delete mode 100755 ovl/usr/local/bin/headless.sh delete mode 100755 ovl/usr/local/etc/init.d/headless diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ca0973 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.DS_Store + diff --git a/ovl/etc/.default_boot_services b/ovl/etc/.default_boot_services new file mode 100644 index 0000000..e69de29 diff --git a/ovl/etc/local.d/headless.start b/ovl/etc/local.d/headless.start new file mode 100755 index 0000000..7908a69 --- /dev/null +++ b/ovl/etc/local.d/headless.start @@ -0,0 +1,43 @@ +#!/bin/sh + +__create_eni() +{ + cat <<-EOF > /etc/network/interfaces + auto lo + iface lo inet loopback + + auto wlan0 + iface wlan0 inet dhcp + hostname pi + EOF +} + +__create_eww() +{ + cat <<-EOF > /etc/wpa_supplicant/wpa_supplicant.conf + network={ + ssid="ssid" + psk="password" + } + EOF +} + +__edit_ess() +{ + cat <<-EOF >> /etc/ssh/sshd_config + PermitEmptyPasswords yes + PermitRootLogin yes + EOF +} + +apk add wpa_supplicant +__create_eww +__create_eni +rc-service wpa_supplicant start +rc-service networking start + +/sbin/setup-sshd -c openssh +cp /etc/ssh/sshd_config /etc/ssh/sshd_config.orig +__edit_ess +rc-service sshd restart +mv /etc/ssh/sshd_config.orig /etc/ssh/sshd_config diff --git a/ovl/etc/network/interfaces b/ovl/etc/network/interfaces deleted file mode 100644 index 9ed80ba..0000000 --- a/ovl/etc/network/interfaces +++ /dev/null @@ -1,12 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0 -#iface eth0 inet dhcp -iface eth0 inet static - address 192.168.1.20 - netmask 255.255.255.0 - gateway 192.168.1.1 - -auto wlan0 -iface wlan0 inet dhcp \ No newline at end of file diff --git a/ovl/etc/resolv.conf b/ovl/etc/resolv.conf deleted file mode 100644 index 88019bf..0000000 --- a/ovl/etc/resolv.conf +++ /dev/null @@ -1,2 +0,0 @@ -nameserver 1.1.1.1 -nameserver 1.0.0.1 \ No newline at end of file diff --git a/ovl/etc/runlevels/default/headless b/ovl/etc/runlevels/default/headless deleted file mode 120000 index 54e4239..0000000 --- a/ovl/etc/runlevels/default/headless +++ /dev/null @@ -1 +0,0 @@ -../../../usr/local/etc/init.d/headless \ No newline at end of file diff --git a/ovl/etc/runlevels/default/local b/ovl/etc/runlevels/default/local new file mode 120000 index 0000000..ddda14b --- /dev/null +++ b/ovl/etc/runlevels/default/local @@ -0,0 +1 @@ +/etc/init.d/local \ No newline at end of file diff --git a/ovl/etc/wpa_supplicant/wpa_supplicant.conf b/ovl/etc/wpa_supplicant/wpa_supplicant.conf deleted file mode 100644 index eb1a594..0000000 --- a/ovl/etc/wpa_supplicant/wpa_supplicant.conf +++ /dev/null @@ -1,4 +0,0 @@ -network={ - ssid="change_me" - psk="change_me" -} \ No newline at end of file diff --git a/ovl/usr/local/bin/headless.sh b/ovl/usr/local/bin/headless.sh deleted file mode 100755 index 32dfbfc..0000000 --- a/ovl/usr/local/bin/headless.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# Setup networking -apk add wpa_supplicant -service wpa_supplicant start -service networking start -rm /var/run/ifstate - -# Setup SSH -/sbin/setup-sshd -c openssh -cp /etc/ssh/sshd_config /etc/ssh/sshd_config.orig -cat <> /etc/ssh/sshd_config -PermitEmptyPasswords yes -PermitRootLogin yes -EOF -service sshd restart -mv /etc/ssh/sshd_config.orig /etc/ssh/sshd_config - -# Simulate a daemon -sleep infinity diff --git a/ovl/usr/local/etc/init.d/headless b/ovl/usr/local/etc/init.d/headless deleted file mode 100755 index 10aa712..0000000 --- a/ovl/usr/local/etc/init.d/headless +++ /dev/null @@ -1,10 +0,0 @@ -#!/sbin/openrc-run - -name="headless" -command="/usr/local/bin/headless.sh" -command_background=true -pidfile="/run/${RC_SVCNAME}.pid" - -stop_post() { - rm /etc/runlevels/default/headless -} \ No newline at end of file From 80f938c718ca974dff7b41182b5f2671245b8f19 Mon Sep 17 00:00:00 2001 From: Brandon Ros Date: Thu, 17 Dec 2020 00:54:21 -0500 Subject: [PATCH 2/2] identation --- ovl/etc/local.d/headless.start | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ovl/etc/local.d/headless.start b/ovl/etc/local.d/headless.start index 7908a69..3e6c5f5 100755 --- a/ovl/etc/local.d/headless.start +++ b/ovl/etc/local.d/headless.start @@ -8,7 +8,7 @@ __create_eni() auto wlan0 iface wlan0 inet dhcp - hostname pi + hostname pi EOF } @@ -16,8 +16,8 @@ __create_eww() { cat <<-EOF > /etc/wpa_supplicant/wpa_supplicant.conf network={ - ssid="ssid" - psk="password" + ssid="ssid" + psk="password" } EOF } @@ -40,4 +40,4 @@ rc-service networking start cp /etc/ssh/sshd_config /etc/ssh/sshd_config.orig __edit_ess rc-service sshd restart -mv /etc/ssh/sshd_config.orig /etc/ssh/sshd_config +mv /etc/ssh/sshd_config.orig /etc/ssh/sshd_config \ No newline at end of file