Compare commits

..

3 Commits

Author SHA1 Message Date
Jens Maus
4a2e53cda4 updated generic_raw_uart to latest 1.28 version and updated rpi-rf-mod (#2431)
package to latest version as well.
2023-03-27 20:28:40 +02:00
Stefan Agner
c0d0d48c45 Fix swapfile creation for all memory sizes (#2427)
* Fix swapfile creation for all memory sizes

In certain situation awk prints the swapfile size in scientific
notation. The script can't deal with that, in which case swap file
creation fails.

Use int to convert the number to an integer.

Since pages are 4k, also make sure swapsize is aligned to 4k blocks.

* Add info message
2023-03-27 20:28:35 +02:00
Stefan Agner
76b14baa20 Set deployment type to production 2023-03-24 18:45:15 +01:00
7 changed files with 4 additions and 91 deletions

View File

@@ -60,8 +60,6 @@ CONFIG_BT_HIDP=m
CONFIG_BT_LEDS=y CONFIG_BT_LEDS=y
CONFIG_IPV6=y CONFIG_IPV6=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_REACHABILITY_PROBE=y
CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT=m
CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE=y

View File

@@ -1,7 +1,7 @@
VERSION_MAJOR=11 VERSION_MAJOR=10
VERSION_BUILD=0 VERSION_BUILD=0
HASSOS_NAME="Home Assistant OS" HASSOS_NAME="Home Assistant OS"
HASSOS_ID="haos" HASSOS_ID="haos"
DEPLOYMENT="development" DEPLOYMENT="production"

View File

@@ -1,56 +0,0 @@
From b9182b02829b158d55acc53a0bcec1ed667b2668 Mon Sep 17 00:00:00 2001
Message-Id: <b9182b02829b158d55acc53a0bcec1ed667b2668.1680000784.git.stefan@agner.ch>
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 28 Mar 2023 12:02:10 +0200
Subject: [PATCH] ipv6: add option to explicitly enable reachability test
Systems which act as host as well as router might prefer the host
behavior. Currently the kernel does not allow to use IPv6 forwarding
globally and at the same time use route reachability probing.
Add a compile time flag to enable route reachability probe in any
case.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
net/ipv6/Kconfig | 9 +++++++++
net/ipv6/route.c | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 658bfed1df8b..5147fd4c93ff 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD
If unsure, say N.
+config IPV6_REACHABILITY_PROBE
+ bool "IPv6: Always use reachability probing (RFC 4191)"
+ help
+ By default reachability probing is disabled on router devices (when
+ IPv6 forwarding is enabled). This option explicitly enables
+ reachability probing always.
+
+ If unsure, say N.
+
config INET6_AH
tristate "IPv6: AH transformation"
select XFRM_AH
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 0fdb03df2287..5e1e1f02f400 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2210,7 +2210,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table,
strict |= flags & RT6_LOOKUP_F_IFACE;
strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE;
- if (net->ipv6.devconf_all->forwarding == 0)
+ if (net->ipv6.devconf_all->forwarding == 0 ||
+ IS_ENABLED(IPV6_REACHABILITY_PROBE))
strict |= RT6_LOOKUP_F_REACHABLE;
rcu_read_lock();
--
2.40.0

View File

@@ -1,27 +0,0 @@
From a053500cf43a31ee82a6e0f3d644ea36f5c77ffb Mon Sep 17 00:00:00 2001
Message-Id: <a053500cf43a31ee82a6e0f3d644ea36f5c77ffb.1679932288.git.stefan@agner.ch>
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 27 Mar 2023 17:48:34 +0200
Subject: [PATCH] ndisc: support multiple gateways for a single network
---
src/core/ndisc/nm-ndisc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
index 9a6038d406..67cdf5d99a 100644
--- a/src/core/ndisc/nm-ndisc.c
+++ b/src/core/ndisc/nm-ndisc.c
@@ -654,7 +654,8 @@ nm_ndisc_add_route(NMNDisc *ndisc, const NMNDiscRoute *new_item, gint64 now_msec
NMNDiscRoute *item = &g_array_index(rdata->routes, NMNDiscRoute, i);
if (IN6_ARE_ADDR_EQUAL(&item->network, &new_item->network)
- && item->plen == new_item->plen) {
+ && item->plen == new_item->plen
+ && IN6_ARE_ADDR_EQUAL(&item->gateway, &new_item->gateway)) {
if (new_item->expiry_msec <= now_msec) {
g_array_remove_index(rdata->routes, i);
return TRUE;
--
2.40.0

View File

@@ -1,4 +1,3 @@
[Journal] [Journal]
Storage=auto Storage=auto
Compress=yes Compress=yes
SystemMaxUse=500M

View File

@@ -14,7 +14,6 @@ if [ ! -s "${swapfile}" ] || [ "$(stat "${swapfile}" -c '%s')" -lt $((swapsize *
fi fi
echo "[INFO] Creating swapfile of size $((swapsize *4))k" echo "[INFO] Creating swapfile of size $((swapsize *4))k"
umask 0077
dd if=/dev/zero of="${swapfile}" bs=4k count="${swapsize}" dd if=/dev/zero of="${swapfile}" bs=4k count="${swapsize}"
fi fi

View File

@@ -3,7 +3,7 @@ set -e
BUILDER_UID="$(id -u)" BUILDER_UID="$(id -u)"
BUILDER_GID="$(id -g)" BUILDER_GID="$(id -g)"
CACHE_DIR="/mnt/data/supervisor/$(pwd)/hassos-cache}" CACHE_DIR="${CACHE_DIR:-$HOME/hassos-cache}"
ARGS="$*" ARGS="$*"
COMMAND="${ARGS:-bash}" COMMAND="${ARGS:-bash}"
@@ -21,6 +21,6 @@ sudo losetup -f > /dev/null
# shellcheck disable=SC2086 # shellcheck disable=SC2086
sudo docker run -it --rm --privileged \ sudo docker run -it --rm --privileged \
-v "/mnt/data/supervisor/$(pwd):/build" -v "${CACHE_DIR}:/cache" \ -v "$(pwd):/build" -v "${CACHE_DIR}:/cache" \
-e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \ -e BUILDER_UID="${BUILDER_UID}" -e BUILDER_GID="${BUILDER_GID}" \
hassos:local ${COMMAND} hassos:local ${COMMAND}