From f00f574cb704aad10f8a35dcc31dc979bdf33115 Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 09:41:05 -0600 Subject: [PATCH 1/7] toltec-base: disable busybox-ifplugd@usb1.service --- package/toltec-base/package | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index b333afb84..65dbc0066 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -31,18 +31,21 @@ configure() { /opt/etc/profile echo "Disabling automatic update" disable-unit update-engine.service - if [[ "$arch" == "rm1" ]] && ! is-masked sys-subsystem-net-devices-usb1.device; then + if [[ "$arch" == "rm1" ]]; then echo "Disabling usb1 network device to avoid long boots" - systemctl mask sys-subsystem-net-devices-usb1.device - elif [[ "$arch" == "rm2" ]] && is-masked sys-subsystem-net-devices-usb1.device; then + ! is-masked sys-subsystem-net-devices-usb1.device && systemctl mask sys-subsystem-net-devices-usb1.device + ! is-masked busybox-ifplugd@usb1.service && systemctl mask busybox-ifplugd@usb1.service + elif [[ "$arch" == "rm2" ]]; then echo "Enabling usb1 network device to ensure usb SSH works" - systemctl unmask sys-subsystem-net-devices-usb1.device + is-masked sys-subsystem-net-devices-usb1.device && systemctl unmask sys-subsystem-net-devices-usb1.device + is-masked busybox-ifplugd@usb1.service && systemctl unmask busybox-ifplugd@usb1.service fi } postremove() { if is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device + systemctl unmask busybox-ifplugd@usb1.service fi if ! is-enabled "update-engine.service"; then systemctl enable update-engine From 4a5cb6fc2961a6e72380eb2cea94e0096cbbca65 Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 13:28:09 -0600 Subject: [PATCH 2/7] add missing systemctl calls in if-statements --- package/toltec-base/package | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index 65dbc0066..943e2ec70 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -33,21 +33,21 @@ configure() { disable-unit update-engine.service if [[ "$arch" == "rm1" ]]; then echo "Disabling usb1 network device to avoid long boots" - ! is-masked sys-subsystem-net-devices-usb1.device && systemctl mask sys-subsystem-net-devices-usb1.device - ! is-masked busybox-ifplugd@usb1.service && systemctl mask busybox-ifplugd@usb1.service + ! systemctl is-masked sys-subsystem-net-devices-usb1.device && systemctl mask sys-subsystem-net-devices-usb1.device + ! systemctl is-masked busybox-ifplugd@usb1.service && systemctl mask busybox-ifplugd@usb1.service elif [[ "$arch" == "rm2" ]]; then echo "Enabling usb1 network device to ensure usb SSH works" - is-masked sys-subsystem-net-devices-usb1.device && systemctl unmask sys-subsystem-net-devices-usb1.device - is-masked busybox-ifplugd@usb1.service && systemctl unmask busybox-ifplugd@usb1.service + systemctl is-masked sys-subsystem-net-devices-usb1.device && systemctl unmask sys-subsystem-net-devices-usb1.device + systemctl is-masked busybox-ifplugd@usb1.service && systemctl unmask busybox-ifplugd@usb1.service fi } postremove() { - if is-masked sys-subsystem-net-devices-usb1.device; then + if systemctl is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device systemctl unmask busybox-ifplugd@usb1.service fi - if ! is-enabled "update-engine.service"; then + if ! systemctl is-enabled update-engine.service; then systemctl enable update-engine fi } From b382bfc2470a11224920d88bedaf0da850066310 Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 16:56:01 -0600 Subject: [PATCH 3/7] Revert "add missing systemctl calls in if-statements" --- package/toltec-base/package | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index 943e2ec70..65dbc0066 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -33,21 +33,21 @@ configure() { disable-unit update-engine.service if [[ "$arch" == "rm1" ]]; then echo "Disabling usb1 network device to avoid long boots" - ! systemctl is-masked sys-subsystem-net-devices-usb1.device && systemctl mask sys-subsystem-net-devices-usb1.device - ! systemctl is-masked busybox-ifplugd@usb1.service && systemctl mask busybox-ifplugd@usb1.service + ! is-masked sys-subsystem-net-devices-usb1.device && systemctl mask sys-subsystem-net-devices-usb1.device + ! is-masked busybox-ifplugd@usb1.service && systemctl mask busybox-ifplugd@usb1.service elif [[ "$arch" == "rm2" ]]; then echo "Enabling usb1 network device to ensure usb SSH works" - systemctl is-masked sys-subsystem-net-devices-usb1.device && systemctl unmask sys-subsystem-net-devices-usb1.device - systemctl is-masked busybox-ifplugd@usb1.service && systemctl unmask busybox-ifplugd@usb1.service + is-masked sys-subsystem-net-devices-usb1.device && systemctl unmask sys-subsystem-net-devices-usb1.device + is-masked busybox-ifplugd@usb1.service && systemctl unmask busybox-ifplugd@usb1.service fi } postremove() { - if systemctl is-masked sys-subsystem-net-devices-usb1.device; then + if is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device systemctl unmask busybox-ifplugd@usb1.service fi - if ! systemctl is-enabled update-engine.service; then + if ! is-enabled "update-engine.service"; then systemctl enable update-engine fi } From 4be6f7f796e8faea2b93298cb70f107af6e81891 Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 16:59:25 -0600 Subject: [PATCH 4/7] update version and timestamp --- package/toltec-base/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index 65dbc0066..dc34ab8b4 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -1,13 +1,13 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT archs=(rm1 rm2) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.2-3 -timestamp=2023-05-08T19:31Z +pkgver=1.3-1 +timestamp=2023-12-27T08:30Z section="utils" maintainer="Eeems " license=MIT From 4ed07a33eca7f85b6964d1da1fac7e371ce1ef9a Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 17:09:25 -0600 Subject: [PATCH 5/7] review: fix if-statements --- package/toltec-base/package | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index dc34ab8b4..753c64a66 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -33,18 +33,28 @@ configure() { disable-unit update-engine.service if [[ "$arch" == "rm1" ]]; then echo "Disabling usb1 network device to avoid long boots" - ! is-masked sys-subsystem-net-devices-usb1.device && systemctl mask sys-subsystem-net-devices-usb1.device - ! is-masked busybox-ifplugd@usb1.service && systemctl mask busybox-ifplugd@usb1.service + if ! is-masked sys-subsystem-net-devices-usb1.device; then + systemctl mask sys-subsystem-net-devices-usb1.device + fi + if ! is-masked busybox-ifplugd@usb1.service; then + systemctl mask busybox-ifplugd@usb1.service + fi elif [[ "$arch" == "rm2" ]]; then echo "Enabling usb1 network device to ensure usb SSH works" - is-masked sys-subsystem-net-devices-usb1.device && systemctl unmask sys-subsystem-net-devices-usb1.device - is-masked busybox-ifplugd@usb1.service && systemctl unmask busybox-ifplugd@usb1.service + if is-masked sys-subsystem-net-devices-usb1.device; then + systemctl unmask sys-subsystem-net-devices-usb1.device + fi + if is-masked busybox-ifplugd@usb1.service; then + systemctl unmask busybox-ifplugd@usb1.service + fi fi } postremove() { if is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device + fi + if is-masked systemctl unmask busybox-ifplugd@usb1.service; then systemctl unmask busybox-ifplugd@usb1.service fi if ! is-enabled "update-engine.service"; then From 7c1d2031cd0d0aa446209be839e5f6222570cd92 Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 17:10:35 -0600 Subject: [PATCH 6/7] remove trailing space --- package/toltec-base/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index 753c64a66..8756059d5 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -44,7 +44,7 @@ configure() { if is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device fi - if is-masked busybox-ifplugd@usb1.service; then + if is-masked busybox-ifplugd@usb1.service; then systemctl unmask busybox-ifplugd@usb1.service fi fi From 05d2d56f96ce4bc74bb5f35aafe36ee11e51d0bc Mon Sep 17 00:00:00 2001 From: gbyl Date: Wed, 27 Dec 2023 19:00:11 -0600 Subject: [PATCH 7/7] fix typo --- package/toltec-base/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index 8756059d5..06d812667 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -54,10 +54,10 @@ postremove() { if is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device fi - if is-masked systemctl unmask busybox-ifplugd@usb1.service; then + if is-masked busybox-ifplugd@usb1.service; then systemctl unmask busybox-ifplugd@usb1.service fi - if ! is-enabled "update-engine.service"; then + if ! is-enabled update-engine.service; then systemctl enable update-engine fi }