units: replace symlinks in units/user/ by real files

We already *install* those as real files since de78fa9ba0be55b01066ca5a716c6673d76b817b.
Meson will start to copy symlinks as-is, so we would get dangling symlinks in
/usr/lib/systemd/user/.

I considered the layout in our sources to match the layout in the installation
filesystem (i.e. creating units/system/ and moving all files from units/ to
units/system/), but that seems overkill. By using normal files for both we get
some duplication, but those files change rarely, so it's not a big downside in
practice.

Fixes #9906.

diff --git a/units/user/bluetooth.target b/units/user/bluetooth.target
deleted file mode 120000 (symlink)
index 72e74be0a10ce7f432533308e49bfd708301d2ae..0000000000000000000000000000000000000000
--- a/units/user/bluetooth.target
+++ /dev/null
@@ -1 +0,0 @@
-../bluetooth.target
\ No newline at end of file

diff --git a/units/user/bluetooth.target b/units/user/bluetooth.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..62407d363e4ab4af3b368593ea9c5a7643399fde
--- /dev/null
+++ b/units/user/bluetooth.target
@@ -0,0 +1,13 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Bluetooth
+Documentation=man:systemd.special(7)
+StopWhenUnneeded=yes

diff --git a/units/user/paths.target b/units/user/paths.target
deleted file mode 120000 (symlink)
index 33545d24f31a23abf57e3c902c8f8ca076b1e1d7..0000000000000000000000000000000000000000
--- a/units/user/paths.target
+++ /dev/null
@@ -1 +0,0 @@
-../paths.target
\ No newline at end of file

diff --git a/units/user/paths.target b/units/user/paths.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..9b6ed1c13feec452f236b8314fea492b89d62337
--- /dev/null
+++ b/units/user/paths.target
@@ -0,0 +1,12 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Paths
+Documentation=man:systemd.special(7)

diff --git a/units/user/printer.target b/units/user/printer.target
deleted file mode 120000 (symlink)
index 8b8d5511cd96f086c183569b185db42e75a26c61..0000000000000000000000000000000000000000
--- a/units/user/printer.target
+++ /dev/null
@@ -1 +0,0 @@
-../printer.target
\ No newline at end of file

diff --git a/units/user/printer.target b/units/user/printer.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..e1fb0d4e347573397b6feae24ccd41cf88470e86
--- /dev/null
+++ b/units/user/printer.target
@@ -0,0 +1,13 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Printer
+Documentation=man:systemd.special(7)
+StopWhenUnneeded=yes

diff --git a/units/user/shutdown.target b/units/user/shutdown.target
deleted file mode 120000 (symlink)
index a9de83782f504264f30d219270f0179d4e4ab97d..0000000000000000000000000000000000000000
--- a/units/user/shutdown.target
+++ /dev/null
@@ -1 +0,0 @@
-../shutdown.target
\ No newline at end of file

diff --git a/units/user/shutdown.target b/units/user/shutdown.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..d48e6d6494275b02b606f4265d9fc6414b3eb048
--- /dev/null
+++ b/units/user/shutdown.target
@@ -0,0 +1,14 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Shutdown
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
+RefuseManualStart=yes

diff --git a/units/user/smartcard.target b/units/user/smartcard.target
deleted file mode 120000 (symlink)
index f7a23b6b6dfc2f1f9b522bb276076b200d17112c..0000000000000000000000000000000000000000
--- a/units/user/smartcard.target
+++ /dev/null
@@ -1 +0,0 @@
-../smartcard.target
\ No newline at end of file

diff --git a/units/user/smartcard.target b/units/user/smartcard.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..717ea2311dfcce6709f58984a8d8bece9c5b601e
--- /dev/null
+++ b/units/user/smartcard.target
@@ -0,0 +1,13 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Smart Card
+Documentation=man:systemd.special(7)
+StopWhenUnneeded=yes

diff --git a/units/user/sockets.target b/units/user/sockets.target
deleted file mode 120000 (symlink)
index a9e4b971846565f45d5fa5fc7fd80118ff106a4b..0000000000000000000000000000000000000000
--- a/units/user/sockets.target
+++ /dev/null
@@ -1 +0,0 @@
-../sockets.target
\ No newline at end of file

diff --git a/units/user/sockets.target b/units/user/sockets.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..9af67fdb1faaf729249f3d989c02714d4633c429
--- /dev/null
+++ b/units/user/sockets.target
@@ -0,0 +1,12 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Sockets
+Documentation=man:systemd.special(7)

diff --git a/units/user/sound.target b/units/user/sound.target
deleted file mode 120000 (symlink)
index 17c8e9d6e14ac9fb4456c3de328e0e07843461a6..0000000000000000000000000000000000000000
--- a/units/user/sound.target
+++ /dev/null
@@ -1 +0,0 @@
-../sound.target
\ No newline at end of file

diff --git a/units/user/sound.target b/units/user/sound.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..19afc2a63735118a005930f2192b454d85ee3ef4
--- /dev/null
+++ b/units/user/sound.target
@@ -0,0 +1,13 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Sound Card
+Documentation=man:systemd.special(7)
+StopWhenUnneeded=yes

diff --git a/units/user/timers.target b/units/user/timers.target
deleted file mode 120000 (symlink)
index f98b68a84d8aaaaa0f77d15994e39fd01f9a6597..0000000000000000000000000000000000000000
--- a/units/user/timers.target
+++ /dev/null
@@ -1 +0,0 @@
-../timers.target
\ No newline at end of file

diff --git a/units/user/timers.target b/units/user/timers.target
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..b1aa8c797ccdb3124e53b63a6f40f2e3fa595357
--- /dev/null
+++ b/units/user/timers.target
@@ -0,0 +1,15 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Timers
+Documentation=man:systemd.special(7)
+
+DefaultDependencies=no
+Conflicts=shutdown.target