Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(IN TESTING - DO NOT MERGE YET) Prepare 0.5.3 Release #252

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

(IN TESTING - DO NOT MERGE YET) Prepare 0.5.3 Release #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
50ec7ac
Remove LNCM-ONLINE from boot
nolim1t Nov 19, 2019
ddb2255
Update MOTD with onion site
nolim1t Nov 19, 2019
ebb0f70
Work towards https://github.com/lncm/pi-factory/issues/250 (update in…
nolim1t Nov 20, 2019
4713852
Set permissions on make_img.sh as well
nolim1t Nov 20, 2019
01897f5
Merge branch 'test-remove-lncm-online-after-first-stage' into 0.5.3-d…
nolim1t Nov 20, 2019
8d56820
Merge branch 'wpa_supplicant_security' into 0.5.3-devel
nolim1t Nov 20, 2019
66e3adf
Update to latest Alpine
nolim1t Jan 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions etc/init.d/lncm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ start() {

disable_install() {
echo "Deactivate LNCM installation script"
/sbin/rc-update del lncm-online boot || exit
/sbin/rc-update del lncm default || exit
/bin/rm /media/sd/etc/runlevels/default/lncm || exit
}
Expand Down
3 changes: 2 additions & 1 deletion etc/init.d/wpa_supplicant
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ check_config_exists()
if [[ -f /media/mmcblk0p1/wpa_supplicant.conf ]]; then
echo "File exists; copying WPA supplicant file across"
cp /media/mmcblk0p1/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf
chmod 644 /etc/wpa_supplicant/wpa_supplicant.conf
chmod 600 /etc/wpa_supplicant/wpa_supplicant.conf
chown root.root /etc/wpa_supplicant/wpa_supplicant.conf
nolim1t marked this conversation as resolved.
Show resolved Hide resolved
mount -o rw,remount /media/mmcblk0p1
rm /media/mmcblk0p1/wpa_supplicant.conf
mount -o ro,remount /media/mmcblk0p1
Expand Down
2 changes: 1 addition & 1 deletion etc/motd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ MMMMMMMMMMMMMMMMM0, cNMNl.cXMMMMMMMMMM
MMMMMMMMMMMMMMMMMWx. ,oo;.lXMMMMMMMMMMM
MMMMMMMMMMMMMMMMMMNx:,. .dNMMMMMMMMMMMM

For more info, please check out https://lncm.io/ or https://github.com/lncm/pi-factory/releases
For more info, please check out https://lncm.io/ or http://lncm5rjtcacoc6yf.onion/ or https://github.com/lncm/pi-factory/releases
10 changes: 6 additions & 4 deletions make_img.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
# 256MB bootable FAT32L partition with official Alpine linux and lncm-box
# Make sure "parted", "dosfstools" and "zip" are installed

OUTPUT_VERSION=v0.5.2 # For Outputing an image
REL=v3.10 # Which alpine release directory
OUTPUT_VERSION=v0.5.3 # For Outputing an image
REL=v3.11 # Which alpine release directory (Grab from https://www.alpinelinux.org/downloads/)
nolim1t marked this conversation as resolved.
Show resolved Hide resolved


# For fetching Alpine
ARCH=aarch64
ARCH32=armhf
ALP=alpine-rpi-3.10.2-${ARCH}.tar.gz
ALP32=alpine-rpi-3.10.2-${ARCH32}.tar.gz
ALP=alpine-rpi-3.11.3-${ARCH}.tar.gz
ALP32=alpine-rpi-3.11.3-${ARCH32}.tar.gz
IMG=lncm-box-${OUTPUT_VERSION}-${ARCH}.img
IMG32=lncm-box-${OUTPUT_VERSION}-${ARCH32}.img
MNT=/mnt/lncm
Expand Down Expand Up @@ -54,6 +55,7 @@ if [ -f ./wpa_supplicant.automatic.conf ]; then
echo "WPA supplicant automatic file exists, bootstrapping the network configuration"
cp ./etc/wpa_supplicant/wpa_supplicant.conf ./etc/wpa_supplicant/wpa_supplicant.conf.bak
cp ./wpa_supplicant.automatic.conf etc/wpa_supplicant/wpa_supplicant.conf
chmod 600 etc/wpa_supplicant/wpa_supplicant.conf
fi

echo 'Check for authorized_keys.automatic'
Expand Down