[arch-commits] Commit in systemd/trunk (4 files)
Date: Tuesday, August 13, 2019 @ 14:17:54
Author: heftig
Revision: 359789
242.84-2: Reload D-Bus after creating users
Fixes a problem where D-Bus reloads itself on installation
of polkit, before the polkitd user is created. This then
results in polkit not being able to grab its bus name.
Added:
systemd/trunk/20-systemd-sysusers.hook
(from rev 359788, systemd/trunk/systemd-sysusers.hook)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/systemd-hook
Deleted:
systemd/trunk/systemd-sysusers.hook
--+
20-systemd-sysusers.hook | 10 ++
PKGBUILD |8
systemd-hook |9 +++--
systemd-sysusers.hook| 10 --
4 files changed, 21 insertions(+), 16 deletions(-)
Copied: systemd/trunk/20-systemd-sysusers.hook (from rev 359788,
systemd/trunk/systemd-sysusers.hook)
===
--- 20-systemd-sysusers.hook(rev 0)
+++ 20-systemd-sysusers.hook2019-08-13 14:17:54 UTC (rev 359789)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Creating system user accounts...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
Modified: PKGBUILD
===
--- PKGBUILD2019-08-13 14:17:53 UTC (rev 359788)
+++ PKGBUILD2019-08-13 14:17:54 UTC (rev 359789)
@@ -7,7 +7,7 @@
# Can be from either systemd or systemd-stable
_commit='9d34e79ae8ef891adf3757f9248566def70471ad'
pkgver=242.84
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -31,12 +31,12 @@
'splash-arch.bmp'
'systemd-user.pam'
'systemd-hook'
+'20-systemd-sysusers.hook'
'systemd-binfmt.hook'
'systemd-catalog.hook'
'systemd-daemon-reload.hook'
'systemd-hwdb.hook'
'systemd-sysctl.hook'
-'systemd-sysusers.hook'
'systemd-tmpfiles.hook'
'systemd-udev-reload.hook'
'systemd-update.hook')
@@ -50,13 +50,13 @@
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-
'6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
+
'869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
+
'08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
'5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
'4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
'872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
'471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d'
'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
-
'08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
'577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
Modified: systemd-hook
===
--- systemd-hook2019-08-13 14:17:53 UTC (rev 359788)
+++ systemd-hook2019-08-13 14:17:54 UTC (rev 359789)
@@ -14,7 +14,9 @@
fi
}
-case $1 in
+op="$1"; shift
+
+case "$op" in
catalog) /usr/bin/journalctl --update-catalog ;;
hwdb) /usr/bin/systemd-hwdb --usr update ;;
update) touch -c /usr ;;
@@ -26,7 +28,10 @@
binfmt)systemd_live; /usr/lib/systemd/systemd-binfmt ;;
sysctl)systemd_live; /usr/lib/
[arch-commits] Commit in systemd/trunk (4 files)
Date: Wednesday, May 27, 2015 @ 21:09:23
Author: bpiotrowski
Revision: 239823
upgpkg: systemd 220-3
add example configuration files for bootctl
Added:
systemd/trunk/arch.conf
systemd/trunk/loader.conf
systemd/trunk/splash-arch.bmp
Modified:
systemd/trunk/PKGBUILD
-+
PKGBUILD| 17 ++---
arch.conf |7 +++
loader.conf |2 ++
splash-arch.bmp |2 ++
4 files changed, 25 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-27 18:58:38 UTC (rev 239822)
+++ PKGBUILD2015-05-27 19:09:23 UTC (rev 239823)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=220
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd";
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,11 +15,17 @@
source=("git://anongit.freedesktop.org/systemd/systemd#tag=v$pkgver"
'initcpio-hook-udev'
'initcpio-install-systemd'
-'initcpio-install-udev')
+'initcpio-install-udev'
+'arch.conf'
+'loader.conf'
+'splash-arch.bmp')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
'8516a7bd65157d0115c113118c10c3f3'
- 'bde43090d4ac0ef048e3eaee8202a407')
+ 'bde43090d4ac0ef048e3eaee8202a407'
+ '82bda9612e3a361a74cf8de2a0134b15'
+ '6ea803e5179d623716e3be0b636de658'
+ '1e2f9a8b0fa32022bf0a8f39123e5f4e')
prepare() {
cd "$pkgname"
@@ -145,6 +151,11 @@
install -dm755 "$srcdir"/_libsystemd/usr/lib
cd "$srcdir"/_libsystemd
mv "$pkgdir"/usr/lib/lib{systemd,{g,}udev}*.so* usr/lib
+
+ # add example bootctl configuration
+ install -Dm644 "$srcdir/arch.conf"
"$pkgdir"/usr/share/systemd/bootctl/arch.conf
+ install -Dm644 "$srcdir/loader.conf"
"$pkgdir"/usr/share/systemd/bootctl/loader.conf
+ install -Dm644 "$srcdir/splash-arch.bmp"
"$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
}
package_libsystemd() {
Added: arch.conf
===
--- arch.conf (rev 0)
+++ arch.conf 2015-05-27 19:09:23 UTC (rev 239823)
@@ -0,0 +1,7 @@
+## This is just an exmaple config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title Arch Linux
+linux /vmlinuz-linux
+initrd /initramfs-linux.img
+options root=PARTUUID= rootfstype= add_efi_memmap
Added: loader.conf
===
--- loader.conf (rev 0)
+++ loader.conf 2015-05-27 19:09:23 UTC (rev 239823)
@@ -0,0 +1,2 @@
+timeout 10
+default arch
Added: splash-arch.bmp
===
(Binary files differ)
Index: systemd/trunk/splash-arch.bmp
===
--- splash-arch.bmp 2015-05-27 18:58:38 UTC (rev 239822)
+++ splash-arch.bmp 2015-05-27 19:09:23 UTC (rev 239823)
Property changes on: systemd/trunk/splash-arch.bmp
___
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/x-ms-bmp
\ No newline at end of property
[arch-commits] Commit in systemd/trunk (4 files)
Date: Wednesday, May 27, 2015 @ 19:55:08
Author: foutrelis
Revision: 239819
upgpkg: systemd 220-2
- Backport fix for incorrect SIGCHLD handling in --daemon mode (FS#45086).
- Use git sources to work around incomplete release tarball.
- Enable gnuefi support.
Modified:
systemd/trunk/PKGBUILD
Deleted:
systemd/trunk/0001-udevd-worker-fully-clean-up-unnecessary-fds.patch
systemd/trunk/0002-udevd-worker-modernize-a-bit.patch
systemd/trunk/0003-udevd-event-fix-event-queue-in-daemenozied-mode.patch
+
0001-udevd-worker-fully-clean-up-unnecessary-fds.patch | 34 --
0002-udevd-worker-modernize-a-bit.patch| 58 ---
0003-udevd-event-fix-event-queue-in-daemenozied-mode.patch | 45
PKGBUILD | 38 +++
4 files changed, 18 insertions(+), 157 deletions(-)
Deleted: 0001-udevd-worker-fully-clean-up-unnecessary-fds.patch
===
--- 0001-udevd-worker-fully-clean-up-unnecessary-fds.patch 2015-05-27
17:31:03 UTC (rev 239818)
+++ 0001-udevd-worker-fully-clean-up-unnecessary-fds.patch 2015-05-27
17:55:08 UTC (rev 239819)
@@ -1,34 +0,0 @@
-From 6d1b1e0bc6bd020218afc5f05286bf372be283d5 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen
-Date: Sun, 24 May 2015 15:10:04 +0200
-Subject: [PATCH 1/3] udevd: worker - fully clean up unnecessary fds
-
-These are only ever used in the parent process, so close them early in the
worker.
- src/udev/udevd.c | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index afd4640..d8cb046 100644
a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -329,11 +329,15 @@ static void worker_spawn(Manager *manager, struct event
*event) {
-
- manager_workers_free(manager);
- event_queue_cleanup(manager, EVENT_UNDEF);
-+
- manager->monitor = udev_monitor_unref(manager->monitor);
-+manager->ctrl_conn_blocking =
udev_ctrl_connection_unref(manager->ctrl_conn_blocking);
- manager->ctrl = udev_ctrl_unref(manager->ctrl);
-+
-+manager->fd_ep = safe_close(manager->fd_ep);
- manager->fd_signal = safe_close(manager->fd_signal);
-+manager->fd_inotify = safe_close(manager->fd_inotify);
- manager->worker_watch[READ_END] =
safe_close(manager->worker_watch[READ_END]);
--manager->fd_ep = safe_close(manager->fd_ep);
-
- sigfillset(&mask);
- fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
---
-2.4.1
-
Deleted: 0002-udevd-worker-modernize-a-bit.patch
===
--- 0002-udevd-worker-modernize-a-bit.patch 2015-05-27 17:31:03 UTC (rev
239818)
+++ 0002-udevd-worker-modernize-a-bit.patch 2015-05-27 17:55:08 UTC (rev
239819)
@@ -1,58 +0,0 @@
-From 2dd9f98d2d7a06a8e28729da6339fce50d66e9cc Mon Sep 17 00:00:00 2001
-From: Tom Gundersen
-Date: Sun, 24 May 2015 15:14:43 +0200
-Subject: [PATCH 2/3] udevd: worker - modernize a bit
-
-Initialize structs when declaring rather than using memzero().
- src/udev/udevd.c | 18 +++---
- 1 file changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index d8cb046..4a44b03 100644
a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -316,10 +316,11 @@ static void worker_spawn(Manager *manager, struct event
*event) {
- switch (pid) {
- case 0: {
- struct udev_device *dev = NULL;
-+_cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
- int fd_monitor;
- _cleanup_close_ int fd_signal = -1, fd_ep = -1;
--_cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
--struct epoll_event ep_signal, ep_monitor;
-+struct epoll_event ep_signal = { .events = EPOLLIN };
-+struct epoll_event ep_monitor = { .events = EPOLLIN };
- sigset_t mask;
- int r = 0;
-
-@@ -345,6 +346,10 @@ static void worker_spawn(Manager *manager, struct event
*event) {
- r = log_error_errno(errno, "error creating signalfd
%m");
- goto out;
- }
-+ep_signal.data.fd = fd_signal;
-+
-+fd_monitor = udev_monitor_get_fd(worker_monitor);
-+ep_monitor.data.fd = fd_monitor;
-
- fd_ep = epoll_create1(EPOLL_CLOEXEC);
- if (fd_ep < 0) {
-@@ -352,15 +357,6 @@ static void worker_spawn(Manager *manager, struct event
*event) {
- goto out;
- }
-
--memzero(&ep_signal, sizeof(struct epoll_event));
--ep_signal.events = EPOLLIN;
--ep_signal.d
[arch-commits] Commit in systemd/trunk (4 files)
Date: Wednesday, April 22, 2015 @ 03:08:36
Author: dreisner
Revision: 237884
upgpkg: systemd 219-6
- backport fixes for FS#44658
Added:
systemd/trunk/0001-core-don-t-change-removed-devices-to-state-tentative.patch
systemd/trunk/0001-core-rework-device-state-logic.patch
systemd/trunk/0001-unit-use-weaker-dependencies-between-mount-and-devic.patch
Modified:
systemd/trunk/PKGBUILD
-+
0001-core-don-t-change-removed-devices-to-state-tentative.patch | 34
0001-core-rework-device-state-logic.patch | 910
++
0001-unit-use-weaker-dependencies-between-mount-and-devic.patch | 31
PKGBUILD| 15
4 files changed, 987 insertions(+), 3 deletions(-)
Added: 0001-core-don-t-change-removed-devices-to-state-tentative.patch
===
--- 0001-core-don-t-change-removed-devices-to-state-tentative.patch
(rev 0)
+++ 0001-core-don-t-change-removed-devices-to-state-tentative.patch
2015-04-22 01:08:36 UTC (rev 237884)
@@ -0,0 +1,34 @@
+From 496068a8288084ab3ecf8b179a8403ecff1a6be8 Mon Sep 17 00:00:00 2001
+From: Martin Pitt
+Date: Fri, 13 Mar 2015 08:35:59 +0100
+Subject: [PATCH] core: don't change removed devices to state "tentative"
+
+Commit 628c89c introduced the "tentative" device state, which caused
+devices to go from "plugged" to "tentative" on a remove uevent. This
+breaks the cleanup of stale mounts (see commit 3b48ce4), as that only
+applies to "dead" devices.
+
+The "tentative" state only really makes sense on adding a device when
+we don't know where it was coming from (i. e. not from udev). But when
+we get a device removal from udev we definitively know that it's gone,
+so change the device state back to "dead" as before 628c89c.
+---
+ src/core/device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/device.c b/src/core/device.c
+index 4bfd71f..b5d9d82 100644
+--- a/src/core/device.c
b/src/core/device.c
+@@ -419,7 +419,7 @@ static void device_update_found_one(Device *d, bool add,
DeviceFound found, bool
+ if (now) {
+ if (d->found & DEVICE_FOUND_UDEV)
+ device_set_state(d, DEVICE_PLUGGED);
+-else if (d->found != DEVICE_NOT_FOUND)
++else if (add && d->found != DEVICE_NOT_FOUND)
+ device_set_state(d, DEVICE_TENTATIVE);
+ else
+ device_set_state(d, DEVICE_DEAD);
+--
+2.3.5
+
Added: 0001-core-rework-device-state-logic.patch
===
--- 0001-core-rework-device-state-logic.patch (rev 0)
+++ 0001-core-rework-device-state-logic.patch 2015-04-22 01:08:36 UTC (rev
237884)
@@ -0,0 +1,910 @@
+From 628c89cc68ab96fce2de7ebba5933725d147aecc Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Fri, 27 Feb 2015 21:55:08 +0100
+Subject: [PATCH] core: rework device state logic
+
+This change introduces a new state "tentative" for device units. Device
+units are considered "plugged" when udev announced them, "dead" when
+they are not available in the kernel, and "tentative" when they are
+referenced in /proc/self/mountinfo or /proc/swaps but not (yet)
+announced via udev.
+
+This should fix a race when device nodes (like loop devices) are created
+and immediately mounted. Previously, systemd might end up seeing the
+mount unit before the device, and would thus pull down the mount because
+its BindTo dependency on the device would not be fulfilled.
+---
+ src/core/device.c | 368 +-
+ src/core/device.h | 14 ++-
+ src/core/mount.c | 46 ---
+ src/core/swap.c | 32 +++--
+ src/core/swap.h | 4 +-
+ src/core/unit.c | 1 -
+ 6 files changed, 285 insertions(+), 180 deletions(-)
+
+diff --git a/src/core/device.c b/src/core/device.c
+index 2d983cc..e41ed41 100644
+--- a/src/core/device.c
b/src/core/device.c
+@@ -34,7 +34,8 @@
+
+ static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = {
+ [DEVICE_DEAD] = UNIT_INACTIVE,
+-[DEVICE_PLUGGED] = UNIT_ACTIVE
++[DEVICE_TENTATIVE] = UNIT_ACTIVATING,
++[DEVICE_PLUGGED] = UNIT_ACTIVE,
+ };
+
+ static int device_dispatch_io(sd_event_source *source, int fd, uint32_t
revents, void *userdata);
+@@ -63,6 +64,41 @@ static void device_unset_sysfs(Device *d) {
+ d->sysfs = NULL;
+ }
+
++static int device_set_sysfs(Device *d, const char *sysfs) {
++Device *first;
++char *copy;
++int r;
++
++assert(d);
++
++if (streq_ptr(d->sysfs, sysfs))
++return 0;
++
++r = hashmap_ensure_allocated(&UNIT(d)->manager->devices_by_sysfs,
&string_hash_ops);
++if (r < 0)
++retu
[arch-commits] Commit in systemd/trunk (4 files)
Date: Saturday, February 8, 2014 @ 20:30:22
Author: dreisner
Revision: 205601
upgpkg: systemd 208-11
- backport fix for FS#38788, FS#37170
- backport fix for FS#38842
Added:
systemd/trunk/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
systemd/trunk/0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
systemd/trunk/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
Modified:
systemd/trunk/PKGBUILD
-+
0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch | 45
++
0001-do-not-accept-garbage-from-acpi-firmware-performance.patch | 33 +++
0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch | 26 +
PKGBUILD| 15 ++-
4 files changed, 116 insertions(+), 3 deletions(-)
Added: 0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
===
--- 0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
(rev 0)
+++ 0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
2014-02-08 19:30:22 UTC (rev 205601)
@@ -0,0 +1,45 @@
+From 66a5dbdf282435403f947c2caadd04bb0cdec752 Mon Sep 17 00:00:00 2001
+From: Dave Reisner
+Date: Sat, 8 Feb 2014 12:54:58 -0500
+Subject: [PATCH] cryptsetup-generator: auto add deps for device as password
+
+If the password is a device file, we can add Requires/After dependencies
+on the device rather than requiring the user to do so.
+---
+ src/cryptsetup/cryptsetup-generator.c | 20 +++-
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
+index 9c98f0b..46ad9b8 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
+@@ -130,11 +130,21 @@ static int create_disk(
+ streq(password, "/dev/random") ||
+ streq(password, "/dev/hw_random"))
+ fputs("After=systemd-random-seed.service\n", f);
+-else if (!streq(password, "-") &&
+- !streq(password, "none"))
+-fprintf(f,
+-"RequiresMountsFor=%s\n",
+-password);
++
++else if (!streq(password, "-") && !streq(password, "none")) {
++_cleanup_free_ char *uu =
fstab_node_to_udev_node(password);
++if (uu == NULL)
++return log_oom();
++
++if (is_device_path(uu)) {
++_cleanup_free_ char *dd =
unit_name_from_path(uu, ".device");
++if (dd == NULL)
++return log_oom();
++
++fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
++} else
++fprintf(f, "RequiresMountsFor=%s\n",
password);
++}
+ }
+
+ if (is_device_path(u))
+--
+1.8.5.4
+
Added: 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
===
--- 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
(rev 0)
+++ 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
2014-02-08 19:30:22 UTC (rev 205601)
@@ -0,0 +1,33 @@
+From 6c7980093c4e39d07bf06484f96f489e236c7c29 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Thu, 10 Oct 2013 01:38:11 +0200
+Subject: [PATCH] do not accept "garbage" from acpi firmware performance data
+ (FPDT)
+
+ 46 42 50 54 38 00 00 00 02 00 30 02 00 00 00 00 |FBPT8.0.|
+0010 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |#E..|
+0020 f5 6a 51 00 00 00 00 00 00 00 00 00 00 00 00 00 |.jQ.|
+0030 00 00 00 00 00 00 00 00 70 74 61 6c 58 00 00 00 |ptalX...|
+---
+ src/shared/acpi-fpdt.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
+index af58c7c..75648b4 100644
+--- a/src/shared/acpi-fpdt.c
b/src/shared/acpi-fpdt.c
+@@ -146,6 +146,11 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t
*loader_exit) {
+ if (brec.type != ACPI_FPDT_BOOT_REC)
+ return -EINVAL;
+
++if (brec.startup_start == 0 || brec.exit_services_exit <
brec.startup_start)
++return -EINVAL;
++if (brec.exit_services_exit > NSEC_PER_HOUR)
++return -EINVAL;
++
+ if (loader_start)
+ *loader_start = brec.startup_start / 1000;
+ if (loader_exit)
+--
+1.8.5.4
+
Added: 0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
[arch-commits] Commit in systemd/trunk (4 files)
Date: Monday, October 21, 2013 @ 15:35:56
Author: dreisner
Revision: 197018
upgpkg: systemd 208-2
- backport various fixes
Added:
systemd/trunk/0001-mount-check-for-NULL-before-reading-pm-what.patch
systemd/trunk/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/systemd.install
-+
0001-mount-check-for-NULL-before-reading-pm-what.patch | 29 +
0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch | 50
++
PKGBUILD| 17 ++-
systemd.install |2
4 files changed, 91 insertions(+), 7 deletions(-)
Added: 0001-mount-check-for-NULL-before-reading-pm-what.patch
===
--- 0001-mount-check-for-NULL-before-reading-pm-what.patch
(rev 0)
+++ 0001-mount-check-for-NULL-before-reading-pm-what.patch 2013-10-21
13:35:56 UTC (rev 197018)
@@ -0,0 +1,29 @@
+From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001
+From: Dave Reisner
+Date: Fri, 4 Oct 2013 18:22:40 -0400
+Subject: [PATCH] mount: check for NULL before reading pm->what
+
+Since a57f7e2c828b85, a mount unit with garbage in it would cause
+systemd to crash on loading it.
+
+ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 93bfa99..db055f0 100644
+--- a/src/core/mount.c
b/src/core/mount.c
+@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) {
+ * for the source path (if this is a bind mount) to be
+ * available. */
+ pm = get_mount_parameters_fragment(m);
+-if (pm && path_is_absolute(pm->what)) {
++if (pm && pm->what && path_is_absolute(pm->what)) {
+ r = unit_require_mounts_for(UNIT(m), pm->what);
+ if (r < 0)
+ return r;
+--
+1.8.4.1
+
Added: 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
===
--- 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
(rev 0)
+++ 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
2013-10-21 13:35:56 UTC (rev 197018)
@@ -0,0 +1,50 @@
+From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001
+From: Dave Reisner
+Date: Sun, 6 Oct 2013 18:26:23 -0400
+Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node
+
+Triggered false negatives when encoding a string which needed every
+character to be escaped, e.g. "LABEL=/".
+---
+ src/shared/util.c| 2 +-
+ src/test/test-device-nodes.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 82f4221..31cea79 100644
+--- a/src/shared/util.c
b/src/shared/util.c
+@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue,
const char *by) {
+ if (u == NULL)
+ return NULL;
+
+-enc_len = strlen(u) * 4;
++enc_len = strlen(u) * 4 + 1;
+ t = new(char, enc_len);
+ if (t == NULL)
+ return NULL;
+diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
+index 2f3dedb..59ba4be 100644
+--- a/src/test/test-device-nodes.c
b/src/test/test-device-nodes.c
+@@ -26,7 +26,7 @@
+
+ /* helpers for test_encode_devnode_name */
+ static char *do_encode_string(const char *in) {
+-size_t out_len = strlen(in) * 4;
++size_t out_len = strlen(in) * 4 + 1;
+ char *out = malloc(out_len);
+
+ assert_se(out);
+@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) {
+ assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
+ assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
+ assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
++assert_se(expect_encoded_as("/", "\\x2f"));
++assert_se(expect_encoded_as("!", "\\x21"));
+ }
+
+ int main(int argc, char *argv[]) {
+--
+1.8.4.1
+
Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 13:33:51 UTC (rev 197017)
+++ PKGBUILD2013-10-21 13:35:56 UTC (rev 197018)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=208
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd";
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl'
'gobject-introspection' 'gperf'
@@ -15,16 +15,22 @@
'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
-'0001-fix-lingering-references-to-var-lib-backlight-random.pat
[arch-commits] Commit in systemd/trunk (4 files)
Date: Sunday, September 29, 2013 @ 22:22:13
Author: thomas
Revision: 195281
upgpkg: systemd 207-6 - add a few more upstream patches
7ab064a6d60c cryptsetup-generator: allow specifying options in /proc/cmdline
ecd1e54ca6bf man: document luks.options kernel commandline
3cf0f8f7e0b9 udev-rules: avoid erroring on trailing whitespace
Added:
systemd/trunk/0001-cryptsetup-generator-allow-specifying-options-in-pro.patch
systemd/trunk/0001-man-document-luks.options-kernel-commandline.patch
systemd/trunk/0001-udev-rules-avoid-erroring-on-trailing-whitespace.patch
Modified:
systemd/trunk/PKGBUILD
-+
0001-cryptsetup-generator-allow-specifying-options-in-pro.patch | 190
++
0001-man-document-luks.options-kernel-commandline.patch | 28 +
0001-udev-rules-avoid-erroring-on-trailing-whitespace.patch | 32 +
PKGBUILD| 15
4 files changed, 262 insertions(+), 3 deletions(-)
Added: 0001-cryptsetup-generator-allow-specifying-options-in-pro.patch
===
--- 0001-cryptsetup-generator-allow-specifying-options-in-pro.patch
(rev 0)
+++ 0001-cryptsetup-generator-allow-specifying-options-in-pro.patch
2013-09-29 20:22:13 UTC (rev 195281)
@@ -0,0 +1,190 @@
+From 7ab064a6d60cf805765077b67d56c123f9cf3c58 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen
+Date: Sun, 18 Aug 2013 14:59:00 +0800
+Subject: [PATCH] cryptsetup-generator: allow specifying options in
+ /proc/cmdline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The main usecase for this is to make it possible to use cryptsetup in
+the initrd without it having to include a host-specific /etc/crypttab.
+
+Tested-by: Thomas Bächler
+---
+ man/systemd-cryptsetup-generator.xml | 23 ++
+ src/cryptsetup/cryptsetup-generator.c | 79 +--
+ 2 files changed, 98 insertions(+), 4 deletions(-)
+
+diff --git a/man/systemd-cryptsetup-generator.xml
b/man/systemd-cryptsetup-generator.xml
+index 215ac2d..d6b7e49 100644
+--- a/man/systemd-cryptsetup-generator.xml
b/man/systemd-cryptsetup-generator.xml
+@@ -137,6 +137,29 @@
+ will be activated in the initrd or the real
root.
+
+
++
++
++luks.options=
++
rd.luks.options=
++
++Takes a LUKS super
++block UUID followed by an '=' and a string
++of options separated by commas as argument.
++This will override the options for the given
++UUID.
++If only a list of options, without an
++UUID, is specified, they apply to any UUIDs
not
++specified elsewhere, and without an entry in
++/etc/crypttab.
++rd.luks.options=
++is honored only by initial RAM disk
++(initrd) while
++luks.options= is
++honored by both the main system and
++the initrd.
++
++
++
+
+ luks.key=
+ rd.luks.key=
+diff --git a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
+index 967c5e6..ba6efa6 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
b/src/cryptsetup/cryptsetup-generator.c
+@@ -240,7 +240,7 @@ static int create_disk(
+ return 0;
+ }
+
+-static int parse_proc_cmdline(char ***arg_proc_cmdline_disks, char
**arg_proc_cmdline_keyfile) {
++static int parse_proc_cmdline(char ***arg_proc_cmdline_disks, char
***arg_proc_cmdline_options, char **arg_proc_cmdline_keyfile) {
+ _cleanup_free_ char *line = NULL;
+ char *w = NULL, *state = NULL;
+ int r;
+@@ -307,7 +307,20 @@ static int parse_proc_cmdline(char
***arg_proc_cmdline_disks, char **arg_proc_cm
+ return log_oom();
+ }
+
++} else if (startswith(word, "luks.options=")) {
++if (strv_extend(arg_proc_cmdline_options, word + 13)
< 0)
++return log_oom();
++
++} else if (startswith(word, "rd.luks.options=")) {
++
++if (in_initrd()) {
++if (strv_extend(arg_
[arch-commits] Commit in systemd/trunk (4 files)
Date: Thursday, May 9, 2013 @ 16:54:06
Author: dreisner
Revision: 184991
upgpkg: systemd 204-1
- drop backported patches
- remove /bin/systemd symlink
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/systemd.install
Deleted:
systemd/trunk/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
systemd/trunk/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
-+
0001-login-add-missing-_public_-to-sd_get_machine_names.patch | 25 -
0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch | 45
--
PKGBUILD| 16 ---
systemd.install |5 +
4 files changed, 8 insertions(+), 83 deletions(-)
Deleted: 0001-login-add-missing-_public_-to-sd_get_machine_names.patch
===
--- 0001-login-add-missing-_public_-to-sd_get_machine_names.patch
2013-05-09 13:12:26 UTC (rev 184990)
+++ 0001-login-add-missing-_public_-to-sd_get_machine_names.patch
2013-05-09 14:54:06 UTC (rev 184991)
@@ -1,25 +0,0 @@
-From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering
-Date: Tue, 7 May 2013 12:47:30 +0200
-Subject: [PATCH] login: add missing _public_ to sd_get_machine_names()
-
- src/login/sd-login.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 66c4487..d0dc42f 100644
a/src/login/sd-login.c
-+++ b/src/login/sd-login.c
-@@ -591,7 +591,7 @@ _public_ int sd_get_uids(uid_t **users) {
- return r;
- }
-
--int sd_get_machine_names(char ***machines) {
-+_public_ int sd_get_machine_names(char ***machines) {
- _cleanup_closedir_ DIR *d = NULL;
- _cleanup_strv_free_ char **l = NULL;
- _cleanup_free_ char *md = NULL;
---
-1.8.2.2
-
Deleted: 0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
===
--- 0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
2013-05-09 13:12:26 UTC (rev 184990)
+++ 0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
2013-05-09 14:54:06 UTC (rev 184991)
@@ -1,45 +0,0 @@
-From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
-Date: Tue, 7 May 2013 11:35:23 -0400
-Subject: [PATCH] systemd-sleep: it is not an error if the config file is
- missing
-
- src/shared/sleep-config.c | 19 ---
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index 73a3acb..cd3238b 100644
a/src/shared/sleep-config.c
-+++ b/src/shared/sleep-config.c
-@@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes,
char ***states) {
- FILE _cleanup_fclose_ *f;
-
- f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
--if (!f) {
--if (errno == ENOENT)
--return 0;
--
--log_warning("Failed to open configuration file "
PKGSYSCONFDIR "/sleep.conf: %m");
--return 0;
-+if (!f)
-+log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
-+ "Failed to open configuration file " PKGSYSCONFDIR
"/sleep.conf: %m");
-+else {
-+r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f,
"Sleep\0",
-+ config_item_table_lookup, (void*) items,
false, false, NULL);
-+if (r < 0)
-+log_warning("Failed to parse configuration file: %s",
strerror(-r));
- }
-
--r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
-- config_item_table_lookup, (void*) items, false,
false, NULL);
--if (r < 0)
--log_warning("Failed to parse configuration file: %s",
strerror(-r));
--
- if (streq(verb, "suspend")) {
- /* empty by default */
- *modes = suspend_mode;
---
-1.8.2.2
-
Modified: PKGBUILD
===
--- PKGBUILD2013-05-09 13:12:26 UTC (rev 184990)
+++ PKGBUILD2013-05-09 14:54:06 UTC (rev 184991)
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=203
-pkgrel=2
+pkgver=204
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd";
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,15 +16,11 @@
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
-'0001-login-add-missing-_public_-to-sd_get_machine_names.patch'
-'0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch'
'use-split-usr-path.patch')
-md5sums=('
[arch-commits] Commit in systemd/trunk (4 files)
Date: Friday, April 19, 2013 @ 05:13:40
Author: dreisner
Revision: 183241
upgpkg: systemd 202-1
- add sodepends
Modified:
systemd/trunk/PKGBUILD
Deleted:
systemd/trunk/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
systemd/trunk/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
systemd/trunk/0001-logind-avoid-creating-stale-session-state-files.patch
-+
0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch | 167
--
0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch | 35 --
0001-logind-avoid-creating-stale-session-state-files.patch | 48 --
PKGBUILD| 20 -
4 files changed, 6 insertions(+), 264 deletions(-)
Deleted: 0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
===
--- 0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
2013-04-19 01:14:07 UTC (rev 183240)
+++ 0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
2013-04-19 03:13:40 UTC (rev 183241)
@@ -1,167 +0,0 @@
-From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
-Date: Sat, 13 Apr 2013 20:22:53 -0400
-Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines
-
-https://bugs.freedesktop.org/show_bug.cgi?id=63477
- src/binfmt/binfmt.c | 2 +-
- src/journal/catalog.c | 2 +-
- src/modules-load/modules-load.c | 2 +-
- src/shared/conf-parser.c| 2 +-
- src/shared/install.c| 2 +-
- src/shared/util.h | 2 +-
- src/sysctl/sysctl.c | 2 +-
- src/test/test-unit-file.c | 31 +++
- 8 files changed, 38 insertions(+), 7 deletions(-)
-
-diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index 9ca1e60..5a42b3d 100644
a/src/binfmt/binfmt.c
-+++ b/src/binfmt/binfmt.c
-@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool
ignore_enoent) {
- p = strstrip(l);
- if (!*p)
- continue;
--if (strchr(COMMENTS, *p))
-+if (strchr(COMMENTS "\n", *p))
- continue;
-
- k = apply_rule(p);
-diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index ebf0622..7681af6 100644
a/src/journal/catalog.c
-+++ b/src/journal/catalog.c
-@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb,
const char *path) {
- continue;
- }
-
--if (strchr(COMMENTS, line[0]))
-+if (strchr(COMMENTS "\n", line[0]))
- continue;
-
- if (empty_line &&
-diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 9ee2603..b3f7af0 100644
a/src/modules-load/modules-load.c
-+++ b/src/modules-load/modules-load.c
-@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char
*path, bool ignore_enoent
- l = strstrip(line);
- if (!*l)
- continue;
--if (strchr(COMMENTS, *l))
-+if (strchr(COMMENTS "\n", *l))
- continue;
-
- k = load_module(ctx, l);
-diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index fbacf98..fea2e56 100644
a/src/shared/conf-parser.c
-+++ b/src/shared/conf-parser.c
-@@ -174,7 +174,7 @@ static int parse_line(
- if (!*l)
- return 0;
-
--if (strchr(COMMENTS, *l))
-+if (strchr(COMMENTS "\n", *l))
- return 0;
-
- if (startswith(l, ".include ")) {
-diff --git a/src/shared/install.c b/src/shared/install.c
-index f9d223e..71e0433 100644
a/src/shared/install.c
-+++ b/src/shared/install.c
-@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const
char *name) {
- if (!*l)
- continue;
-
--if (strchr(COMMENTS, *l))
-+if (strchr(COMMENTS "\n", *l))
- continue;
-
- if (first_word(l, "enable")) {
-diff --git a/src/shared/util.h b/src/shared/util.h
-index 99ec0a3..ad97536 100644
a/src/shared/util.h
-+++ b/src/shared/util.h
-@@ -52,7 +52,7 @@ union dirent_storage {
- #define WHITESPACE " \t\n\r"
- #define NEWLINE "\n\r"
- #define QUOTES "\"\'"
--#define COMMENTS "#;\n"
-+#define COMMENTS "#;"
-
- #define FORMAT_BYTES_MAX 8
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index e0ba78a..db18dd9 100644
a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char
*path, bool ignore_eno
-
[arch-commits] Commit in systemd/trunk (4 files)
Date: Sunday, April 14, 2013 @ 19:41:42
Author: dreisner
Revision: 182760
upgpkg: systemd 201-2
- backport trivial fixes from git master
Added:
systemd/trunk/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
systemd/trunk/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch
systemd/trunk/0001-logind-avoid-creating-stale-session-state-files.patch
Modified:
systemd/trunk/PKGBUILD
-+
0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch | 167
++
0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch | 35 ++
0001-logind-avoid-creating-stale-session-state-files.patch | 48 ++
PKGBUILD| 10
4 files changed, 260 insertions(+)
Added: 0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
===
--- 0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
(rev 0)
+++ 0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch
2013-04-14 17:41:42 UTC (rev 182760)
@@ -0,0 +1,167 @@
+From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sat, 13 Apr 2013 20:22:53 -0400
+Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines
+
+https://bugs.freedesktop.org/show_bug.cgi?id=63477
+---
+ src/binfmt/binfmt.c | 2 +-
+ src/journal/catalog.c | 2 +-
+ src/modules-load/modules-load.c | 2 +-
+ src/shared/conf-parser.c| 2 +-
+ src/shared/install.c| 2 +-
+ src/shared/util.h | 2 +-
+ src/sysctl/sysctl.c | 2 +-
+ src/test/test-unit-file.c | 31 +++
+ 8 files changed, 38 insertions(+), 7 deletions(-)
+
+diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
+index 9ca1e60..5a42b3d 100644
+--- a/src/binfmt/binfmt.c
b/src/binfmt/binfmt.c
+@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool
ignore_enoent) {
+ p = strstrip(l);
+ if (!*p)
+ continue;
+-if (strchr(COMMENTS, *p))
++if (strchr(COMMENTS "\n", *p))
+ continue;
+
+ k = apply_rule(p);
+diff --git a/src/journal/catalog.c b/src/journal/catalog.c
+index ebf0622..7681af6 100644
+--- a/src/journal/catalog.c
b/src/journal/catalog.c
+@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb,
const char *path) {
+ continue;
+ }
+
+-if (strchr(COMMENTS, line[0]))
++if (strchr(COMMENTS "\n", line[0]))
+ continue;
+
+ if (empty_line &&
+diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
+index 9ee2603..b3f7af0 100644
+--- a/src/modules-load/modules-load.c
b/src/modules-load/modules-load.c
+@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char
*path, bool ignore_enoent
+ l = strstrip(line);
+ if (!*l)
+ continue;
+-if (strchr(COMMENTS, *l))
++if (strchr(COMMENTS "\n", *l))
+ continue;
+
+ k = load_module(ctx, l);
+diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
+index fbacf98..fea2e56 100644
+--- a/src/shared/conf-parser.c
b/src/shared/conf-parser.c
+@@ -174,7 +174,7 @@ static int parse_line(
+ if (!*l)
+ return 0;
+
+-if (strchr(COMMENTS, *l))
++if (strchr(COMMENTS "\n", *l))
+ return 0;
+
+ if (startswith(l, ".include ")) {
+diff --git a/src/shared/install.c b/src/shared/install.c
+index f9d223e..71e0433 100644
+--- a/src/shared/install.c
b/src/shared/install.c
+@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const
char *name) {
+ if (!*l)
+ continue;
+
+-if (strchr(COMMENTS, *l))
++if (strchr(COMMENTS "\n", *l))
+ continue;
+
+ if (first_word(l, "enable")) {
+diff --git a/src/shared/util.h b/src/shared/util.h
+index 99ec0a3..ad97536 100644
+--- a/src/shared/util.h
b/src/shared/util.h
+@@ -52,7 +52,7 @@ union dirent_storage {
+ #define WHITESPACE " \t\n\r"
+ #define NEWLINE "\n\r"
+ #define QUOTES "\"\'"
+-#define COMMENTS "#;\n"
++#define COMMENTS "#;"
+
+ #define FORMAT_BYTES_MAX 8
+
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index e0ba78a..db18dd9 100644
+--- a/src/sysctl/sysctl.c
b/src/sysctl/sysctl.c
+@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char
*path, bool ignore_eno
+
[arch-commits] Commit in systemd/trunk (4 files)
Date: Wednesday, March 20, 2013 @ 16:13:08
Author: dreisner
Revision: 180329
add upstream backports for various bugs
Added:
systemd/trunk/0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch
systemd/trunk/0001-rules-move-builtin-calls-before-the-permissions-sect.patch
systemd/trunk/0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch
Modified:
systemd/trunk/PKGBUILD
-+
0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch | 25
0001-rules-move-builtin-calls-before-the-permissions-sect.patch | 52
++
0001-strv-fix-STRV_FOREACH_PAIR-macro-definition.patch | 25
PKGBUILD| 18 ++-
4 files changed, 117 insertions(+), 3 deletions(-)
Added: 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch
===
--- 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch
(rev 0)
+++ 0001-journal-pass-the-pid-to-sd_pid_get_owner_uid.patch 2013-03-20
15:13:08 UTC (rev 180329)
@@ -0,0 +1,25 @@
+From 83d7d83bcc6c462ecbb4c8003e3a8b41f3b88d46 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Sat, 16 Mar 2013 16:10:22 +0100
+Subject: [PATCH] journal: pass the *pid* to sd_pid_get_owner_uid()
+
+---
+ src/journal/journald-server.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index ac565c7..364ab0f 100644
+--- a/src/journal/journald-server.c
b/src/journal/journald-server.c
+@@ -593,7 +593,7 @@ static void dispatch_message_real(
+ IOVEC_SET_STRING(iovec[n++], session);
+ }
+
+-if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0) {
++if (sd_pid_get_owner_uid(ucred->pid, &owner) >= 0) {
+ owner_valid = true;
+ if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu",
(unsigned long) owner) >= 0)
+ IOVEC_SET_STRING(iovec[n++], owner_uid);
+--
+1.8.2
+
Added: 0001-rules-move-builtin-calls-before-the-permissions-sect.patch
===
--- 0001-rules-move-builtin-calls-before-the-permissions-sect.patch
(rev 0)
+++ 0001-rules-move-builtin-calls-before-the-permissions-sect.patch
2013-03-20 15:13:08 UTC (rev 180329)
@@ -0,0 +1,52 @@
+From bbb7f2ae5035105575365750592caa87213d7072 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Wed, 20 Mar 2013 01:26:17 +0100
+Subject: [PATCH] rules: move builtin calls before the permissions section
+
+ kay: systemd commit 22582bb broke cups usb printing for me
+ because the "lp" group isn't applied anymore
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",
ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
+ moving this line to the end of 50-udev-default.rules restores correct
behavior, as it's after usb_id
+---
+ rules/50-udev-default.rules | 15 +--
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
+index 9d17cf7..1790652 100644
+--- a/rules/50-udev-default.rules
b/rules/50-udev-default.rules
+@@ -1,5 +1,12 @@
+ # do not edit this file, it will be overwritten on update
+
++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
++SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*",
SYMLINK+="virtio-ports/$attr{name}"
++
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id",
IMPORT{builtin}="hwdb --subsystem=usb"
++SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
++ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
++
+ ACTION!="add", GOTO="default_permissions_end"
+
+ SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
+@@ -8,6 +15,8 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty",
MODE="0620"
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
+ KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*",
GROUP="dialout"
+
++SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644"
++
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+
+ SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640"
+@@ -59,9 +68,3 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
+ KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
+
+ LABEL="default_permissions_end"
+-SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc"
+-SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*",
SYMLINK+="virtio-ports/$attr{name}"
+-
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id",
IMPORT{builtin}="hwdb --subsystem=usb"
+-SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
+-ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
+--
+1.
[arch-commits] Commit in systemd/trunk (4 files)
Date: Tuesday, November 20, 2012 @ 21:10:57
Author: tomegun
Revision: 171675
prepare for 196
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/systemd.install
systemd/trunk/use-split-usr-path.patch
Deleted:
systemd/trunk/0001-Reinstate-TIMEOUT-handling.patch
---+
0001-Reinstate-TIMEOUT-handling.patch | 124
PKGBUILD | 20 +
systemd.install |7 +
use-split-usr-path.patch |2
4 files changed, 13 insertions(+), 140 deletions(-)
Deleted: 0001-Reinstate-TIMEOUT-handling.patch
===
--- 0001-Reinstate-TIMEOUT-handling.patch 2012-11-21 02:05:29 UTC (rev
171674)
+++ 0001-Reinstate-TIMEOUT-handling.patch 2012-11-21 02:10:57 UTC (rev
171675)
@@ -1,124 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
- src/libudev/libudev-device.c | 19 +++
- src/libudev/libudev-private.h |1 +
- src/udev/udevd.c | 13 ++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
- struct udev_list tags_list;
- unsigned long long int seqnum;
- unsigned long long int usec_initialized;
-+int timeout;
- int devlink_priority;
- int refcount;
- dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
- bool db_persist;
- };
-
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int
timeout)
-+{
-+char num[32];
-+
-+udev_device->timeout = timeout;
-+snprintf(num, sizeof(num), "%u", timeout);
-+udev_device_add_property(udev_device, "TIMEOUT", num);
-+return 0;
-+}
-+
- /**
- * udev_device_get_seqnum:
- * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct
udev_device *udev_device,
-
- util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys",
&property[8], NULL);
- udev_device_set_syspath(udev_device, path);
-+} else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+udev_device_set_timeout(udev_device, strtoull(&property[8],
NULL, 10));
- } else if (startswith(property, "SUBSYSTEM=")) {
- udev_device_set_subsystem(udev_device, &property[10]);
- } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
- udev_list_init(udev, &udev_device->sysattr_value_list, true);
- udev_list_init(udev, &udev_device->sysattr_list, false);
- udev_list_init(udev, &udev_device->tags_list, true);
-+udev_device->timeout = -1;
- udev_device->watch_handle = -1;
- /* copy global properties */
- udev_list_entry_foreach(list_entry,
udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device
*udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device
*udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device,
unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
- }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
- struct udev_list_node *loop;
-
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
- return;
- }
-
--if (children >= children_max) {
-+if (!force && children >= children_max) {
- if (children_max > 1)
- log_debug("maximum number (%i) of children
reached\n", children);
- return;
-@@ -444,6 +444
[arch-commits] Commit in systemd/trunk (4 files)
Date: Monday, June 4, 2012 @ 16:23:03
Author: dreisner
Revision: 160744
upgpkg: systemd 185-1
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-hook-udev
Deleted:
systemd/trunk/0001-0002-avoid-mangling-fstab-source-paths.patch
systemd/trunk/0001-unit-name-never-create-a-unit-name-with-a-leading.patch
--+
0001-0002-avoid-mangling-fstab-source-paths.patch| 80 --
0001-unit-name-never-create-a-unit-name-with-a-leading.patch | 77 -
PKGBUILD | 27 ---
initcpio-hook-udev |2
4 files changed, 5 insertions(+), 181 deletions(-)
Deleted: 0001-0002-avoid-mangling-fstab-source-paths.patch
===
--- 0001-0002-avoid-mangling-fstab-source-paths.patch 2012-06-04 20:00:59 UTC
(rev 160743)
+++ 0001-0002-avoid-mangling-fstab-source-paths.patch 2012-06-04 20:23:03 UTC
(rev 160744)
@@ -1,80 +0,0 @@
-From 2b71016a3c3d4c088e8edd170fe6eb8431fd71fa Mon Sep 17 00:00:00 2001
-From: Kay Sievers
-Date: Mon, 4 Jun 2012 12:52:14 +0200
-Subject: [PATCH] fstab-generator: avoid mangling of non-path mount source and
- dest
-
-This can invalidate otherwise valid source paths with trailing slashes,
-such as "host:/" in the case of a network mount.
-
-Based on a patch from Dave Reisner , which
-removed the slash mangling entirely.
-
-Changed it to match on the leading slash to exclude non-path values.
- src/fstab-generator/fstab-generator.c |4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
-index 8419a0c..0746724 100644
a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -470,10 +470,10 @@ static int parse_fstab(void) {
- goto finish;
- }
-
--if (is_path(what))
-+if (path_is_absolute(what))
- path_kill_slashes(what);
-
--if (is_path(where))
-+if (path_is_absolute(where))
- path_kill_slashes(where);
-
- log_debug("Found entry what=%s where=%s type=%s", what,
where, me->mnt_type);
---
-1.7.10.3
-
-From ec6ceb18663940efb1963704923430be0e83f1f7 Mon Sep 17 00:00:00 2001
-From: Kay Sievers
-Date: Mon, 4 Jun 2012 15:21:05 +0200
-Subject: [PATCH] fstab-generator: avoid mangling of mount source string
-
-This is a valid source entry in /etc/fstab:
- //192.168.6.10/data /data cifs noperm,auto
-
-On Mon, Jun 4, 2012 at 2:04 PM, Dave Reisner wrote:
-> On Mon, Jun 04, 2012 at 12:57:47PM +0200, Kay Sievers wrote:
->>
->> Changed it to use:
->> path_is_absolute()
->> instead of:
->> is_path(),
->> so that we still sanitize the input we might match against.
->>
->> Let me know, if you think that could still cause any problems?
-
-> Yes, this will still break CIFS shares.
- src/fstab-generator/fstab-generator.c |5 +
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/fstab-generator/fstab-generator.c
b/src/fstab-generator/fstab-generator.c
-index 0746724..d9ba3e3 100644
a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -470,10 +470,7 @@ static int parse_fstab(void) {
- goto finish;
- }
-
--if (path_is_absolute(what))
--path_kill_slashes(what);
--
--if (path_is_absolute(where))
-+if (is_path(where))
- path_kill_slashes(where);
-
- log_debug("Found entry what=%s where=%s type=%s", what,
where, me->mnt_type);
---
-1.7.10.3
-
Deleted: 0001-unit-name-never-create-a-unit-name-with-a-leading.patch
===
--- 0001-unit-name-never-create-a-unit-name-with-a-leading.patch
2012-06-04 20:00:59 UTC (rev 160743)
+++ 0001-unit-name-never-create-a-unit-name-with-a-leading.patch
2012-06-04 20:23:03 UTC (rev 160744)
@@ -1,77 +0,0 @@
-From 4b7126538c25268c79ff10d166920934f149a329 Mon Sep 17 00:00:00 2001
-From: Kay Sievers
-Date: Mon, 4 Jun 2012 14:57:24 +0200
-Subject: [PATCH] unit-name: never create a unit name with a leading '.'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Supposed to prevent creating unit files like:
- ├── dev-sda1.device.wants
- │ └── .dot.mount -> /run/systemd/generator/.dot.mount
- ├── .dot.mount
-from:
- # cat /etc/fstab
- /dev/sda1/.dot vfat ro 1 3
-
-which we later skip reading because of the leading '.'.
- src/shared/unit-name.c | 29 -
- 1 file changed, 20 insertions(+), 9 deletions(-)
-
-diff --git a/src/shared/unit-name.c
[arch-commits] Commit in systemd/trunk (4 files)
Date: Thursday, January 26, 2012 @ 08:47:15
Author: dreisner
Revision: 147676
upgpkg: systemd 39-2
- backport patch to fix automount regression
- add $pkgdir/var/lib/systemd for logind
Added:
systemd/trunk/0001-mount-fix-automount-regression.patch
Modified:
systemd/trunk/PKGBUILD
Deleted:
systemd/trunk/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
systemd/trunk/0001-units-make-sure-syslog-socket-goes-away-early-during.patch
-+
0001-mount-fix-automount-regression.patch | 45 +
0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch | 87
--
0001-units-make-sure-syslog-socket-goes-away-early-during.patch | 26 --
PKGBUILD| 14 +
4 files changed, 56 insertions(+), 116 deletions(-)
Added: 0001-mount-fix-automount-regression.patch
===
--- 0001-mount-fix-automount-regression.patch (rev 0)
+++ 0001-mount-fix-automount-regression.patch 2012-01-26 13:47:15 UTC (rev
147676)
@@ -0,0 +1,45 @@
+From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
+From: Michal Schmidt
+Date: Thu, 26 Jan 2012 01:19:19 +0100
+Subject: [PATCH] mount: fix automount regression
+
+Tom Gundersen noticed a regression where comment=systemd.automount in
+fstab no longer prevented the adding of the After=foo.mount dependency
+into local-fs.target. He bisected it to commit 9ddc4a26.
+
+It turns out that clearing the default_dependencies flag is necessary
+after all, in order to avoid complementing of Wants= with After= in the
+target unit. We still want to add the dependencies on quota units and
+umount.target though.
+---
+ src/mount.c |7 ++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/src/mount.c b/src/mount.c
+index 6d0af4e..965f705 100644
+--- a/src/mount.c
b/src/mount.c
+@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
+
+ if (UNIT(m)->fragment_path)
+ m->from_fragment = true;
++else if (m->from_etc_fstab)
++/* We always add several default dependencies to
fstab mounts,
++ * but we do not want the implicit complementing of
Wants= with After=
++ * in the target unit that this mount unit will be
hooked into. */
++UNIT(m)->default_dependencies = false;
+
+ if (!m->where)
+ if (!(m->where = unit_name_to_path(u->id)))
+@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
+ if ((r = mount_add_fstab_links(m)) < 0)
+ return r;
+
+-if (UNIT(m)->default_dependencies)
++if (UNIT(m)->default_dependencies || m->from_etc_fstab)
+ if ((r = mount_add_default_dependencies(m)) < 0)
+ return r;
+
+--
+1.7.8.4
+
Deleted: 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
===
--- 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
2012-01-26 13:05:16 UTC (rev 147675)
+++ 0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch
2012-01-26 13:47:15 UTC (rev 147676)
@@ -1,87 +0,0 @@
-From fdcad0c25579a60061b1fda956686e878a80faef Mon Sep 17 00:00:00 2001
-From: Lennart Poettering
-Date: Wed, 11 Jan 2012 22:07:35 +0100
-Subject: [PATCH] tmpfiles: fix parsing of /proc/net/unix on 32Bit machines
-
-Tracked down by Michael Meeks
- src/tmpfiles.c | 30 --
- 1 files changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/tmpfiles.c b/src/tmpfiles.c
-index 19a7c08..44e5c9d 100644
a/src/tmpfiles.c
-+++ b/src/tmpfiles.c
-@@ -117,41 +117,50 @@ static void load_unix_sockets(void) {
- /* We maintain a cache of the sockets we found in
- * /proc/net/unix to speed things up a little. */
-
--if (!(unix_sockets = set_new(string_hash_func, string_compare_func)))
-+unix_sockets = set_new(string_hash_func, string_compare_func);
-+if (!unix_sockets)
- return;
-
--if (!(f = fopen("/proc/net/unix", "re")))
-+f = fopen("/proc/net/unix", "re");
-+if (!f)
- return;
-
--if (!(fgets(line, sizeof(line), f)))
-+/* Skip header */
-+if (!fgets(line, sizeof(line), f))
- goto fail;
-
- for (;;) {
- char *p, *s;
- int k;
-
--if (!(fgets(line, sizeof(line), f)))
-+if (!fgets(line, sizeof(line), f))
- break;
-
- truncate_nl(line);
-
--if (strlen(line) < 53)
-+p = strchr(line, ':');
-+
