chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
activate: port to use new getpeername_pretty()/getsockname_pretty() calls
[elogind.git]
/
src
/
fsck
/
fsck.c
diff --git
a/src/fsck/fsck.c
b/src/fsck/fsck.c
index 10c968678b365fc5dc23ede1a3a7dac17d98d98f..9b67ccfc0e278527c47abc64132f881effcb94cf 100644
(file)
--- a/
src/fsck/fsck.c
+++ b/
src/fsck/fsck.c
@@
-35,7
+35,6
@@
#include "bus-util.h"
#include "bus-error.h"
#include "bus-errors.h"
#include "bus-util.h"
#include "bus-error.h"
#include "bus-errors.h"
-#include "virt.h"
#include "fileio.h"
#include "udev-util.h"
#include "fileio.h"
#include "udev-util.h"
@@
-75,17
+74,14
@@
static void start_target(const char *target) {
static int parse_proc_cmdline(void) {
char *line, *w, *state;
static int parse_proc_cmdline(void) {
char *line, *w, *state;
- int r;
size_t l;
size_t l;
+ int r;
- if (detect_container(NULL) > 0)
- return 0;
-
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
+ r = proc_cmdline(&line);
+ if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return 0;
return 0;
- }
FOREACH_WORD_QUOTED(w, l, line, state) {
FOREACH_WORD_QUOTED(w, l, line, state) {