[neon/neon/calamares-settings/Neon/release-lts] oem-prepare/usr/sbin: throw away duplicated oem-cleanup

Harald Sitter null at kde.org
Mon Mar 15 13:59:47 GMT 2021


Git commit 860e4623a287be8e440b62381e473508eaada222 by Harald Sitter.
Committed on 15/03/2021 at 13:59.
Pushed by sitter into branch 'Neon/release-lts'.

throw away duplicated oem-cleanup

I'm not quite sure why this as in sbin but it seems unused and is a copy
of the oem-cleanup in prepare-system (from where it will get copied to
/usr/bin)

all in all this file seems to have been left over from before cleanup
was fully figured out, and is now no longer relevant

D  +0    -34   oem-prepare/usr/sbin/oem-cleanup

https://invent.kde.org/neon/neon/calamares-settings/commit/860e4623a287be8e440b62381e473508eaada222

diff --git a/oem-prepare/usr/sbin/oem-cleanup b/oem-prepare/usr/sbin/oem-cleanup
deleted file mode 100755
index 4ea5f0b..0000000
--- a/oem-prepare/usr/sbin/oem-cleanup
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# SPDX-FileCopyrightText: 2018 Harald Sitter <sitter at kde.org>
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-set -ex
-
-# This is part of oem-config-firstboot. Since we run cala through the oem user
-# there is more cleanup we need to do after the oem configuration is done though
-
-# Remove the temporary OEM configuration user, if possible
-# and desired.
-# RET="$(echo GET oem-config/remove | debconf-communicate)"
-# if [ "${RET#* }" = true ] && getent passwd oem >/dev/null; then
-  pkill -u oem || true
-  userdel --force --remove oem || true
-# fi
-/bin/systemctl set-default graphical.target || true
-/bin/systemctl disable oem-config.service || true
-/bin/systemctl disable oem-config.target || true
-rm -f /lib/systemd/system/oem-config.* || true
-# /bin/systemctl --no-block isolate graphical.target || true
-
-# Additions for neon
-
-/bin/systemctl disable calamares-sddm.service || true
-rm -f /lib/systemd/system/calamares-sddm.service
-
-/bin/systemctl disable oem-cleanup.service || true
-rm -f /lib/systemd/system/oem-cleanup.service
-
-rm -rf /usr/bin/calmares-oem
-rm -rf /usr/share/calmares-oem
-
-rm /etc/sudoers.d/10-oem-*


More information about the Neon-commits mailing list