From 634cc94f475b5683a30a13cba1a27fccb409ffcb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 13 Dec 2018 20:19:45 +0100 Subject: [PATCH] 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. --- units/user/bluetooth.target | 14 +++++++++++++- units/user/paths.target | 13 ++++++++++++- units/user/printer.target | 14 +++++++++++++- units/user/shutdown.target | 15 ++++++++++++++- units/user/smartcard.target | 14 +++++++++++++- units/user/sockets.target | 13 ++++++++++++- units/user/sound.target | 14 +++++++++++++- units/user/timers.target | 16 +++++++++++++++- 8 files changed, 105 insertions(+), 8 deletions(-) mode change 120000 => 100644 units/user/bluetooth.target mode change 120000 => 100644 units/user/paths.target mode change 120000 => 100644 units/user/printer.target mode change 120000 => 100644 units/user/shutdown.target mode change 120000 => 100644 units/user/smartcard.target mode change 120000 => 100644 units/user/sockets.target mode change 120000 => 100644 units/user/sound.target mode change 120000 => 100644 units/user/timers.target diff --git a/units/user/bluetooth.target b/units/user/bluetooth.target deleted file mode 120000 index 72e74be0a10..00000000000 --- 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 index 00000000000..62407d363e4 --- /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 index 33545d24f31..00000000000 --- 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 index 00000000000..9b6ed1c13fe --- /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 index 8b8d5511cd9..00000000000 --- 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 index 00000000000..e1fb0d4e347 --- /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 index a9de83782f5..00000000000 --- 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 index 00000000000..d48e6d64942 --- /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 index f7a23b6b6df..00000000000 --- 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 index 00000000000..717ea2311df --- /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 index a9e4b971846..00000000000 --- 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 index 00000000000..9af67fdb1fa --- /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 index 17c8e9d6e14..00000000000 --- 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 index 00000000000..19afc2a6373 --- /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 index f98b68a84d8..00000000000 --- 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 index 00000000000..b1aa8c797cc --- /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 -- 2.47.3