systemctl: try to reload daemon after enable/disable only when not running in a chroot

[elogind.git] / src / efi-boot-generator / efi-boot-generator.c

diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
index c7bf34a5326fd951211e8ae41e626cc1c4b818b0..88fa220d2f4fb6416cba523ca5d8977c760e548d 100644 (file)
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (!is_efiboot())
+        if (!is_efi_boot())
                 return EXIT_SUCCESS;
 
         if (dir_is_empty("/boot") <= 0)
@@ -77,6 +77,8 @@ int main(int argc, char *argv[]) {
 
         fprintf(f,
                 "# Automatially generated by systemd-efi-boot-generator\n\n"
+                "[Unit]\n"
+                "Description=EFI System Partition\n\n"
                 "[Mount]\n"
                 "Where=/boot\n"
                 "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
@@ -97,10 +99,11 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        fprintf(f,
-                "# Automatially generated by systemd-efi-boot-generator\n\n"
-                "[Automount]\n"
-                "Where=/boot\n");
+        fputs("# Automatially generated by systemd-efi-boot-generator\n\n"
+              "[Unit]\n"
+              "Description=EFI System Partition Automount\n\n"
+              "[Automount]\n"
+              "Where=/boot\n", f);
 
         free(name);
         name = strjoin(arg_dest, "/local-fs.target.wants/boot.automount", NULL);