aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-12-13 20:19:45 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-12-13 20:23:43 +0100
commit634cc94f475b5683a30a13cba1a27fccb409ffcb (patch)
treec5777c76a7d47033ee5770c03a27443f7f3d2036
parentunits: drop units/user/busnames.target (diff)
downloadsystemd-634cc94f475b5683a30a13cba1a27fccb409ffcb.tar.gz
systemd-634cc94f475b5683a30a13cba1a27fccb409ffcb.tar.bz2
systemd-634cc94f475b5683a30a13cba1a27fccb409ffcb.zip
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.
-rw-r--r--[l---------]units/user/bluetooth.target14
-rw-r--r--[l---------]units/user/paths.target13
-rw-r--r--[l---------]units/user/printer.target14
-rw-r--r--[l---------]units/user/shutdown.target15
-rw-r--r--[l---------]units/user/smartcard.target14
-rw-r--r--[l---------]units/user/sockets.target13
-rw-r--r--[l---------]units/user/sound.target14
-rw-r--r--[l---------]units/user/timers.target16
8 files changed, 105 insertions, 8 deletions
diff --git a/units/user/bluetooth.target b/units/user/bluetooth.target
index 72e74be0a..62407d363 120000..100644
--- a/units/user/bluetooth.target
+++ b/units/user/bluetooth.target
@@ -1 +1,13 @@
-../bluetooth.target \ No newline at end of file
+# 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
index 33545d24f..9b6ed1c13 120000..100644
--- a/units/user/paths.target
+++ b/units/user/paths.target
@@ -1 +1,12 @@
-../paths.target \ No newline at end of file
+# 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
index 8b8d5511c..e1fb0d4e3 120000..100644
--- a/units/user/printer.target
+++ b/units/user/printer.target
@@ -1 +1,13 @@
-../printer.target \ No newline at end of file
+# 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
index a9de83782..d48e6d649 120000..100644
--- a/units/user/shutdown.target
+++ b/units/user/shutdown.target
@@ -1 +1,14 @@
-../shutdown.target \ No newline at end of file
+# 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
index f7a23b6b6..717ea2311 120000..100644
--- a/units/user/smartcard.target
+++ b/units/user/smartcard.target
@@ -1 +1,13 @@
-../smartcard.target \ No newline at end of file
+# 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
index a9e4b9718..9af67fdb1 120000..100644
--- a/units/user/sockets.target
+++ b/units/user/sockets.target
@@ -1 +1,12 @@
-../sockets.target \ No newline at end of file
+# 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
index 17c8e9d6e..19afc2a63 120000..100644
--- a/units/user/sound.target
+++ b/units/user/sound.target
@@ -1 +1,13 @@
-../sound.target \ No newline at end of file
+# 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
index f98b68a84..b1aa8c797 120000..100644
--- a/units/user/timers.target
+++ b/units/user/timers.target
@@ -1 +1,15 @@
-../timers.target \ No newline at end of file
+# 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