diff options
77 files changed, 318 insertions, 267 deletions
diff --git a/Makefile.am b/Makefile.am index 292f63c408..c536df7788 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3914,7 +3914,8 @@ gperf_gperf_sources += \ libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ - $(KMOD_CFLAGS) + $(KMOD_CFLAGS) \ + -D UDEV_PROPAGATE_LOG libudev_core_la_LIBADD = \ libsystemd-network.la \ @@ -4089,6 +4090,10 @@ EXTRA_DIST += \ ata_id_SOURCES = \ src/udev/ata_id/ata_id.c +ata_id_CFLAGS = \ + $(AM_CFLAGS) + -D UDEV_PROPAGATE_LOG + ata_id_LDADD = \ libshared.la @@ -4099,6 +4104,10 @@ udevlibexec_PROGRAMS += \ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c +cdrom_id_CFLAGS = \ + $(AM_CFLAGS) + -D UDEV_PROPAGATE_LOG + cdrom_id_LDADD = \ libshared.la @@ -4112,6 +4121,10 @@ dist_udevrules_DATA += \ collect_SOURCES = \ src/udev/collect/collect.c +collect_CFLAGS = \ + $(AM_CFLAGS) + -D UDEV_PROPAGATE_LOG + collect_LDADD = \ libshared.la @@ -4125,6 +4138,10 @@ scsi_id_SOURCES =\ src/udev/scsi_id/scsi.h \ src/udev/scsi_id/scsi_id.h +scsi_id_CFLAGS = \ + $(AM_CFLAGS) + -D UDEV_PROPAGATE_LOG + scsi_id_LDADD = \ libshared.la @@ -4153,6 +4170,10 @@ mtd_probe_SOURCES = \ src/udev/mtd_probe/mtd_probe.h \ src/udev/mtd_probe/probe_smartmedia.c +mtd_probe_CFLAGS = \ + $(AM_CFLAGS) + -D UDEV_PROPAGATE_LOG + dist_udevrules_DATA += \ rules/75-probe_mtd.rules @@ -35,6 +35,10 @@ CHANGES WITH 233 in spe during startup. If no such message is sent, the service now fails, even if the main process exited with a successful exit code. + * Services that fail to start up correctly now always have their + ExecStopPost= commands executed. Previously, they'd enter "failed" + state directly, without executing these commands. + * The option MulticastDNS= of network configuration files has acquired an actual implementation. With MulticastDNS=yes a host can resolve names of remote hosts and to reply to mDNS's A and AAAA requests from @@ -353,6 +357,13 @@ CHANGES WITH 233 in spe CHANGES WITH 232: + * udev now runs with MemoryDenyWriteExecute=, RestrictRealtime= and + RestrictAddressFamilies= enabled. These sandboxing options should + generally be compatible with the various external udev call-out + binaries we are aware of, however there may be exceptions, in + particular when exotic languages for these call-outs are used. In + this case, consider turning off these settings locally. + * The new RemoveIPC= option can be used to remove IPC objects owned by the user or group of a service when that service exits. @@ -2204,7 +2215,7 @@ CHANGES WITH 220: gudev from the Gnome project instead. gudev is still included in systemd, for now. It will be removed soon, though. Please also see the announcement-thread on systemd-devel: - http://lists.freedesktop.org/archives/systemd-devel/2015-May/032070.html + https://lists.freedesktop.org/archives/systemd-devel/2015-May/032070.html * systemd now exposes a CPUUsageNSec= property for each service unit on the bus, that contains the overall consumed @@ -4107,7 +4118,7 @@ CHANGES WITH 211: also supports LUKS-encrypted partitions now. With this in place, automatic discovery of partitions to mount following the Discoverable Partitions Specification - (http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec) + (https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec) is now a lot more complete. This allows booting without /etc/fstab and without root= on the kernel command line on systems prepared appropriately. @@ -5459,7 +5470,7 @@ CHANGES WITH 199: * A new libsystemd-bus module has been added that implements a pretty complete D-Bus client library. For details see: - http://lists.freedesktop.org/archives/systemd-devel/2013-March/009797.html + https://lists.freedesktop.org/archives/systemd-devel/2013-March/009797.html * journald will now explicitly flush the journal files to disk at the latest 5min after each write. The file will then also @@ -5609,7 +5620,7 @@ CHANGES WITH 198: only in conjunction with Gummiboot, but could be supported by other boot loaders too. For details see: - http://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface + https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface * A new generator has been added that automatically mounts the EFI System Partition (ESP) to /boot, if that directory @@ -5685,7 +5696,7 @@ CHANGES WITH 198: * A new tool kernel-install has been added that can install kernel images according to the Boot Loader Specification: - http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec + https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec * Boot time console output has been improved to provide animated boot time output for hanging jobs. @@ -5775,7 +5786,7 @@ CHANGES WITH 197: of these policies is now the default. Please see this wiki document for details: - http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames + https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames * Auke Kok's bootchart implementation has been added to the systemd tree. It is an optional component that can graph the @@ -5923,7 +5934,7 @@ CHANGES WITH 196: indexed database to link up additional information with journal entries. For further details please check: - http://www.freedesktop.org/wiki/Software/systemd/catalog + https://www.freedesktop.org/wiki/Software/systemd/catalog The indexed message catalog database also needs to be rebuilt after installation of message catalog files. Use @@ -6775,7 +6786,7 @@ CHANGES WITH 183: * A framework for implementing offline system updates is now integrated, for details see: - http://freedesktop.org/wiki/Software/systemd/SystemUpdates + https://www.freedesktop.org/wiki/Software/systemd/SystemUpdates * A new service type Type=idle is available now which helps us avoiding ugly interleaving of getty output and boot status @@ -7056,7 +7067,7 @@ CHANGES WITH 39: * New unit file option ControlGroupPersistent= to make cgroups persistent, following the mechanisms outlined in - http://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups + https://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups * Support multiple local RTCs in a sane way @@ -7143,7 +7154,7 @@ CHANGES WITH 38: * Processes with '@' in argv[0][0] are now excluded from the final shut-down killing spree, following the logic explained in: - http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons + https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons * All processes remaining in a service cgroup when we enter the START or START_PRE states are now killed with @@ -4,7 +4,7 @@ DETAILS: http://0pointer.de/blog/projects/systemd.html WEB SITE: - http://www.freedesktop.org/wiki/Software/systemd + https://www.freedesktop.org/wiki/Software/systemd GIT: git@github.com:systemd/systemd.git @@ -14,7 +14,7 @@ GITWEB: https://github.com/systemd/systemd MAILING LIST: - http://lists.freedesktop.org/mailman/listinfo/systemd-devel + https://lists.freedesktop.org/mailman/listinfo/systemd-devel IRC: #systemd on irc.freenode.org @@ -269,7 +269,7 @@ WARNINGS: requires that /var/run is a symlink to /run. For more information on this issue consult - http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken + https://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken To run systemd under valgrind, compile with VALGRIND defined (e.g. ./configure CPPFLAGS='... -DVALGRIND=1'). Otherwise, @@ -5,7 +5,7 @@ ## Details -General information about systemd can be found in the [systemd Wiki](http://www.freedesktop.org/wiki/Software/systemd). +General information about systemd can be found in the [systemd Wiki](https://www.freedesktop.org/wiki/Software/systemd). Information about build requirements are provided in the [README file](../master/README). @@ -17,4 +17,4 @@ Please see our [Contribution Guidelines](../master/.github/CONTRIBUTING.md) for When preparing patches for systemd, please follow our [Coding Style Guidelines](../master/CODING_STYLE). -If you are looking for support, please contact our [mailing list](http://lists.freedesktop.org/mailman/listinfo/systemd-devel) or join our [IRC channel](irc://irc.freenode.org/%23systemd). +If you are looking for support, please contact our [mailing list](https://lists.freedesktop.org/mailman/listinfo/systemd-devel) or join our [IRC channel](irc://irc.freenode.org/%23systemd). diff --git a/catalog/systemd.be.catalog.in b/catalog/systemd.be.catalog.in index 5b237f0558..5b1cdf2492 100644 --- a/catalog/systemd.be.catalog.in +++ b/catalog/systemd.be.catalog.in @@ -20,7 +20,7 @@ # Belarusian translation # Фармат каталога апісаны на старонцы -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -94,7 +94,7 @@ Documentation: man:core(5) Subject: Новая сесія № @SESSION_ID@ створана для карыстальніка @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Новая сесія з № @SESSION_ID@ створана для карыстальніка @USER_ID@. @@ -104,7 +104,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сесія № @SESSION_ID@ спынена Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Сесія № @SESSION_ID@ спынена. @@ -112,7 +112,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Даступна новае працоўнае месца № @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Новае працоўнае месца № @SEAT_ID@ наладжана і даступна для выкарыстання. @@ -120,7 +120,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Працоўнае месца № @SEAT_ID@ выдалена Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Працоўнае месца № @SEAT_ID@ выдалена і больш не даступна. diff --git a/catalog/systemd.be@latin.catalog.in b/catalog/systemd.be@latin.catalog.in index fc9f7cad16..764432c0dc 100644 --- a/catalog/systemd.be@latin.catalog.in +++ b/catalog/systemd.be@latin.catalog.in @@ -20,7 +20,7 @@ # Belarusian Latin translation # Farmat kataloha apisany na staroncy -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -95,7 +95,7 @@ Rekamiendujecca paviedamić ab hetym raspracoŭnikam. Subject: Novaja siesija № @SESSION_ID@ stvorana dlia karystaĺnika @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Novaja siesija z № @SESSION_ID@ stvorana dlia karystaĺnika @USER_ID@. @@ -105,7 +105,7 @@ Lidar hetaj siesii pad № @LEADER@. Subject: Siesija № @SESSION_ID@ spyniena Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Siesija № @SESSION_ID@ spyniena. @@ -113,7 +113,7 @@ Siesija № @SESSION_ID@ spyniena. Subject: Dastupna novaje pracoŭnaje miesca № @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Novaje pracoŭnaje miesca № @SEAT_ID@ naladžana i dastupna dlia vykarystannia. @@ -122,7 +122,7 @@ vykarystannia. Subject: Pracoŭnaje miesca № @SEAT_ID@ vydaliena Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Pracoŭnaje miesca № @SEAT_ID@ vydaliena i boĺš nie dastupna. diff --git a/catalog/systemd.bg.catalog.in b/catalog/systemd.bg.catalog.in index 76b0ce8f17..4b6cf118be 100644 --- a/catalog/systemd.bg.catalog.in +++ b/catalog/systemd.bg.catalog.in @@ -19,7 +19,7 @@ # Message catalog for systemd's own messages # The catalog format is documented on -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -95,7 +95,7 @@ Documentation: man:core(5) Subject: Създадена е нова сесия № @SESSION_ID@ за потребителя „@USER_ID@“ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat За потребителя „@USER_ID@“ е създадена нова сесия № @SESSION_ID@. @@ -105,7 +105,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сесия № @SESSION_ID@ приключи Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Сесия № @SESSION_ID@ приключи работа. @@ -113,7 +113,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Налично е ново работно място № @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Новото работно място № @SEAT_ID@ е настроено и готово за работа. @@ -121,7 +121,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Работното място № @SEAT_ID@ е премахнато Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Работното място № @SEAT_ID@ вече не е налично. diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index cb0ac0ca88..9cd3e6bac3 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -18,7 +18,7 @@ # Message catalog for systemd's own messages # The catalog format is documented on -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -115,7 +115,7 @@ als Fehler dem jeweiligen Hersteller gemeldet werden. Subject: A new session @SESSION_ID@ has been created for user @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat A new session with the ID @SESSION_ID@ has been created for the user @USER_ID@. @@ -125,7 +125,7 @@ The leading process of the session is @LEADER@. Subject: Session @SESSION_ID@ has been terminated Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat A session with the ID @SESSION_ID@ has been terminated. @@ -133,7 +133,7 @@ A session with the ID @SESSION_ID@ has been terminated. Subject: A new seat @SEAT_ID@ is now available Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat A new seat @SEAT_ID@ has been configured and is now available. @@ -141,7 +141,7 @@ A new seat @SEAT_ID@ has been configured and is now available. Subject: Seat @SEAT_ID@ has now been removed Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat A seat @SEAT_ID@ has been removed and is no longer available. diff --git a/catalog/systemd.da.catalog.in b/catalog/systemd.da.catalog.in index bc7d94476f..a5570f47d5 100644 --- a/catalog/systemd.da.catalog.in +++ b/catalog/systemd.da.catalog.in @@ -19,7 +19,7 @@ # Danish translation # The catalog format is documented on -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -79,7 +79,7 @@ og burde blive reporteret som en bug til folkene bag Subject: En ny session @SESSION_ID@ er blevet lavet for bruger @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat En ny session med ID @SESSION_ID@ er blevet lavet for brugeren @USER_ID@. @@ -89,7 +89,7 @@ Den ledende process for sessionen er @LEADER@. Subject: Session @SESSION_ID@ er blevet lukket ned Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat En session med ID @SESSION_ID@ er blevet lukket ned. @@ -97,7 +97,7 @@ En session med ID @SESSION_ID@ er blevet lukket ned. Subject: En ny arbejdsstation $SEAT_ID@ er nu tilgængelig Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat En ny arbejdsstation @SEAT_ID@ er blevet konfigureret og er nu tilgængelig. @@ -105,7 +105,7 @@ En ny arbejdsstation @SEAT_ID@ er blevet konfigureret og er nu tilgængelig. Subject: Arbejdsstation @SEAT_ID@ er nu blevet fjernet Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat En arbejdsstation @SEAT_ID@ er blevet fjernet og er ikke længere tilgængelig. diff --git a/catalog/systemd.fr.catalog.in b/catalog/systemd.fr.catalog.in index d69dd0a520..c4b1a81ceb 100644 --- a/catalog/systemd.fr.catalog.in +++ b/catalog/systemd.fr.catalog.in @@ -20,7 +20,7 @@ # French translation # Le format du catalogue de messages est décrit (en anglais) içi : -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog -- f77379a8490b408bbe5f6940505a777b Subject: Le journal a été démarré @@ -96,7 +96,7 @@ incriminé, et cela devrait être notifié à son concepteur comme un défaut (b Subject: Une nouvelle session @SESSION_ID@ a été créée pour l'utilisateur @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Une nouvelle session a été créée pour l'utilisateur @USER_ID@ avec l'identifiant (ID) @SESSION_ID@. @@ -107,7 +107,7 @@ Le processus maître de la session est @LEADER@. Subject: La session @SESSION_ID@ s'est terminée Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat La session d'identifiant (ID) @SESSION_ID@ s'est terminée. @@ -115,7 +115,7 @@ La session d'identifiant (ID) @SESSION_ID@ s'est terminée. Subject: Un nouveau poste (seat) @SEAT_ID@ est disponible Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Un nouveau poste (seat) @SEAT_ID@ a été configuré et est maintenant disponible. @@ -124,7 +124,7 @@ disponible. Subject: Le poste (seat) @SEAT_ID@ a été retiré Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Le poste (seat) @SEAT_ID@ a été retiré et n'est plus disponible. diff --git a/catalog/systemd.hr.catalog.in b/catalog/systemd.hr.catalog.in index 7502aed741..d30e955e28 100644 --- a/catalog/systemd.hr.catalog.in +++ b/catalog/systemd.hr.catalog.in @@ -19,7 +19,7 @@ # Croatian translation # Format kataloga je dokumentiran na -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # Za pojašnjenje zašto ovo radimo, posjetite https://xkcd.com/1024/ @@ -93,7 +93,7 @@ trebalo bi se prijaviti razvijatelju kao greška. Subject: Nova sesija @SESSION_ID@ je stvorena za korisnika @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Nova sesija sa ID @SESSION_ID@ je stvorena za korisnika @USER_ID@. @@ -103,7 +103,7 @@ Glavni proces sesije je @LEADER@. Subject: Sesija @SESSION_ID@ je prekinuta Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Sesija sa ID @SESSION_ID@ je prekinuta. @@ -111,7 +111,7 @@ Sesija sa ID @SESSION_ID@ je prekinuta. Subject: Novo sjedište @SEAT_ID@ je sada dostupno Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Novo sjedište @SEAT_ID@ je podešeno i sada je dostupno. @@ -119,7 +119,7 @@ Novo sjedište @SEAT_ID@ je podešeno i sada je dostupno. Subject: Sjedište @SEAT_ID@ je sada uklonjeno Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Sjedište @SEAT_ID@ je uklonjeno i više nije dostupno. diff --git a/catalog/systemd.hu.catalog.in b/catalog/systemd.hu.catalog.in index f538b7f958..23c1cd44db 100644 --- a/catalog/systemd.hu.catalog.in +++ b/catalog/systemd.hu.catalog.in @@ -19,7 +19,7 @@ # Message catalog for systemd's own messages # The catalog format is documented on -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -78,7 +78,7 @@ a szállítója felé kell bejelenteni. Subject: Új munkamenet (@SESSION_ID@) létrehozva, felhasználója: @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Létrejött egy új munkamenet @SESSION_ID@ azonosítóval ezen felhasználóhoz: @USER_ID@. @@ -89,7 +89,7 @@ A munkamenet vezető folyamata: @LEADER@. Subject: Munkamenet (@SESSION_ID@) befejezve Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat A következő azonosítójú munkamenet befejeződött: @SESSION_ID@. @@ -97,7 +97,7 @@ A következő azonosítójú munkamenet befejeződött: @SESSION_ID@. Subject: Elérhető egy új munkaállomás: @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Beállításra kerül és használható egy új munkaállomás: @SEAT_ID@. @@ -105,7 +105,7 @@ Beállításra kerül és használható egy új munkaállomás: @SEAT_ID@. Subject: A munkaállomás eltávolítva: @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat A munkaállomás el lett távolítva, és már nem érhető el: @SEAT_ID@ diff --git a/catalog/systemd.it.catalog.in b/catalog/systemd.it.catalog.in index 02c35f1f69..208ac2bfdc 100644 --- a/catalog/systemd.it.catalog.in +++ b/catalog/systemd.it.catalog.in @@ -98,7 +98,7 @@ segnalare la troncatura. Subject: La nuova sessione @SESSION_ID@ è stata creata per l'utente @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Una nuova sessione con ID @SESSION_ID@ è stata creata per l'utente @USER_ID@. @@ -108,7 +108,7 @@ Il processo primario della sessione è @LEADER@. Subject: La sessione @SESSION_ID@ è terminata Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat La sessione con ID @SESSION_ID@ è terminata. @@ -116,7 +116,7 @@ La sessione con ID @SESSION_ID@ è terminata. Subject: La nuova postazione @SEAT_ID@ è ora disponibile Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile. @@ -124,7 +124,7 @@ La nuova postazione @SEAT_ID@ è stata configurata ed è ora disponibile. Subject: La postazione @SEAT_ID@ è stata rimossa Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat La postazione @SEAT_ID@ è stata rimossa e non è più disponibile. diff --git a/catalog/systemd.ko.catalog.in b/catalog/systemd.ko.catalog.in index 0249cba747..4e8d7008c3 100644 --- a/catalog/systemd.ko.catalog.in +++ b/catalog/systemd.ko.catalog.in @@ -19,7 +19,7 @@ # Korean translation # The catalog format is documented on -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ # @@ -101,7 +101,7 @@ Documentation: man:core(5) Subject: @USER_ID@ 사용자의 새 @SESSION_ID@ 세션 만듦 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat @USER_ID@ 사용자의 새 @SESSION_ID@ 세션을 만들었습니다. @@ -111,7 +111,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: @SESSION_ID@ 세션 마침 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat @SESSION_ID@ 세션을 끝냈습니다. @@ -119,7 +119,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 새 @SEAT_ID@ 시트 사용할 수 있음 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 새 @SEAT_ID@ 시트를 설정했고 사용할 수 있습니다. @@ -127,7 +127,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: @SEAT_ID@ 시트 제거함 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat @SEAT_ID@ 시트를 제거했으며 더이상 사용할 수 없습니다. diff --git a/catalog/systemd.pl.catalog.in b/catalog/systemd.pl.catalog.in index a93c63d0f6..981fefb7b9 100644 --- a/catalog/systemd.pl.catalog.in +++ b/catalog/systemd.pl.catalog.in @@ -20,7 +20,7 @@ # Polish translation # The catalog format is documented on -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -106,7 +106,7 @@ gdb(1) będą ostrzegały o skróceniu pliku. Subject: Utworzono nową sesję @SESSION_ID@ dla użytkownika @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Nowa sesja o identyfikatorze @SESSION_ID@ została utworzona dla użytkownika @USER_ID@. @@ -117,7 +117,7 @@ Proces prowadzący sesji: @LEADER@. Subject: Zakończono sesję @SESSION_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Sesja o identyfikatorze @SESSION_ID@ została zakończona. @@ -125,7 +125,7 @@ Sesja o identyfikatorze @SESSION_ID@ została zakończona. Subject: Dostępne jest nowe stanowisko @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. @@ -133,7 +133,7 @@ Nowe stanowisko @SEAT_ID@ zostało skonfigurowane i jest teraz dostępne. Subject: Usunięto stanowisko @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Stanowisko @SEAT_ID@ zostało usunięte i nie jest już dostępne. diff --git a/catalog/systemd.pt_BR.catalog.in b/catalog/systemd.pt_BR.catalog.in index e461c2b2ba..192fd33c1c 100644 --- a/catalog/systemd.pt_BR.catalog.in +++ b/catalog/systemd.pt_BR.catalog.in @@ -19,7 +19,7 @@ # Catálogo de mensagens para as mensagens do próprio systemd # O formato do catálogo está documentado em -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # Para uma explicação do porquê de fazermos tudo isso, veja # https://xkcd.com/1024/ @@ -79,7 +79,7 @@ deveria ser relatado para seu fabricante como um erro. Subject: A nova sessão @SESSION_ID@ foi criada para usuário o @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Uma nova sessão com o ID @SESSION_ID@ foi criada para o usuário @USER_ID@. @@ -89,7 +89,7 @@ O processo originador da sessão é @LEADER@. Subject: Sessão @SESSION_ID@ foi terminada Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Um sessão com o ID @SESSION_ID@ foi terminada. @@ -97,7 +97,7 @@ Um sessão com o ID @SESSION_ID@ foi terminada. Subject: Um novo seat @SEAT_ID@ está disponível Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Um novo seat @SEAT_ID@ foi configurado e está disponível. @@ -105,7 +105,7 @@ Um novo seat @SEAT_ID@ foi configurado e está disponível. Subject: Seat @SEAT_ID@ foi removido agora Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Um seat @SEAT_ID@ foi removido e não está mais disponível. diff --git a/catalog/systemd.ru.catalog.in b/catalog/systemd.ru.catalog.in index 3ee1ed63c0..367ed89d96 100644 --- a/catalog/systemd.ru.catalog.in +++ b/catalog/systemd.ru.catalog.in @@ -20,7 +20,7 @@ # Russian translation # Формат каталога сообщений описан по ссылке -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # Перед каждым элементом в комментарии указан Subject исходного # сообщения (на английском). @@ -119,7 +119,7 @@ Documentation: man:coredump.conf(5) Subject: Для пользователя @USER_ID@ создан новый сеанс @SESSION_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Для пользователя @USER_ID@ создан новый сеанс с идентификатором @SESSION_ID@. @@ -130,7 +130,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сеанс @SESSION_ID@ завершен Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Сеанс с идентификатором @SESSION_ID@ завершился. @@ -139,7 +139,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Добавлено новое рабочее место @SEAT_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Новое рабочее место (seat) @SEAT_ID@ полностью настроено и готово к использованию. @@ -149,7 +149,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Рабочее место @SEAT_ID@ отключено Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Рабочее место (seat) @SEAT_ID@ было отключено. diff --git a/catalog/systemd.sr.catalog.in b/catalog/systemd.sr.catalog.in index 06a0ff648c..674eb557b5 100644 --- a/catalog/systemd.sr.catalog.in +++ b/catalog/systemd.sr.catalog.in @@ -19,7 +19,7 @@ # Serbian translation # Формат каталога је документован на -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # Да бисте видели зашто ово радимо, погледајте https://xkcd.com/1024/ @@ -78,7 +78,7 @@ Documentation: man:core(5) Subject: Нова сесија @SESSION_ID@ је направљена за корисника @USER_ID@ Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Нова сесија са ИБ-ом @SESSION_ID@ је направљена за корисника @USER_ID@. @@ -88,7 +88,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Сесија @SESSION_ID@ је окончана Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Сесија са ИБ-ом @SESSION_ID@ је окончана. @@ -96,7 +96,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Ново седиште @SEAT_ID@ је сада доступно Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Ново седиште @SEAT_ID@ је исподешавано и сада је доступно. @@ -104,7 +104,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: Седиште @SEAT_ID@ је сада уклоњено Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat Седиште @SEAT_ID@ је сада уклоњено и више није доступно. diff --git a/catalog/systemd.zh_CN.catalog.in b/catalog/systemd.zh_CN.catalog.in index 13030e14dc..78a8a8ca62 100644 --- a/catalog/systemd.zh_CN.catalog.in +++ b/catalog/systemd.zh_CN.catalog.in @@ -20,7 +20,7 @@ # Simplified Chinese translation # 本 catalog 文档格式被记载在 -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # 如需了解我们为什么做这些工作，请见 https://xkcd.com/1024/ @@ -76,7 +76,7 @@ Documentation: man:core(5) Subject: 一个新会话 @SESSION_ID@ 已为用户 @USER_ID@ 建立 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 一个 ID 为 @SESSION_ID@ 的新会话已为用户 @USER_ID@ 建立。 @@ -86,7 +86,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 会话 @SESSION_ID@ 已终止 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 一个 ID 为 @SESSION_ID@ 的会话已终止。 @@ -94,7 +94,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 一个新的座位 @SEAT_ID@ 可用 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 一个新的座位 @SEAT_ID@ 已被配置并已可用。 @@ -102,7 +102,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 座位 @SEAT_ID@ 已被移除 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 座位 @SEAT_ID@ 已被移除并不再可用。 diff --git a/catalog/systemd.zh_TW.catalog.in b/catalog/systemd.zh_TW.catalog.in index f7b42fa1c7..d262b88a01 100644 --- a/catalog/systemd.zh_TW.catalog.in +++ b/catalog/systemd.zh_TW.catalog.in @@ -20,7 +20,7 @@ # Traditional Chinese translation # Catalog 的格式記錄於 -# http://www.freedesktop.org/wiki/Software/systemd/catalog +# https://www.freedesktop.org/wiki/Software/systemd/catalog # For an explanation why we do all this, see https://xkcd.com/1024/ @@ -79,7 +79,7 @@ Documentation: man:core(5) Subject: 新的工作階段 @SESSION_ID@ 已為使用者 @USER_ID@ 建立 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 一個新的工作階段，ID @SESSION_ID@ 已為使用者 @USER_ID@ 建立。 @@ -89,7 +89,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 工作階段 @SESSION_ID@ 已結束 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 一個工作階段，ID @SESSION_ID@ 已結束。 @@ -97,7 +97,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 新的座位 @SEAT_ID@ 可用 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 一個新的座位 @SEAT_ID@ 已被設定且現在可用。 @@ -105,7 +105,7 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat Subject: 座位 @SEAT_ID@ 已被移除 Defined-By: systemd Support: %SUPPORT_URL% -Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat +Documentation: https://www.freedesktop.org/wiki/Software/systemd/multiseat 座位 @SEAT_ID@ 已被移除且不再可用。 diff --git a/configure.ac b/configure.ac index 0e7bd1b76b..156511851c 100644 --- a/configure.ac +++ b/configure.ac @@ -21,9 +21,9 @@ AC_PREREQ([2.64]) AC_INIT([systemd], [233], - [http://github.com/systemd/systemd/issues], + [https://github.com/systemd/systemd/issues], [systemd], - [http://www.freedesktop.org/wiki/Software/systemd]) + [https://www.freedesktop.org/wiki/Software/systemd]) AC_CONFIG_SRCDIR([src/core/main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -581,7 +581,7 @@ AC_ARG_WITH([support-url], AS_HELP_STRING([--with-support-url=URL], [specify the support URL to show in catalog entries included in systemd]), [SUPPORT_URL="$withval"], - [SUPPORT_URL=http://lists.freedesktop.org/mailman/listinfo/systemd-devel]) + [SUPPORT_URL=https://lists.freedesktop.org/mailman/listinfo/systemd-devel]) AC_SUBST(SUPPORT_URL) diff --git a/docs/sysvinit/README.in b/docs/sysvinit/README.in index 996402d06b..de5d80d902 100644 --- a/docs/sysvinit/README.in +++ b/docs/sysvinit/README.in @@ -24,4 +24,4 @@ Further reading: man:systemctl(1) man:systemd(1) http://0pointer.de/blog/projects/systemd-for-admins-3.html - http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities + https://www.freedesktop.org/wiki/Software/systemd/Incompatibilities diff --git a/man/bootctl.xml b/man/bootctl.xml index e2575a4751..675e0174e9 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -118,8 +118,8 @@ <refsect1> <title>See Also</title> <para> - <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Systemd boot loader interface</ulink> + <ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Systemd boot loader interface</ulink> </para> </refsect1> </refentry> diff --git a/man/busctl.xml b/man/busctl.xml index f63d0d5bab..28b36f09d0 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -472,7 +472,7 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting> <para> <citerefentry project='dbus'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <ulink url="http://freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, + <ulink url="https://www.freedesktop.org/wiki/Software/dbus">D-Bus</ulink>, <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml index 538a592f8d..ab52ccfe0c 100644 --- a/man/file-hierarchy.xml +++ b/man/file-hierarchy.xml @@ -502,7 +502,7 @@ url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG Base Directory Specification</ulink>. Additional locations for high-level user resources are defined by <ulink - url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs/">xdg-user-dirs</ulink>.</para> + url="https://www.freedesktop.org/wiki/Software/xdg-user-dirs/">xdg-user-dirs</ulink>.</para> <variablelist> <varlistentry> diff --git a/man/journalctl.xml b/man/journalctl.xml index eacba048bc..75bbc10215 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -318,7 +318,7 @@ <para>serializes the journal into a binary (but mostly text-based) stream suitable for backups and network transfer (see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> for more information). To import the binary stream back into native journald format use <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> @@ -332,7 +332,7 @@ <listitem> <para>formats entries as JSON data structures, one per line (see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink> for more information).</para> </listitem> </varlistentry> @@ -401,7 +401,7 @@ manuals. Note that help texts are not available for all messages, but only for selected ones. For more information on the message catalog, please refer to the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Message Catalog Developer Documentation</ulink>.</para> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/catalog">Message Catalog Developer Documentation</ulink>.</para> <para>Note: when attaching <command>journalctl</command> output to bug reports, please do <emphasis>not</emphasis> use diff --git a/man/kernel-install.xml b/man/kernel-install.xml index 99b7970457..94b6b1110d 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml @@ -189,7 +189,7 @@ <para> <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>, - <ulink url="http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> + <ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink> </para> </refsect1> diff --git a/man/sd-bus.xml b/man/sd-bus.xml index 66b1c96c15..6439395549 100644 --- a/man/sd-bus.xml +++ b/man/sd-bus.xml @@ -62,7 +62,7 @@ <title>Description</title> <para><filename>sd-bus.h</filename> provides an implementation of a D-Bus IPC client. See - <ulink url="http://www.freedesktop.org/software/dbus/" /> + <ulink url="https://www.freedesktop.org/software/dbus/" /> for more information about D-Bus IPC. </para> diff --git a/man/sd-login.xml b/man/sd-login.xml index 328f71164d..6861fbe257 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -67,7 +67,7 @@ local system. </para> <para>See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat + url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> for an introduction into multi-seat support on Linux, the background for this set of APIs.</para> diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml index 35ec46f63e..604deb4e8c 100644 --- a/man/sd_journal_get_catalog.xml +++ b/man/sd_journal_get_catalog.xml @@ -90,7 +90,7 @@ <para>For more information about the journal message catalog please refer to the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/catalog">Journal Message Catalogs</ulink> documentation page.</para> </refsect1> diff --git a/man/systemctl.xml b/man/systemctl.xml index 25db00e5f6..d0b39d771b 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1181,7 +1181,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err <para>For more information on the preset policy format, see <citerefentry><refentrytitle>systemd.preset</refentrytitle><manvolnum>5</manvolnum></citerefentry>. For more information on the concept of presets, please consult the - <ulink url="http://freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/Preset">Preset</ulink> document.</para> </listitem> </varlistentry> diff --git a/man/systemd-ask-password-console.service.xml b/man/systemd-ask-password-console.service.xml index 479e5f2e5b..3c1537d942 100644 --- a/man/systemd-ask-password-console.service.xml +++ b/man/systemd-ask-password-console.service.xml @@ -71,7 +71,7 @@ properly notified.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> + url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> developer documentation</ulink> for more information about the system password logic.</para> diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index 8d3355819b..51d8ef5d82 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -109,7 +109,7 @@ <para>Additional password agents may be implemented according to the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd + url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd Password Agent Specification</ulink>.</para> <para>If a password is queried on a TTY, the user may press TAB to diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml index 7243467dc2..2c285bcb22 100644 --- a/man/systemd-coredump.xml +++ b/man/systemd-coredump.xml @@ -91,7 +91,7 @@ <para>It is also possible to invoke <command>systemd-coredump</command> with <option>--backtrace</option> option. In this case, <command>systemd-coredump</command> expects a journal entry in the journal - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> on standard input. The entry should contain a <varname>MESSAGE=</varname> field and any additional metadata fields the caller deems reasonable. <command>systemd-coredump</command> will append additional metadata fields in the same way it does for core dumps received from the kernel. In diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml index fb8b06714d..73bd5b78ab 100644 --- a/man/systemd-cryptsetup@.service.xml +++ b/man/systemd-cryptsetup@.service.xml @@ -61,7 +61,7 @@ <para><filename>systemd-cryptsetup@.service</filename> will ask for hard disk passwords via the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> + url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents"> password agent logic</ulink>, in order to query the user for the password using the right mechanism at boot and during runtime.</para> diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml index 338925964d..8bff3bb7f4 100644 --- a/man/systemd-getty-generator.xml +++ b/man/systemd-getty-generator.xml @@ -64,7 +64,7 @@ <filename>container-getty@.service</filename> instances for additional container pseudo TTYs as requested by the container manager (see <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/"><filename>Container + url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/"><filename>Container Interface</filename></ulink>). This should ensure that the user is shown a login prompt at the right place, regardless of which environment the system is started in. For example, it is diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index 3af423b553..eb7a2c4c28 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -62,7 +62,7 @@ partitions and creates mount and swap units for them, based on the partition type GUIDs of GUID partition tables (GPT). It implements the <ulink - url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable + url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>. Note that this generator has no effect on non-GPT systems, or where the directories under the mount points are already non-empty. Also, on systems where the diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml index 6990d41b02..17755aa69e 100644 --- a/man/systemd-hostnamed.service.xml +++ b/man/systemd-hostnamed.service.xml @@ -66,7 +66,7 @@ is a command line client to this service.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/hostnamed"> + url="https://www.freedesktop.org/wiki/Software/systemd/hostnamed"> developer documentation</ulink> for information about the APIs <filename>systemd-hostnamed</filename> provides.</para> </refsect1> diff --git a/man/systemd-importd.service.xml b/man/systemd-importd.service.xml index 8fdced475c..70a618ce46 100644 --- a/man/systemd-importd.service.xml +++ b/man/systemd-importd.service.xml @@ -64,7 +64,7 @@ <command>import-tar</command>, <command>export-raw</command>, and <command>export-tar</command> commands.</para> <para>See the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/importd"> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/importd"> importd D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-importd</filename> provides.</para> </refsect1> diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index ce169960d8..09b82b82c1 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -72,7 +72,7 @@ should not be interrupted.</para> <para>For more information see the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor + url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Lock Developer Documentation</ulink>.</para> </refsect1> diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml index 22294542f3..3ee344e50b 100644 --- a/man/systemd-journal-gatewayd.service.xml +++ b/man/systemd-journal-gatewayd.service.xml @@ -197,7 +197,7 @@ one per line (like <command>journalctl --output json</command>). See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink> for more information.</para> </listitem> </varlistentry> @@ -222,7 +222,7 @@ transfer (like <command>journalctl --output export</command>). See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> for more information.</para> </listitem> </varlistentry> @@ -289,7 +289,7 @@ <title>Examples</title> <para>Retrieve events from this boot from local journal in <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink>: <programlisting>curl --silent -H'Accept: application/vnd.fdo.journal' \ 'http://localhost:19531/entries?boot'</programlisting> diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index ee2d5c2486..d7750e416e 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -64,7 +64,7 @@ <filename>systemd-journal-remote</filename> is a command to receive serialized journal events and store them to the journal. Input streams are in the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/export"> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/export"> Journal Export Format </ulink>, i.e. like the output from diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml index 06aa78c0e4..2a796c9045 100644 --- a/man/systemd-localed.service.xml +++ b/man/systemd-localed.service.xml @@ -68,7 +68,7 @@ is a command line client to this service.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/localed"> + url="https://www.freedesktop.org/wiki/Software/systemd/localed"> developer documentation</ulink> for information about the APIs <filename>systemd-localed</filename> provides.</para> </refsect1> diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml index 9288f48f07..5433269638 100644 --- a/man/systemd-logind.service.xml +++ b/man/systemd-logind.service.xml @@ -99,17 +99,17 @@ for information about the configuration of this service.</para> <para>See <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat + url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> for an introduction into basic concepts of logind such as users, sessions and seats.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/logind"> + url="https://www.freedesktop.org/wiki/Software/systemd/logind"> logind D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-logind</filename> provides.</para> <para>For more information on the inhibition logic see the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor + url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor Lock Developer Documentation</ulink>.</para> </refsect1> diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 944e899bd4..714317c945 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -92,7 +92,7 @@ environment and a UUID is configured for the container, this is used to initialize the machine ID. For details, see the documentation of the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container + url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink>.</para></listitem> <listitem><para>Otherwise, a new ID is randomly diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml index 999aeee1c6..c4f173f79b 100644 --- a/man/systemd-machined.service.xml +++ b/man/systemd-machined.service.xml @@ -71,7 +71,7 @@ names.</para> <para>See the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/machined"> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/machined"> machined D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-machined</filename> provides.</para> </refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 96f8c3a61f..a7af8c25db 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -135,7 +135,7 @@ container.</para> <para><command>systemd-nspawn</command> implements the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> + url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> specification.</para> <para>While running, containers invoked with <command>systemd-nspawn</command> are registered with the @@ -233,7 +233,7 @@ a server data partition which are mounted to the appropriate places in the container. All these partitions must be identified by the partition types defined by the <ulink - url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable + url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>.</para></listitem> <listitem><para>No partition table, and a single file system spanning the whole image.</para></listitem> diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml index 176f2b2d20..6a5f0e6e38 100644 --- a/man/systemd-remount-fs.service.xml +++ b/man/systemd-remount-fs.service.xml @@ -72,7 +72,7 @@ systems.</para> <para>For a longer discussion of kernel API file systems see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API File Systems</ulink>.</para> </refsect1> diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 6465193cc5..f6831848c7 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -62,7 +62,7 @@ <itemizedlist> <listitem><para>The native, fully-featured API <command>systemd-resolved</command> exposes on the bus. See the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/resolved">API Documentation</ulink> for + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/resolved">API Documentation</ulink> for details. Usage of this API is generally recommended to clients as it is asynchronous and fully featured (for example, properly returns DNSSEC validation status and interface scope for addresses as necessary for supporting link-local networking).</para></listitem> @@ -156,7 +156,7 @@ per-interface domains are exclusively routed to the matching interfaces.</para> - <para>See the <ulink url="http://www.freedesktop.org/wiki/Software/systemd/resolved"> resolved D-Bus API + <para>See the <ulink url="https://www.freedesktop.org/wiki/Software/systemd/resolved"> resolved D-Bus API Documentation</ulink> for information about the APIs <filename>systemd-resolved</filename> provides.</para> </refsect1> diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index c7733f2885..2aa172e990 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -91,7 +91,7 @@ for local use only and should be considered hacks. If applications want to react to system suspend/hibernation and resume, they should rather use the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor + url="https://www.freedesktop.org/wiki/Software/systemd/inhibit">Inhibitor interface</ulink>.</para> <para>Note that diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml index e44163aefb..fee860204d 100644 --- a/man/systemd-timedated.service.xml +++ b/man/systemd-timedated.service.xml @@ -67,7 +67,7 @@ is a command line client to this service.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/timedated"> + url="https://www.freedesktop.org/wiki/Software/systemd/timedated"> developer documentation</ulink> for information about the APIs <filename>systemd-timedated</filename> provides.</para> </refsect1> diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml index 2e4b31be07..2c114f4631 100644 --- a/man/systemd-tty-ask-password-agent.xml +++ b/man/systemd-tty-ask-password-agent.xml @@ -66,7 +66,7 @@ runtime.</para> <para><command>systemd-tty-ask-password-agent</command> implements - the <ulink url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">Password + the <ulink url="https://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">Password Agents Specification</ulink>, and is one of many possible response agents which answer to queries formulated with <citerefentry><refentrytitle>systemd-ask-password</refentrytitle><manvolnum>1</manvolnum></citerefentry>. diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 16f0f07db7..5d4986b6bf 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -142,7 +142,7 @@ file instead of a directory. The device node or file system image file needs to contain a file system without a partition table, or a file system within an MBR/MS-DOS or GPT partition table with only a single Linux-compatible partition, or a set of file systems within a GPT partition table that follows the <ulink - url="http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions + url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions Specification</ulink>.</para></listitem> </varlistentry> @@ -1151,16 +1151,18 @@ <filename>/proc/sys</filename>, <filename>/sys</filename>, <filename>/proc/sysrq-trigger</filename>, <filename>/proc/latency_stats</filename>, <filename>/proc/acpi</filename>, <filename>/proc/timer_stats</filename>, <filename>/proc/fs</filename> and <filename>/proc/irq</filename> will - be made read-only to all processes of the unit. Usually, tunable kernel variables should only be written at - boot-time, with the <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> - mechanism. Almost no services need to write to these at runtime; it is hence recommended to turn this on for - most services. For this setting the same restrictions regarding mount propagation and privileges apply as for - <varname>ReadOnlyPaths=</varname> and related calls, see above. Defaults to off. - If turned on and if running in user mode, or in system mode, but without the <constant>CAP_SYS_ADMIN</constant> - capability (e.g. setting <varname>User=</varname>), <varname>NoNewPrivileges=yes</varname> - is implied. Note that this option does not prevent kernel tuning through IPC interfaces - and external programs. However <varname>InaccessiblePaths=</varname> can be used to - make some IPC file system objects inaccessible.</para></listitem> + be made read-only to all processes of the unit. Usually, tunable kernel variables should be initialized only at + boot-time, for example with the + <citerefentry><refentrytitle>sysctl.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> mechanism. Few + services need to write to these at runtime; it is hence recommended to turn this on for most services. For this + setting the same restrictions regarding mount propagation and privileges apply as for + <varname>ReadOnlyPaths=</varname> and related calls, see above. Defaults to off. If turned on and if running + in user mode, or in system mode, but without the <constant>CAP_SYS_ADMIN</constant> capability (e.g. services + for which <varname>User=</varname> is set), <varname>NoNewPrivileges=yes</varname> is implied. Note that this + option does not prevent indirect changes to kernel tunables effected by IPC calls to other processes. However, + <varname>InaccessiblePaths=</varname> may be used to make relevant IPC file system objects inaccessible. If + <varname>ProtectKernelTunables=</varname> is set, <varname>MountAPIVFS=yes</varname> is + implied.</para></listitem> </varlistentry> <varlistentry> @@ -1196,7 +1198,8 @@ unit. Except for container managers no services should require write access to the control groups hierarchies; it is hence recommended to turn this on for most services. For this setting the same restrictions regarding mount propagation and privileges apply as for <varname>ReadOnlyPaths=</varname> and related calls, see - above. Defaults to off.</para></listitem> + above. Defaults to off. If <varname>ProtectControlGroups=</varname> is set, <varname>MountAPIVFS=yes</varname> is + implied.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 2b0acee407..747d985aa1 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -467,9 +467,9 @@ <para>During serialization into external formats, such as the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/export">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink> or the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal + url="https://www.freedesktop.org/wiki/Software/systemd/json">Journal JSON Format</ulink>, the addresses of journal entries are serialized into fields prefixed with double underscores. Note that these are not proper fields when stored in the journal but for diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index 598b5772fd..4a404fb424 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -104,7 +104,7 @@ for kernel-to-userspace and userspace-to-userspace interfaces. Some of them may not be changed via mount units, and cannot be disabled. For a longer discussion see <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API + url="https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems">API File Systems</ulink>.</para> </refsect1> diff --git a/man/systemd.offline-updates.xml b/man/systemd.offline-updates.xml index 06690b41f4..b4dce3e92d 100644 --- a/man/systemd.offline-updates.xml +++ b/man/systemd.offline-updates.xml @@ -154,7 +154,7 @@ script exits uncleanly (by non-zero error code, or signal/coredump). If your script succeeds you should trigger the reboot in your own code, for example by invoking logind's <command>Reboot()</command> call or calling <command>systemctl reboot</command>. See - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/logind">logind dbus API</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/logind">logind dbus API</ulink> for details.</para> </listitem> @@ -170,7 +170,7 @@ <title>See also</title> <para> - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/SystemUpdates/">Implementing Offline System Updates</ulink>, + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/SystemUpdates/">Implementing Offline System Updates</ulink>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-system-update-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, diff --git a/man/systemd.preset.xml b/man/systemd.preset.xml index d09167baaf..92eb4e8280 100644 --- a/man/systemd.preset.xml +++ b/man/systemd.preset.xml @@ -72,7 +72,7 @@ <para>For more information on the preset logic please have a look at the <ulink - url="http://freedesktop.org/wiki/Software/systemd/Preset">Presets</ulink> + url="https://www.freedesktop.org/wiki/Software/systemd/Preset">Presets</ulink> document.</para> <para>It is not recommended to ship preset files within the diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index 02878b28a0..9b1f5dbbab 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -87,7 +87,7 @@ Those options complement options listed here.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New + url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group Interfaces</ulink> for an introduction on how to make use of resource control APIs from programs.</para> </refsect1> diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml index f69b2ef635..36f24d46a1 100644 --- a/man/systemd.scope.xml +++ b/man/systemd.scope.xml @@ -69,7 +69,7 @@ command line.</para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New + url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group Interfaces</ulink> for an introduction on how to make use of scope units from programs.</para> </refsect1> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 627176750f..52eb2bb424 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -84,7 +84,7 @@ This is useful for compatibility with SysV. Note that this compatibility is quite comprehensive but not 100%. For details about the incompatibilities, see the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities + url="https://www.freedesktop.org/wiki/Software/systemd/Incompatibilities">Incompatibilities with SysV</ulink> document.</para> </refsect1> diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml index eee98d99ee..3ff3cc5188 100644 --- a/man/systemd.slice.xml +++ b/man/systemd.slice.xml @@ -97,7 +97,7 @@ </para> <para>See the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New + url="https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New Control Group Interfaces</ulink> for an introduction on how to make use of slice units from programs.</para> </refsect1> diff --git a/man/systemd.special.xml b/man/systemd.special.xml index a81cc3579d..fa3dc1c5d4 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -399,7 +399,7 @@ is part of the boot of most systems, while <filename>network-online.target</filename> is not, except when at least one unit requires it. Also see <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running + url="https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running Services After the Network is up</ulink> for more information.</para> @@ -616,7 +616,7 @@ on. All userspace log messages will be made available on this socket. For more information about syslog integration, please consult the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog + url="https://www.freedesktop.org/wiki/Software/systemd/syslog">Syslog Interface</ulink> document.</para> </listitem> </varlistentry> @@ -785,7 +785,7 @@ is shut down. It is hence useful when writing service files that require network access on shutdown, which should order themselves after this target, but not pull it in. Also see - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget">Running Services After the Network is up</ulink> for more information. Also see <filename>network-online.target</filename> described diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 2208b6a287..44841ac7dd 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -256,7 +256,7 @@ <para>The unit file format is covered by the <ulink - url="http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface + url="https://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface Stability Promise</ulink>.</para> </refsect1> diff --git a/man/systemd.xml b/man/systemd.xml index 2964fecd25..bfcc0c13b0 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -449,7 +449,7 @@ <para>Note that some but not all interfaces provided by systemd are covered by the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface Stability Promise</ulink>.</para> <para>Units may be generated dynamically at boot and system @@ -459,8 +459,8 @@ <para>Systems which invoke systemd in a container or initrd environment should implement the - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> or - <ulink url="http://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd Interface</ulink> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container Interface</ulink> or + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/InitrdInterface">initrd Interface</ulink> specifications, respectively.</para> </refsect1> @@ -1145,7 +1145,7 @@ <refsect1> <title>See Also</title> <para> - The <ulink url="http://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>, + The <ulink url="https://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>, <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry project='man-pages'><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/src/basic/copy.c b/src/basic/copy.c index 6273ac9b47..e120b9eb4e 100644 --- a/src/basic/copy.c +++ b/src/basic/copy.c @@ -558,7 +558,7 @@ int copy_file_atomic(const char *from, const char *to, mode_t mode, unsigned cha } else r = rename_noreplace(AT_FDCWD, t, AT_FDCWD, to); if (r < 0) { - (void) unlink_noerrno(t); + (void) unlink(t); return r; } diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h index 5fe5c71ff0..094acf1799 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h @@ -91,3 +91,9 @@ static inline void rmdir_and_free(char *p) { free(p); } DEFINE_TRIVIAL_CLEANUP_FUNC(char*, rmdir_and_free); + +static inline void unlink_and_free(char *p) { + (void) unlink(p); + free(p); +} +DEFINE_TRIVIAL_CLEANUP_FUNC(char*, unlink_and_free); diff --git a/src/basic/log.c b/src/basic/log.c index e6d2d61d72..36efc9ac7d 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -72,6 +72,7 @@ static bool show_color = false; static bool show_location = false; static bool upgrade_syslog_to_journal = false; +static bool always_reopen_console = false; /* Akin to glibc's __abort_msg; which is private and we hence cannot * use here. */ @@ -95,7 +96,7 @@ static int log_open_console(void) { if (console_fd >= 0) return 0; - if (getpid() == 1) { + if (always_reopen_console) { console_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC); if (console_fd < 0) return console_fd; @@ -1171,3 +1172,7 @@ int log_syntax_internal( unit_fmt, unit, NULL); } + +void log_set_always_reopen_console(bool b) { + always_reopen_console = b; +} diff --git a/src/basic/log.h b/src/basic/log.h index 9cacbb6b70..72714e02e5 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -220,6 +220,7 @@ LogTarget log_target_from_string(const char *s) _pure_; void log_received_signal(int level, const struct signalfd_siginfo *si); void log_set_upgrade_syslog_to_journal(bool b); +void log_set_always_reopen_console(bool b); int log_syntax_internal( const char *unit, diff --git a/src/basic/process-util.c b/src/basic/process-util.c index eead8b00da..87e5586027 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -703,7 +703,7 @@ int kill_and_sigcont(pid_t pid, int sig) { /* If this worked, also send SIGCONT, unless we already just sent a SIGCONT, or SIGKILL was sent which isn't * affected by a process being suspended anyway. */ - if (r >= 0 && !IN_SET(SIGCONT, SIGKILL)) + if (r >= 0 && !IN_SET(sig, SIGCONT, SIGKILL)) (void) kill(pid, SIGCONT); return r; diff --git a/src/basic/strv.c b/src/basic/strv.c index 60f92e6373..0eec868eed 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -564,6 +564,9 @@ int strv_extend_front(char ***l, const char *value) { /* Like strv_extend(), but prepends rather than appends the new entry */ + if (!value) + return 0; + n = strv_length(*l); /* Increase and overflow check. */ @@ -571,12 +574,9 @@ int strv_extend_front(char ***l, const char *value) { if (m < n) return -ENOMEM; - if (value) { - v = strdup(value); - if (!v) - return -ENOMEM; - } else - v = NULL; + v = strdup(value); + if (!v) + return -ENOMEM; c = realloc_multiply(*l, sizeof(char*), m); if (!c) { diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index b747a95133..116608bbd3 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -38,20 +38,22 @@ #include "alloc-util.h" #include "blkid-util.h" +#include "copy.h" #include "dirent-util.h" #include "efivars.h" #include "fd-util.h" #include "fileio.h" +#include "fs-util.h" #include "locale-util.h" #include "parse-util.h" #include "rm-rf.h" +#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "umask-util.h" #include "util.h" #include "verbs.h" #include "virt.h" -#include "stat-util.h" static char *arg_path = NULL; static bool arg_touch_variables = true; @@ -476,16 +478,16 @@ static int compare_version(const char *a, const char *b) { return strverscmp(a, b); } -static int version_check(int fd, const char *from, const char *to) { +static int version_check(int fd_from, const char *from, int fd_to, const char *to) { _cleanup_free_ char *a = NULL, *b = NULL; - _cleanup_close_ int fd2 = -1; int r; - assert(fd >= 0); + assert(fd_from >= 0); assert(from); + assert(fd_to >= 0); assert(to); - r = get_file_version(fd, &a); + r = get_file_version(fd_from, &a); if (r < 0) return r; if (r == 0) { @@ -493,15 +495,7 @@ static int version_check(int fd, const char *from, const char *to) { return -EINVAL; } - fd2 = open(to, O_RDONLY|O_CLOEXEC); - if (fd2 < 0) { - if (errno == ENOENT) - return 0; - - return log_error_errno(errno, "Failed to open \"%s\" for reading: %m", to); - } - - r = get_file_version(fd2, &b); + r = get_file_version(fd_to, &b); if (r < 0) return r; if (r == 0 || compare_product(a, b) != 0) { @@ -517,90 +511,59 @@ static int version_check(int fd, const char *from, const char *to) { return 0; } -static int copy_file(const char *from, const char *to, bool force) { - _cleanup_fclose_ FILE *f = NULL, *g = NULL; - char *p; +static int copy_file_with_version_check(const char *from, const char *to, bool force) { + _cleanup_close_ int fd_from = -1, fd_to = -1; + _cleanup_free_ char *t = NULL; int r; - struct timespec t[2]; - struct stat st; - assert(from); - assert(to); - - f = fopen(from, "re"); - if (!f) + fd_from = open(from, O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd_from < 0) return log_error_errno(errno, "Failed to open \"%s\" for reading: %m", from); if (!force) { - /* If this is an update, then let's compare versions first */ - r = version_check(fileno(f), from, to); - if (r < 0) - return r; - } - - p = strjoina(to, "~"); - g = fopen(p, "wxe"); - if (!g) { - /* Directory doesn't exist yet? Then let's skip this... */ - if (!force && errno == ENOENT) - return 0; - - return log_error_errno(errno, "Failed to open \"%s\" for writing: %m", to); - } + fd_to = open(to, O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd_to < 0) { + if (errno != -ENOENT) + return log_error_errno(errno, "Failed to open \"%s\" for reading: %m", to); + } else { + r = version_check(fd_from, from, fd_to, to); + if (r < 0) + return r; - rewind(f); - do { - size_t k; - uint8_t buf[32*1024]; + if (lseek(fd_from, 0, SEEK_SET) == (off_t) -1) + return log_error_errno(errno, "Failed to seek in \%s\": %m", from); - k = fread(buf, 1, sizeof(buf), f); - if (ferror(f)) { - r = log_error_errno(EIO, "Failed to read \"%s\": %m", from); - goto error; + fd_to = safe_close(fd_to); } + } - if (k == 0) - break; - - fwrite(buf, 1, k, g); - if (ferror(g)) { - r = log_error_errno(EIO, "Failed to write \"%s\": %m", to); - goto error; - } - } while (!feof(f)); + r = tempfn_random(to, NULL, &t); + if (r < 0) + return log_oom(); - r = fflush_and_check(g); - if (r < 0) { - log_error_errno(r, "Failed to write \"%s\": %m", to); - goto error; + RUN_WITH_UMASK(0000) { + fd_to = open(t, O_WRONLY|O_CREAT|O_CLOEXEC|O_EXCL|O_NOFOLLOW, 0644); + if (fd_to < 0) + return log_error_errno(errno, "Failed to open \"%s\" for writing: %m", t); } - r = fstat(fileno(f), &st); + r = copy_bytes(fd_from, fd_to, (uint64_t) -1, COPY_REFLINK); if (r < 0) { - r = log_error_errno(errno, "Failed to get file timestamps of \"%s\": %m", from); - goto error; + unlink(t); + return log_error_errno(errno, "Failed to copy data from \"%s\" to \"%s\": %m", from, t); } - t[0] = st.st_atim; - t[1] = st.st_mtim; + (void) copy_times(fd_from, fd_to); - r = futimens(fileno(g), t); + r = renameat(AT_FDCWD, t, AT_FDCWD, to); if (r < 0) { - r = log_error_errno(errno, "Failed to set file timestamps on \"%s\": %m", p); - goto error; - } - - if (rename(p, to) < 0) { - r = log_error_errno(errno, "Failed to rename \"%s\" to \"%s\": %m", p, to); - goto error; + (void) unlink_noerrno(t); + return log_error_errno(errno, "Failed to rename \"%s\" to \"%s\": %m", t, to); } log_info("Copied \"%s\" to \"%s\".", from, to); - return 0; -error: - (void) unlink(p); - return r; + return 0; } static int mkdir_one(const char *prefix, const char *suffix) { @@ -644,7 +607,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) { p = strjoina(BOOTLIBDIR "/", name); q = strjoina(esp_path, "/EFI/systemd/", name); - r = copy_file(p, q, force); + r = copy_file_with_version_check(p, q, force); if (startswith(name, "systemd-boot")) { int k; @@ -654,7 +617,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) { v = strjoina(esp_path, "/EFI/BOOT/BOOT", name + strlen("systemd-boot")); ascii_strupper(strrchr(v, '/') + 1); - k = copy_file(p, v, force); + k = copy_file_with_version_check(p, v, force); if (k < 0 && r == 0) r = k; } @@ -950,20 +913,31 @@ static int remove_variables(sd_id128_t uuid, const char *path, bool in_order) { static int install_loader_config(const char *esp_path) { - _cleanup_fclose_ FILE *f = NULL; char machine_string[SD_ID128_STRING_MAX]; + _cleanup_(unlink_and_freep) char *t = NULL; + _cleanup_fclose_ FILE *f = NULL; sd_id128_t machine_id; const char *p; - int r; + int r, fd; r = sd_id128_get_machine(&machine_id); if (r < 0) return log_error_errno(r, "Failed to get machine did: %m"); p = strjoina(esp_path, "/loader/loader.conf"); - f = fopen(p, "wxe"); - if (!f) - return log_error_errno(errno, "Failed to open loader.conf for writing: %m"); + + if (access(p, F_OK) >= 0) /* Silently skip creation if the file already exists (early check) */ + return 0; + + fd = open_tmpfile_linkable(p, O_WRONLY|O_CLOEXEC, &t); + if (fd < 0) + return log_error_errno(fd, "Failed to open \"%s\" for writing: %m", p); + + f = fdopen(fd, "we"); + if (!f) { + safe_close(fd); + return log_oom(); + } fprintf(f, "#timeout 3\n"); fprintf(f, "default %s-*\n", sd_id128_to_string(machine_id, machine_string)); @@ -972,7 +946,15 @@ static int install_loader_config(const char *esp_path) { if (r < 0) return log_error_errno(r, "Failed to write \"%s\": %m", p); - return 0; + r = link_tmpfile(fd, t, p); + if (r == -EEXIST) + return 0; /* Silently skip creation if the file exists now (recheck) */ + if (r < 0) + return log_error_errno(r, "Failed to move \"%s\" into place: %m", p); + + t = mfree(t); + + return 1; } static int help(int argc, char *argv[], void *userdata) { diff --git a/src/core/main.c b/src/core/main.c index 3c6b18229c..bcf9ea5f25 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1414,10 +1414,17 @@ int main(int argc, char *argv[]) { log_set_upgrade_syslog_to_journal(true); - /* Disable the umask logic */ - if (getpid() == 1) + if (getpid() == 1) { + /* Disable the umask logic */ umask(0); + /* Always reopen /dev/console when running as PID 1 or one of its pre-execve() children. This is + * important so that we never end up logging to any foreign stderr, for example if we have to log in a + * child process right before execve()'ing the actual binary, at a point in time where socket + * activation stderr/stdout area already set up. */ + log_set_always_reopen_console(true); + } + if (getpid() == 1 && detect_container() <= 0) { /* Running outside of a container as PID 1 */ diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c index 29fb71c8dd..43dba82c3a 100644 --- a/src/coredump/coredumpctl.c +++ b/src/coredump/coredumpctl.c @@ -916,7 +916,7 @@ static int check_units_active(void) { while ((r = sd_bus_message_read( reply, "(ssssssouso)", NULL, NULL, NULL, &state, NULL, - NULL, NULL, NULL, NULL, NULL) > 0)) + NULL, NULL, NULL, NULL, NULL)) > 0) if (!STR_IN_SET(state, "dead", "failed")) c++; diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 59bd7d9e84..06564e94b1 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -208,6 +208,14 @@ int main(int argc, char *argv[]) { log_error_errno(r, "No root partition for specified root hash found in %s.", arg_image); goto finish; } + if (r == -ENOTUNIQ) { + log_error_errno(r, "Multiple suitable root partitions found in image %s.", arg_image); + goto finish; + } + if (r == -ENXIO) { + log_error_errno(r, "No suitable root partition found in image %s.", arg_image); + goto finish; + } if (r < 0) { log_error_errno(r, "Failed to dissect image: %m"); goto finish; diff --git a/src/libsystemd/sd-netlink/netlink-socket.c b/src/libsystemd/sd-netlink/netlink-socket.c index a0fd8a3ac9..129bfd2d80 100644 --- a/src/libsystemd/sd-netlink/netlink-socket.c +++ b/src/libsystemd/sd-netlink/netlink-socket.c @@ -281,7 +281,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool else if (errno == EAGAIN) log_debug("rtnl: no data in socket"); - return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; + return IN_SET(errno, EAGAIN, EINTR) ? 0 : -errno; } if (sender.nl.nl_pid != 0) { @@ -292,7 +292,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool /* drop the message */ r = recvmsg(fd, &msg, 0); if (r < 0) - return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; + return IN_SET(errno, EAGAIN, EINTR) ? 0 : -errno; } return 0; diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index 43114eb825..68435564de 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -276,6 +276,10 @@ static int dispatch_rqueue(sd_netlink *rtnl, sd_netlink_message **message) { if (rtnl->rqueue_size <= 0) { /* Try to read a new message */ r = socket_read_message(rtnl); + if (r == -ENOBUFS) { /* FIXME: ignore buffer overruns for now */ + log_debug_errno(r, "Got ENOBUFS from netlink socket, ignoring."); + return 1; + } if (r <= 0) return r; } diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index d8e13288b0..7c6aeef8dc 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -103,6 +103,8 @@ _public_ struct udev *udev_new(void) { } udev->refcount = 1; +#ifdef UDEV_PROPAGATE_LOG + f = fopen("/etc/udev/udev.conf", "re"); if (f != NULL) { char line[UTIL_LINE_SIZE]; @@ -178,6 +180,7 @@ _public_ struct udev *udev_new(void) { } } } +#endif return udev; } |