1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
diff --git a/GNUmakefile b/GNUmakefile
index d06847d..dd077a7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,7 @@ PREFIX?=/usr/local
BINDIR=${DESTDIR}${PREFIX}/bin
UDEVDIR=${DESTDIR}/usr/lib/udev/rules.d
SYSTEMDDIR=${DESTDIR}/usr/lib/systemd
-SYSTEMD_SYSTEM_DIR=${SYSTEMDDIR}/system
+SYSTEMD_SYSTEM_DIR=${DESTDIR}/lib/systemd/system
SYSTEMD_NETWORK_DIR=${SYSTEMDDIR}/network
SHARE_DIR=${DESTDIR}/${PREFIX}/share/${pkgname}
diff --git a/lib/lib.sh b/lib/lib.sh
index d01dd23..02357d9 100644
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -399,6 +399,13 @@ register_networkd_reloader() {
mkdir -p "$lockdir"
trap 'debug "Called trap" ; maybe_reload_networkd' EXIT
echo $$ > "${lockdir}/${iface}"
+ # Shellcheck would warn about the following line, with "This
+ # $? refers to echo/printf, not a previous command. Assign to
+ # variable to avoid it being overwritten." We actually want
+ # echo's exit code, since it will be nonzero if the redirect
+ # fails (that is, if somebody else deleted $lockdir before we
+ # got to put a file there)
+ # shellcheck disable=SC2320
registered=$?
done
}
|
