[systemd-devel] [ANNOUNCE] systemd 211

[Tomasz Torcz]

On Wed, Mar 12, 2014 at 10:23:26AM +0100, Thomas Bächler wrote:
> 
> I had no time to look into this yet, but there's something wrong. I
> don't have GPT partitions on this machine (so the generator shouldn't do
> anyting), but I get an error during boot:
> 
> [    4.634733] evey systemd-gpt-auto-generator[226]: Out of memory.
> 
> I do have plenty of free memory available, so there is probably an
> incorrect log_oom() somewhere in there.
> 
> 


  Can you try with attached patch?

-- 
Tomasz Torcz            There exists no separation between gods and men:
xmpp: zdzichubg at chrome.pl   one blends softly casual into the other.

-------------- next part --------------
>From ea868942119b7afbfb709253ae6f02d18e67323d Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek at pipebreaker.pl>
Date: Wed, 12 Mar 2014 19:25:11 +0100
Subject: [PATCH] gpt-auto-generator: don't return OOM on parentless devices

---
 src/gpt-auto-generator/gpt-auto-generator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index e487f64..19c5eea 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -395,7 +395,7 @@ static int enumerate_partitions(dev_t devnum) {
 
         parent = udev_device_get_parent(d);
         if (!parent)
-                return log_oom();
+                return 0;
 
         /* Does it have a devtype? */
         devtype = udev_device_get_devtype(parent);
-- 
1.8.5.3