chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: add simple chroot(1) like tool to execute commands in a namespace container
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 37768c67adc8bd6d97a440561ca1c3c84739bb41..54ebb0b08cb8f67b6996a5f52eaab9c8c276e73d 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-226,6
+226,8
@@
static int parse_proc_cmdline_word(const char *word) {
static const char * const rlmap[] = {
"emergency", SPECIAL_EMERGENCY_TARGET,
static const char * const rlmap[] = {
"emergency", SPECIAL_EMERGENCY_TARGET,
+ "-b", SPECIAL_EMERGENCY_TARGET,
+ "b", SPECIAL_EMERGENCY_TARGET,
"single", SPECIAL_RESCUE_TARGET,
"-s", SPECIAL_RESCUE_TARGET,
"s", SPECIAL_RESCUE_TARGET,
"single", SPECIAL_RESCUE_TARGET,
"-s", SPECIAL_RESCUE_TARGET,
"s", SPECIAL_RESCUE_TARGET,
@@
-624,7
+626,7
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
assert(argc >= 1);
assert(argv);
- while ((c = getopt_long(argc, argv, "hD", options, NULL)) >= 0)
+ while ((c = getopt_long(argc, argv, "hD
bsz:
", options, NULL)) >= 0)
switch (c) {
switch (c) {
@@
-800,19
+802,29
@@
static int parse_argv(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
break;
log_set_max_level(LOG_DEBUG);
break;
- case '?':
- return -EINVAL;
+ case 'b':
+ case 's':
+ case 'z':
+ /* Just to eat away the sysvinit kernel
+ * cmdline args without getopt() error
+ * messages that we'll parse in
+ * parse_proc_cmdline_word() or ignore. */
+ case '?':
default:
default:
- log_error("Unknown option code %c", c);
- return -EINVAL;
+ if (getpid() != 1) {
+ log_error("Unknown option code %c", c);
+ return -EINVAL;
+ }
+
+ break;
}
/* PID 1 will get the kernel arguments as parameters, which we
* ignore and unconditionally read from
* /proc/cmdline. However, we need to ignore those arguments
* here. */
}
/* PID 1 will get the kernel arguments as parameters, which we
* ignore and unconditionally read from
* /proc/cmdline. However, we need to ignore those arguments
* here. */
- if (
arg_running_as != MANAGER_SYSTEM
&& optind < argc) {
+ if (
getpid() != 1
&& optind < argc) {
log_error("Excess arguments.");
return -EINVAL;
}
log_error("Excess arguments.");
return -EINVAL;
}
@@
-942,25
+954,13
@@
static void test_mtab(void) {
}
static void test_usr(void) {
}
static void test_usr(void) {
- bool separate = false;
/* Check that /usr is not a separate fs */
/* Check that /usr is not a separate fs */
- if (path_is_mount_point("/usr") > 0)
- separate = true;
- /* This check won't work usually during boot, since /usr is
- * probably not mounted yet, hence let's add a second
- * check. We just check whether /usr is an empty directory. */
-
if (dir_is_empty("/usr") > 0)
if (dir_is_empty("/usr") > 0)
- separate = true;
-
- if (!separate)
- return;
-
- log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
- "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.");
+ log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
+ "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.");
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
@@
-1042,9
+1042,16
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
+ if (arg_running_as == MANAGER_SYSTEM &&
+ arg_action == ACTION_RUN &&
+ running_in_chroot() > 0) {
+ log_error("Cannot be run in a chroot() environment.");
+ goto finish;
+ }
+
/* If Plymouth is being run make sure we show the status, so
* that there's something nice to see when people press Esc */
/* If Plymouth is being run make sure we show the status, so
* that there's something nice to see when people press Esc */
- if (access("/dev/.run/
systemd
/plymouth", F_OK) >= 0)
+ if (access("/dev/.run/
initramfs
/plymouth", F_OK) >= 0)
arg_show_status = true;
if (arg_action == ACTION_HELP) {
arg_show_status = true;
if (arg_action == ACTION_HELP) {