Backport two conversion fixes from 1.40
[archnosh.git] / misc-1.39.patch
bloba36cfd1790641e8a084d3e5b8a0cc8af71a8cba3
1 diff --git a/source/convert/dbus-services.do b/source/convert/dbus-services.do
2 index ea6ce13..4d7f42c 100755
3 --- a/source/convert/dbus-services.do
4 +++ b/source/convert/dbus-services.do
5 @@ -89,7 +89,7 @@ do
6 org.freedesktop.import[0-9]*) continue ;; # blacklisted
7 org.freedesktop.machine[0-9]*) continue ;; # blacklisted
8 org.freedesktop.portable[0-9]*) continue ;; # blacklisted
9 - org.freedesktop.timesnc[0-9]*) continue ;; # blacklisted
10 + org.freedesktop.timesync[0-9]*) continue ;; # blacklisted
11 esac
12 redo-ifchange -- "dbus/$i.service"
13 printf "dbus/%s\n" "$i" >> "$3"
14 diff --git a/source/convert/user-services.do b/source/convert/user-services.do
15 index 75078c2..981acbc 100755
16 --- a/source/convert/user-services.do
17 +++ b/source/convert/user-services.do
18 @@ -30,7 +30,7 @@ esac
19 redo-ifchange "user-dbus-daemon@.socket" "user-dbus-daemon.service" "user-dbus-broker@.socket" "user-dbus-broker.service" "user-dbus-log@.service" "user-services.service" "user-services@.socket" "user-runtime@.service" "run-user-directory@.service" "user@.target" "per-user/exit.target" "per-user/per-user.conf" "per-user/all.do" "per-user/default.do" "per-user/home.do" "per-user/user.do" "per-user/config-path.do" "per-user/services.do"
21 getent passwd |
22 -awk -F : '{ if (!match($7,"/nologin$")) print $1; }' |
23 + awk -F : '{ if (!match($7,"/nologin$") && !match($7,"/false$")) print $1; }' |
24 while read -r i
26 # On systems that don't set nologin as the shell, there is nothing distinguishing "system" accounts from accounts that temporarily have their password disabled.