From 83f7fe4b8402bab171d110703a1b1115efbc9b28 Mon Sep 17 00:00:00 2001 From: Lukasz Kasprzak Date: Tue, 14 Apr 2026 22:32:43 +0200 Subject: cleaned up many scrits and deleted some that were of no use; renamed a lot --- .../db/public/network/etc-network/if-up.d/ethtool | 55 --------- .../db/public/network/etc-network/if-up.d/postfix | 3 - .../db/public/network/etc-network/if-up.d/resolved | 131 --------------------- 3 files changed, 189 deletions(-) delete mode 100755 straper/db/public/network/etc-network/if-up.d/ethtool delete mode 100755 straper/db/public/network/etc-network/if-up.d/postfix delete mode 100755 straper/db/public/network/etc-network/if-up.d/resolved (limited to 'straper/db/public/network/etc-network/if-up.d') diff --git a/straper/db/public/network/etc-network/if-up.d/ethtool b/straper/db/public/network/etc-network/if-up.d/ethtool deleted file mode 100755 index 05b56d7..0000000 --- a/straper/db/public/network/etc-network/if-up.d/ethtool +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -ETHTOOL=/usr/sbin/ethtool - -test -x $ETHTOOL || exit 0 - -[ "$IFACE" != "lo" ] || exit 0 - -# Find settings with a given prefix and print them as they appeared in -# /etc/network/interfaces, only with the prefix removed. -# This actually prints each name and value on a separate line, but that -# doesn't matter to the shell. -gather_settings () { - set | sed -n " -/^IF_$1[A-Za-z0-9_]*=/ { - h; # hold line - s/^IF_$1//; s/=.*//; s/_/-/g; # get name without prefix - y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/; # lower-case - p; - g; # restore line - s/^[^=]*=//; s/^'\(.*\)'/\1/; # get value - p; -}" -} - -# Gather together the mixed bag of settings applied with -s/--change -SETTINGS="\ -${IF_LINK_SPEED:+ speed $IF_LINK_SPEED}\ -${IF_LINK_DUPLEX:+ duplex $IF_LINK_DUPLEX}\ -" - -# WOL has an optional pass-key -set -- $IF_ETHERNET_WOL -SETTINGS="$SETTINGS${1:+ wol $1}${2:+ sopass $2}" - -# Autonegotiation can be on|off or an advertising mask -case "$IF_ETHERNET_AUTONEG" in -'') ;; -on|off) SETTINGS="$SETTINGS autoneg $IF_ETHERNET_AUTONEG" ;; -*) SETTINGS="$SETTINGS autoneg on advertise $IF_ETHERNET_AUTONEG" ;; -esac - -[ -z "$SETTINGS" ] || $ETHTOOL --change "$IFACE" $SETTINGS - -SETTINGS="$(gather_settings ETHERNET_PAUSE_)" -[ -z "$SETTINGS" ] || $ETHTOOL --pause "$IFACE" $SETTINGS - -SETTINGS="$(gather_settings HARDWARE_IRQ_COALESCE_)" -[ -z "$SETTINGS" ] || $ETHTOOL --coalesce "$IFACE" $SETTINGS - -SETTINGS="$(gather_settings HARDWARE_DMA_RING_)" -[ -z "$SETTINGS" ] || $ETHTOOL --set-ring "$IFACE" $SETTINGS - -SETTINGS="$(gather_settings OFFLOAD_)" -[ -z "$SETTINGS" ] || $ETHTOOL --offload "$IFACE" $SETTINGS diff --git a/straper/db/public/network/etc-network/if-up.d/postfix b/straper/db/public/network/etc-network/if-up.d/postfix deleted file mode 100755 index 9db2b8b..0000000 --- a/straper/db/public/network/etc-network/if-up.d/postfix +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -# update postfix copy of resolv.conf (picked up automatically); only default instance is handled -[ lo != "$IFACE" ] && cp -pLu /etc/resolv.conf /var/spool/postfix/etc/resolv.conf 2>/dev/null || : diff --git a/straper/db/public/network/etc-network/if-up.d/resolved b/straper/db/public/network/etc-network/if-up.d/resolved deleted file mode 100755 index e79f997..0000000 --- a/straper/db/public/network/etc-network/if-up.d/resolved +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh -# -# Script fragment to make ifupdown supply DNS information to resolved -# - -case "$ADDRFAM" in - inet|inet6) : ;; - *) exit 0 ;; -esac - -if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then - interface=$IFACE - if [ ! "$interface" ]; then - return - fi - # TODO handle lo interface settings - if [ "$interface" = "lo" ]; then - return - fi - ifindex=$(cat "/sys/class/net/$interface/ifindex") - if [ ! "$ifindex" ]; then - return - fi - mystatedir=/run/network - mkdir -p $mystatedir - - statedir=/run/systemd/resolve/netif - mkdir -p $statedir - chown systemd-resolve:systemd-resolve $statedir - - oldstate="$(mktemp)" - # ignore errors due to nonexistent file - md5sum "$mystatedir/isc-dhcp-v4-$interface" "$mystatedir/isc-dhcp-v6-$interface" "$mystatedir/ifupdown-inet-$interface" "$mystatedir/ifupdown-inet6-$interface" > "$oldstate" 2> /dev/null || true - - NEW_DEFAULT_ROUTE=$IF_DNS_DEFAULT_ROUTE - NEW_DNS=$(echo $IF_DNS_NAMESERVERS $IF_DNS_NAMESERVER) - NEW_DOMAINS=$(echo $IF_DNS_DOMAIN $IF_DNS_SEARCH) - DNS=DNS - DOMAINS=DOMAINS - if [ "$ADDRFAM" = "inet6" ]; then - DNS=DNS6 - DOMAINS=DOMAINS6 - fi - if [ -n "$NEW_DNS" ]; then - cat <"$mystatedir/ifupdown-${ADDRFAM}-$interface" -$DNS="$NEW_DNS" -EOF - if [ -n "$NEW_DOMAINS" ]; then - cat <>"$mystatedir/ifupdown-${ADDRFAM}-$interface" -$DOMAINS="$NEW_DOMAINS" -EOF - fi - fi - case "$NEW_DEFAULT_ROUTE" in - 1|yes|true|on) NEW_DEFAULT_ROUTE=yes ;; - 0|no|false|off) NEW_DEFAULT_ROUTE=no ;; - *) NEW_DEFAULT_ROUTE= ;; - esac - if [ -n "$NEW_DEFAULT_ROUTE" ]; then - cat <>"$mystatedir/ifupdown-${ADDRFAM}-$interface" -DEFAULT_ROUTE="$NEW_DEFAULT_ROUTE" -EOF - fi - - newstate="$(mktemp)" - # ignore errors due to nonexistent file - md5sum "$mystatedir/isc-dhcp-v4-$interface" "$mystatedir/isc-dhcp-v6-$interface" "$mystatedir/ifupdown-inet-$interface" "$mystatedir/ifupdown-inet6-$interface" > "$newstate" 2> /dev/null || true - if ! cmp --silent "$oldstate" "$newstate" 2>/dev/null; then - unset DNS DNS6 DOMAINS DOMAINS6 DEFAULT_ROUTE - # v4 first - if [ -e "$mystatedir/isc-dhcp-v4-$interface" ]; then - . "$mystatedir/isc-dhcp-v4-$interface" - fi - # v4 manual config overrides - if [ -e "$mystatedir/ifupdown-inet-$interface" ]; then - . "$mystatedir/ifupdown-inet-$interface" - fi - # v6 preffered - if [ -e "$mystatedir/isc-dhcp-v6-$interface" ]; then - . "$mystatedir/isc-dhcp-v6-$interface" - fi - # v6 manual config overrides - if [ -e "$mystatedir/ifupdown-inet6-$interface" ]; then - . "$mystatedir/ifupdown-inet6-$interface" - fi - resolvectl_failed= - if [ "$DNS" ] || [ "$DNS6" ] ; then - cat <"$statedir/$ifindex" -# This is private data. Do not parse. -LLMNR=yes -MDNS=no -SERVERS=$(echo $DNS6 $DNS) -DOMAINS=$(echo $DOMAINS6 $DOMAINS) -EOF - if [ -n "$DEFAULT_ROUTE" ]; then - cat <>"$statedir/$ifindex" -DEFAULT_ROUTE=$DEFAULT_ROUTE -EOF - fi - chown systemd-resolve:systemd-resolve "$statedir/$ifindex" - # In addition to creating the state file (needed if we run before - # resolved is started), also feed the information directly to - # resolved. - if systemctl --quiet is-active systemd-resolved; then - resolvectl llmnr "$ifindex" yes || resolvectl_failed=$? - resolvectl mdns "$ifindex" no || resolvectl_failed=$? - if [ "$DOMAINS6" ] || [ "$DOMAINS" ]; then - resolvectl domain "$ifindex" $DOMAINS6 $DOMAINS || resolvectl_failed=$? - else - resolvectl domain "$ifindex" "" || resolvectl_failed=$? - fi - resolvectl dns "$ifindex" $DNS6 $DNS || resolvectl_failed=$? - if [ "$DEFAULT_ROUTE" ]; then - resolvectl default-route "$ifindex" $DEFAULT_ROUTE || resolvectl_failed=$? - fi - fi - else - rm -f "$statedir/$ifindex" - if systemctl --quiet is-active systemd-resolved; then - resolvectl revert "$ifindex" || resolvectl_failed=$? - fi - fi - - # resolved was running, but without dbus, it means state files - # will not be read & resolvectl commands failed, restart it - if [ "$resolvectl_failed" ]; then - systemctl try-restart systemd-resolved - fi - fi - rm -f "$oldstate" "$newstate" -fi -- cgit v1.3