From 7c697168102cb64c5cb65a542959684014da99c7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 23 Jan 2012 21:56:55 +0100 Subject: [PATCH] util: use /dev/rtc symlink if possible before we go searching for a suitable device --- TODO | 2 +- src/util.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/TODO b/TODO index 3b4d45fb7..f2e47e4bd 100644 --- a/TODO +++ b/TODO @@ -113,7 +113,7 @@ Features: * readahead: check whether a btrfs volume includes ssd by checking mount flag "ssd" -* support sd_notify() style notification when reload begins (RELOADING=1), reload is finished (READY=1) +* support sd_notify() style notification when reload begins (RELOADING=1), reload is finished (READY=1), and add ReloadSignal= then to use in combination * support sd_notify() style notification when shutting down, to make auto-exit bus services work (STOPPING=1) diff --git a/src/util.c b/src/util.c index 1babb6aed..c9ad831c6 100644 --- a/src/util.c +++ b/src/util.c @@ -5235,8 +5235,14 @@ int rtc_open(int flags) { int fd; DIR *d; - /* We open the first RTC which has hctosys=1 set. If we don't - * find any we just take the first one */ + /* First, we try to make use of the /dev/rtc symlink. If that + * doesn't exist, we open the first RTC which has hctosys=1 + * set. If we don't find any we just take the first RTC that + * exists at all. */ + + fd = open("/dev/rtc", flags); + if (fd >= 0) + return fd; d = opendir("/sys/class/rtc"); if (!d) -- 2.30.2