Print warning if user starts container manager manually
This commit is contained in:
parent
fdbd63efa3
commit
22fcbabb64
3 changed files with 15 additions and 2 deletions
|
|
@ -37,7 +37,8 @@ start() {
|
||||||
|
|
||||||
exec $AA_EXEC $SNAP/bin/anbox-wrapper.sh container-manager \
|
exec $AA_EXEC $SNAP/bin/anbox-wrapper.sh container-manager \
|
||||||
--data-path=$DATA_PATH \
|
--data-path=$DATA_PATH \
|
||||||
--android-image=$ANDROID_IMG
|
--android-image=$ANDROID_IMG \
|
||||||
|
--daemon
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
|
|
|
||||||
|
|
@ -48,11 +48,22 @@ anbox::cmds::ContainerManager::ContainerManager()
|
||||||
flag(cli::make_flag(cli::Name{"privileged"},
|
flag(cli::make_flag(cli::Name{"privileged"},
|
||||||
cli::Description{"Run Android container in privileged mode"},
|
cli::Description{"Run Android container in privileged mode"},
|
||||||
privileged_));
|
privileged_));
|
||||||
|
flag(cli::make_flag(cli::Name{"daemon"},
|
||||||
|
cli::Description{"Mark service as being started as systemd daemon"},
|
||||||
|
daemon_));
|
||||||
|
|
||||||
action([&](const cli::Command::Context&) {
|
action([&](const cli::Command::Context&) {
|
||||||
try {
|
try {
|
||||||
|
if (!daemon_) {
|
||||||
|
WARNING("You are running the container manager manually which is most likely not");
|
||||||
|
WARNING("what you want. The container manager is normally started by systemd or");
|
||||||
|
WARNING("or another init system. If you still want to run the container-manager");
|
||||||
|
WARNING("you can get rid of this warning by starting with the --daemon option.");
|
||||||
|
WARNING("");
|
||||||
|
}
|
||||||
|
|
||||||
if (getuid() != 0) {
|
if (getuid() != 0) {
|
||||||
ERROR("You're not running the container-manager as root. Generally you don't");
|
ERROR("You are not running the container-manager as root. Generally you don't");
|
||||||
ERROR("want to run the container-manager manually unless you're a developer");
|
ERROR("want to run the container-manager manually unless you're a developer");
|
||||||
ERROR("as it is started by the init system of your operating system.");
|
ERROR("as it is started by the init system of your operating system.");
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ class ContainerManager : public cli::CommandWithFlagsAndAction {
|
||||||
std::shared_ptr<common::LoopDevice> android_img_loop_dev_;
|
std::shared_ptr<common::LoopDevice> android_img_loop_dev_;
|
||||||
std::vector<std::shared_ptr<common::MountEntry>> mounts_;
|
std::vector<std::shared_ptr<common::MountEntry>> mounts_;
|
||||||
bool privileged_ = false;
|
bool privileged_ = false;
|
||||||
|
bool daemon_ = false;
|
||||||
};
|
};
|
||||||
} // namespace cmds
|
} // namespace cmds
|
||||||
} // namespace anbox
|
} // namespace anbox
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue