From d5b3c28e8df43fe38ad28d7f5b3f98b05a0b9e73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:43:17 +0200 Subject: [PATCH] Simplified network config and removed old service files --- config-root.yaml | 19 ------ root/etc/systemd/network/01-wired.network | 1 - root/etc/systemd/network/02-usb0.link | 6 -- .../{02-usb0.network => 02-wireless.network} | 3 +- root/etc/systemd/network/03-wireless.network | 9 --- root/etc/systemd/network/04-wlan0.link | 6 -- root/etc/systemd/network/04-wlan0.network | 9 --- root/etc/systemd/system.conf | 68 ------------------- root/etc/systemd/system/ipmi-fans.service | 9 --- root/etc/systemd/system/ipmi-fans.timer | 9 --- root/etc/systemd/system/ipmi-static.service | 9 --- root/etc/systemd/system/ipmi-temp.service | 9 --- root/etc/systemd/system/ipmi-temp.timer | 9 --- .../systemd/system/ipmi/ipmi-static.service | 9 --- .../etc/systemd/system/ipmi/ipmi-temp.service | 9 --- root/etc/systemd/system/ipmi/ipmi-temp.timer | 9 --- .../system/iwd.service.d/override.conf | 3 - root/etc/systemd/system/iwd@.service | 14 ---- root/etc/systemd/system/rtorrent.service | 13 ---- 19 files changed, 1 insertion(+), 222 deletions(-) delete mode 100644 root/etc/systemd/network/02-usb0.link rename root/etc/systemd/network/{02-usb0.network => 02-wireless.network} (67%) delete mode 100644 root/etc/systemd/network/03-wireless.network delete mode 100644 root/etc/systemd/network/04-wlan0.link delete mode 100644 root/etc/systemd/network/04-wlan0.network delete mode 100644 root/etc/systemd/system/ipmi-fans.service delete mode 100644 root/etc/systemd/system/ipmi-fans.timer delete mode 100644 root/etc/systemd/system/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi-temp.timer delete mode 100644 root/etc/systemd/system/ipmi/ipmi-static.service delete mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.service delete mode 100644 root/etc/systemd/system/ipmi/ipmi-temp.timer delete mode 100755 root/etc/systemd/system/iwd.service.d/override.conf delete mode 100755 root/etc/systemd/system/iwd@.service delete mode 100644 root/etc/systemd/system/rtorrent.service diff --git a/config-root.yaml b/config-root.yaml index 1b5ba22b..39e08660 100644 --- a/config-root.yaml +++ b/config-root.yaml @@ -41,9 +41,6 @@ dotfiles: f_freetype2.sh: dst: /etc/profile.d/freetype2.sh src: etc/profile.d/freetype2.sh - f_iwd@.service: - dst: /etc/systemd/system/iwd@.service - src: etc/systemd/system/iwd@.service f_fonts.conf: dst: /etc/fonts/local.conf src: etc/fonts/local.conf @@ -95,21 +92,6 @@ dotfiles: f_20-quiet-printk.conf: src: etc/sysctl.d/20-quiet-printk.conf dst: /etc/sysctl.d/20-quiet-printk.conf - f_ipmi-static.service: - src: etc/systemd/system/ipmi-static.service - dst: /etc/systemd/system/ipmi-static.service - f_ipmi-temp.service: - src: etc/systemd/system/ipmi-temp.service - dst: /etc/systemd/system/ipmi-temp.service - f_ipmi-temp.timer: - src: etc/systemd/system/ipmi-temp.timer - dst: /etc/systemd/system/ipmi-temp.timer - f_ipmi-fans.service: - src: etc/systemd/system/ipmi-fans.service - dst: /etc/systemd/system/ipmi-fans.service - f_ipmi-fans.timer: - src: etc/systemd/system/ipmi-fans.timer - dst: /etc/systemd/system/ipmi-fans.timer f_system.conf: src: etc/systemd/system.conf dst: /etc/systemd/system.conf @@ -152,7 +134,6 @@ profiles: - d_bin - f_adb.service - f_bluetooth.conf - - f_iwd@.service - f_sshd_config - f_logind.conf - f_60-uinput-permissions.rules diff --git a/root/etc/systemd/network/01-wired.network b/root/etc/systemd/network/01-wired.network index 92ec5d67..3775e67c 100644 --- a/root/etc/systemd/network/01-wired.network +++ b/root/etc/systemd/network/01-wired.network @@ -5,5 +5,4 @@ Name=enp* DHCP=yes [DHCP] -RouteMetric=10 UseDomains=true diff --git a/root/etc/systemd/network/02-usb0.link b/root/etc/systemd/network/02-usb0.link deleted file mode 100644 index 6167e221..00000000 --- a/root/etc/systemd/network/02-usb0.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=00:e0:4c:68:05:90 - -[Link] -Description=USB to Ethernet Adapter -Name=usb0 diff --git a/root/etc/systemd/network/02-usb0.network b/root/etc/systemd/network/02-wireless.network similarity index 67% rename from root/etc/systemd/network/02-usb0.network rename to root/etc/systemd/network/02-wireless.network index 8ae44320..0f966cc7 100644 --- a/root/etc/systemd/network/02-usb0.network +++ b/root/etc/systemd/network/02-wireless.network @@ -1,9 +1,8 @@ [Match] -Name=usb0 +Name=w* [Network] DHCP=yes [DHCP] -RouteMetric=10 UseDomains=true diff --git a/root/etc/systemd/network/03-wireless.network b/root/etc/systemd/network/03-wireless.network deleted file mode 100644 index 94b6271b..00000000 --- a/root/etc/systemd/network/03-wireless.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=wlp* - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 -UseDomains=true diff --git a/root/etc/systemd/network/04-wlan0.link b/root/etc/systemd/network/04-wlan0.link deleted file mode 100644 index 407a7bf5..00000000 --- a/root/etc/systemd/network/04-wlan0.link +++ /dev/null @@ -1,6 +0,0 @@ -[Match] -MACAddress=dc:fb:48:2b:b7:86 - -[Link] -Description=Internal wireless adapter -Name=wlan0 diff --git a/root/etc/systemd/network/04-wlan0.network b/root/etc/systemd/network/04-wlan0.network deleted file mode 100644 index 6252119e..00000000 --- a/root/etc/systemd/network/04-wlan0.network +++ /dev/null @@ -1,9 +0,0 @@ -[Match] -Name=wlan0 - -[Network] -DHCP=yes - -[DHCP] -RouteMetric=20 -UseDomains=true diff --git a/root/etc/systemd/system.conf b/root/etc/systemd/system.conf index 9c7832d4..65ff02c8 100644 --- a/root/etc/systemd/system.conf +++ b/root/etc/systemd/system.conf @@ -1,70 +1,2 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# Entries in this file show the compile time defaults. -# You can change settings by editing this file. -# Defaults can be restored by simply deleting this file. -# -# See systemd-system.conf(5) for details. - [Manager] -#LogLevel=info -#LogTarget=journal-or-kmsg -#LogColor=yes -#LogLocation=no -#DumpCore=yes -#ShowStatus=yes -#CrashChangeVT=no -#CrashShell=no -#CrashReboot=no -#CtrlAltDelBurstAction=reboot-force -#CPUAffinity=1 2 -#NUMAPolicy=default -#NUMAMask= -#RuntimeWatchdogSec=0 -#RebootWatchdogSec=10min -#ShutdownWatchdogSec=10min -#KExecWatchdogSec=0 -#WatchdogDevice= -#CapabilityBoundingSet= -#NoNewPrivileges=no -#SystemCallArchitectures= -#TimerSlackNSec= -#StatusUnitFormat=description -#DefaultTimerAccuracySec=1min -#DefaultStandardOutput=journal -#DefaultStandardError=inherit -#DefaultTimeoutStartSec=90s DefaultTimeoutStopSec=30s -#DefaultTimeoutAbortSec= -#DefaultRestartSec=100ms -#DefaultStartLimitIntervalSec=10s -#DefaultStartLimitBurst=5 -#DefaultEnvironment= -#DefaultCPUAccounting=no -#DefaultIOAccounting=no -#DefaultIPAccounting=no -#DefaultBlockIOAccounting=no -#DefaultMemoryAccounting=yes -#DefaultTasksAccounting=yes -#DefaultTasksMax=15% -#DefaultLimitCPU= -#DefaultLimitFSIZE= -#DefaultLimitDATA= -#DefaultLimitSTACK= -#DefaultLimitCORE= -#DefaultLimitRSS= -#DefaultLimitNOFILE=1024:524288 -#DefaultLimitAS= -#DefaultLimitNPROC= -#DefaultLimitMEMLOCK= -#DefaultLimitLOCKS= -#DefaultLimitSIGPENDING= -#DefaultLimitMSGQUEUE= -#DefaultLimitNICE= -#DefaultLimitRTPRIO= -#DefaultLimitRTTIME= diff --git a/root/etc/systemd/system/ipmi-fans.service b/root/etc/systemd/system/ipmi-fans.service deleted file mode 100644 index 5f21b041..00000000 --- a/root/etc/systemd/system/ipmi-fans.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Write fan speeds to tmp - -[Service] -Type=simple -ExecStart=/home/balrog/.scripts/ipmi/fans.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-fans.timer b/root/etc/systemd/system/ipmi-fans.timer deleted file mode 100644 index 554be356..00000000 --- a/root/etc/systemd/system/ipmi-fans.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run fans service every 30s - -[Timer] -OnUnitInactiveSec=15s -OnBootSec=15s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/ipmi-static.service b/root/etc/systemd/system/ipmi-static.service deleted file mode 100644 index fb5c1bfb..00000000 --- a/root/etc/systemd/system/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.service b/root/etc/systemd/system/ipmi-temp.service deleted file mode 100644 index 11f921e6..00000000 --- a/root/etc/systemd/system/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/.scripts/ipmi/temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi-temp.timer b/root/etc/systemd/system/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/ipmi/ipmi-static.service b/root/etc/systemd/system/ipmi/ipmi-static.service deleted file mode 100644 index fb5c1bfb..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-static.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Set fan speed - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/static.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.service b/root/etc/systemd/system/ipmi/ipmi-temp.service deleted file mode 100644 index 64a9615f..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-temp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watch server temperature - -[Service] -Type=simple -ExecStart=/home/balrog/Scripts/ipmi/temp.sh - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/ipmi/ipmi-temp.timer b/root/etc/systemd/system/ipmi/ipmi-temp.timer deleted file mode 100644 index d6605b13..00000000 --- a/root/etc/systemd/system/ipmi/ipmi-temp.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Watches server temperature - -[Timer] -OnUnitInactiveSec=5s -OnBootSec=5s - -[Install] -WantedBy=timers.target diff --git a/root/etc/systemd/system/iwd.service.d/override.conf b/root/etc/systemd/system/iwd.service.d/override.conf deleted file mode 100755 index 3f1920ca..00000000 --- a/root/etc/systemd/system/iwd.service.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -BindsTo=sys-subsystem-net-devices-wlan0.device -After=sys-subsystem-net-devices-wlan0.device diff --git a/root/etc/systemd/system/iwd@.service b/root/etc/systemd/system/iwd@.service deleted file mode 100755 index 2dca19dc..00000000 --- a/root/etc/systemd/system/iwd@.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Wireless service on %I -BindsTo=sys-subsystem-net-devices-%i.device -After=sys-subsystem-net-devices-%i.device - -[Service] -Type=dbus -BusName=net.connman.iwd -ExecStart=/usr/lib/iwd/iwd --interface %i -LimitNPROC=1 -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/root/etc/systemd/system/rtorrent.service b/root/etc/systemd/system/rtorrent.service deleted file mode 100644 index 38da7b4b..00000000 --- a/root/etc/systemd/system/rtorrent.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=rTorrent in tmux -After=network.target - -[Service] -User=rtorrent -WorkingDirectory=/home/rtorrent -Environment="TERM=linux" -Type=forking -ExecStart=/bin/bash -c "/usr/bin/tmux -2u -L rtps-%u new-session -s rtps-%u -n rT-PS -d /bin/bash -c rtorrent" - -[Install] -WantedBy=default.target