Skip to content

Commit

Permalink
SW-1005 disable netconnectd debug mode for beamos (#91)
Browse files Browse the repository at this point in the history
* only set debug for netconnectd in a DEV image
* add beamos version to neofetch
* moved and bumped dist version
  • Loading branch information
Josef-MrBeam authored Feb 24, 2022
1 parent d7f014a commit 9abc63d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ jobs:
id: copy
run: |
source repository/src/config
source repository/src/variants/beamos/config
NOW=$(date +"%Y-%m-%d-%H%M")
# When building a variant, it is built in workspace-$VARIANT
if [ -n $VARIANT ]; then
Expand Down
2 changes: 0 additions & 2 deletions src/config
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
export DIST_NAME=OctoPi
export DIST_VERSION=0.18.1
export MODULES="base(raspicam, network, disable-services(dev-libs(octopi)), password-for-sudo)"
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@ device_info() {
fi
}

beamos_version() {
echo "$(cat /etc/beamos_version)"
}

print_info() {
info title
info underline

info "OS" distro
prin "Serial Number" "$(device_info serial)"
prin "Beam OS Identifier" "$(device_info octopi)"
prin "Beam OS version" $(beamos_version)
info "Host" model
info "Local IP" local_ip
info "Packages" packages
Expand Down
3 changes: 1 addition & 2 deletions src/modules/beamos/start_chroot_script
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,8 @@ pushd /home/pi
cp extras/netconnectd.service /etc/systemd/system/
cp extras/eth0 /etc/network/interfaces.d/
popd
echo 'EXTRA_OPTS="--debug"' >> /etc/default/netconnectd
if [ "$BEAMOS_DEV" == "yes" ]; then
echo "nothing to do"
echo 'EXTRA_OPTS="--debug"' >> /etc/default/netconnectd
else
rm -rf $NETCONNECTD_PROJ
fi
Expand Down
1 change: 1 addition & 0 deletions src/variants/beamos/config
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh
# variant mrbeam, flavor default: override hostname & custom config setting
export DIST_NAME=BeamOS
export DIST_VERSION=0.18.2
export BASE_OVERRIDE_HOSTNAME=MrBeam-XXXX
export BASE_IMAGE_ENLARGEROOT=1700

Expand Down

0 comments on commit 9abc63d

Please sign in to comment.