Drop migration code for the switch from DynamicUser=yes to no

This code is no longer needed as it only affected systems between 239-1
and 239-5, i.e. it never affected a stable release.
This commit is contained in:
Michael Biebl 2020-03-18 23:22:16 +01:00
parent b30b5c8c70
commit ea8765c837

View File

@ -92,6 +92,13 @@ systemd-machine-id-setup
# Setup system users and groups
addgroup --quiet --system systemd-journal
adduser --quiet --system --group --no-create-home --home /run/systemd \
--gecos "systemd Time Synchronization" systemd-timesync
adduser --quiet --system --group --no-create-home --home /run/systemd \
--gecos "systemd Network Management" systemd-network
adduser --quiet --system --group --no-create-home --home /run/systemd \
--gecos "systemd Resolver" systemd-resolve
# Enable persistent journal, in auto-mode, by default on new installs and upgrades
if dpkg --compare-versions "$2" lt "244.1-2~"; then
mkdir -p /var/log/journal
@ -104,24 +111,6 @@ if dpkg --compare-versions "$2" lt "244.1-2~"; then
fi
fi
# We need to stop running services before we call adduser
RESTART=""
if dpkg --compare-versions "$2" lt-nl "239-6"; then
for s in systemd-networkd systemd-timesyncd systemd-resolved ; do
if _systemctl -q is-active $s; then
_systemctl stop $s
RESTART="$s $RESTART"
fi
done
fi
adduser --quiet --system --group --no-create-home --home /run/systemd \
--gecos "systemd Time Synchronization" systemd-timesync
adduser --quiet --system --group --no-create-home --home /run/systemd \
--gecos "systemd Network Management" systemd-network
adduser --quiet --system --group --no-create-home --home /run/systemd \
--gecos "systemd Resolver" systemd-resolve
# Initial update of the Message Catalogs database
_update_catalog
@ -135,14 +124,6 @@ if [ -n "$2" ]; then
_systemctl try-restart systemd-journald.service || true
fi
# Restart services which we stopped earlier
# This needs to run after daemon-rexec
if dpkg --compare-versions "$2" lt-nl "239-6"; then
for s in $RESTART ; do
_systemctl start $s
done
fi
if dpkg --compare-versions "$2" lt-nl "235-3~"; then
# systemd-bus-proxyd got dropped before stretch, and never created any file
deluser --system systemd-bus-proxy || true