From efb1614b6bda8e448a049d6654c329bc961fa505 Mon Sep 17 00:00:00 2001 From: bin456789 Date: Wed, 5 Mar 2025 22:34:59 +0800 Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=B2=A1=E6=9C=89=20/usr/lib/systemd/system-preset=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fix-eth-name.service | 1 + trans.sh | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fix-eth-name.service b/fix-eth-name.service index 1380c73..39a4cbd 100644 --- a/fix-eth-name.service +++ b/fix-eth-name.service @@ -22,6 +22,7 @@ ExecStart=/usr/bin/env bash /fix-eth-name.sh ExecStart=/usr/bin/env rm -f /fix-eth-name.sh ExecStart=/usr/bin/env rm -f /etc/systemd/system/fix-eth-name.service ExecStart=/usr/bin/env rm -f /etc/systemd/system/multi-user.target.wants/fix-eth-name.service +ExecStart=/usr/bin/env rm -f /lib/systemd/system-preset/01-fix-eth-name.preset ExecStart=/usr/bin/env rm -f /usr/lib/systemd/system-preset/01-fix-eth-name.preset [Install] diff --git a/trans.sh b/trans.sh index 293f20b..d587d12 100644 --- a/trans.sh +++ b/trans.sh @@ -1681,7 +1681,13 @@ add_fix_eth_name_systemd_service() { # 因此需要设置 fix-eth-name 的 preset 状态 # 不然首次开机 /etc/systemd/system/multi-user.target.wants/fix-eth-name.service 会被删除 # 通常 /etc/systemd/system-preset/ 文件夹要新建,因此不放在这里 - echo 'enable fix-eth-name.service' >"$os_dir/usr/lib/systemd/system-preset/01-fix-eth-name.preset" + + # 可能是 /usr/lib/systemd/system-preset/ 或者 /lib/systemd/system-preset/ + if [ -d "$os_dir/usr/lib/systemd/system-preset" ]; then + echo 'enable fix-eth-name.service' >"$os_dir/usr/lib/systemd/system-preset/01-fix-eth-name.preset" + else + echo 'enable fix-eth-name.service' >"$os_dir/lib/systemd/system-preset/01-fix-eth-name.preset" + fi } basic_init() {