Blame 0533-core-don-t-allow-enabling-if-unit-is-masked.patch
|
 |
708deb9 |
From 85fa479ca5358d9472245eb0da6a86b5d644ccf9 Mon Sep 17 00:00:00 2001
|
|
|
708deb9 |
From: Jan Synacek <jsynacek@redhat.com>
|
|
|
708deb9 |
Date: Tue, 7 Oct 2014 13:35:41 +0200
|
|
|
708deb9 |
Subject: [PATCH] core: don't allow enabling if unit is masked
|
|
|
708deb9 |
|
|
|
708deb9 |
---
|
|
|
708deb9 |
src/shared/install.c | 13 +++++++++++++
|
|
|
708deb9 |
1 file changed, 13 insertions(+)
|
|
|
708deb9 |
|
|
|
708deb9 |
diff --git a/src/shared/install.c b/src/shared/install.c
|
|
|
708deb9 |
index fa064c230f..945bb2748d 100644
|
|
|
708deb9 |
--- a/src/shared/install.c
|
|
|
708deb9 |
+++ b/src/shared/install.c
|
|
|
708deb9 |
@@ -1516,6 +1516,19 @@ int unit_file_enable(
|
|
|
708deb9 |
return r;
|
|
|
708deb9 |
|
|
|
708deb9 |
STRV_FOREACH(i, files) {
|
|
|
708deb9 |
+ UnitFileState state;
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ state = unit_file_get_state(scope, root_dir, *i);
|
|
|
708deb9 |
+ if (state < 0) {
|
|
|
708deb9 |
+ log_error("Failed to get unit file state for %s: %s", *i, strerror(-state));
|
|
|
708deb9 |
+ return state;
|
|
|
708deb9 |
+ }
|
|
|
708deb9 |
+
|
|
|
708deb9 |
+ if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) {
|
|
|
708deb9 |
+ log_error("Failed to enable unit: Unit %s is masked", *i);
|
|
|
708deb9 |
+ return -ENOTSUP;
|
|
|
708deb9 |
+ }
|
|
|
708deb9 |
+
|
|
|
708deb9 |
r = install_info_add_auto(&c, *i);
|
|
|
708deb9 |
if (r < 0)
|
|
|
708deb9 |
return r;
|