if (dir_is_empty("/usr") <= 0)
return;
- log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
+ log_warning("/usr appears to be on its own filesytem and is not already mounted. This is not a supported setup. "
"Some things will probably break (sometimes even silently) in mysterious ways. "
"Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
}
goto finish;
if (hwclock_is_localtime() > 0) {
- int min;
+ int err, min;
- min = hwclock_apply_localtime_delta();
- if (min < 0)
- log_error("Failed to apply local time delta: %s", strerror(-min));
+ err = hwclock_apply_localtime_delta(&min);
+ if (err < 0)
+ log_error("Failed to apply local time delta: %s", strerror(-err));
else
log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
}