1 diff -dur systemd-208.orig/src/efi-boot-generator/efi-boot-generator.c systemd-208/src/efi-boot-generator/efi-boot-generator.c
2 --- systemd-208.orig/src/efi-boot-generator/efi-boot-generator.c 2013-09-25 03:38:17.000000000 +0200
3 +++ systemd-208/src/efi-boot-generator/efi-boot-generator.c 2014-01-22 21:05:38.281137494 +0100
8 - if (dir_is_empty("/boot") <= 0)
9 + if (dir_is_empty("/boot/efi") <= 0)
12 r = efi_loader_get_device_part_uuid(&id);
17 - name = strjoin(arg_dest, "/boot.mount", NULL);
18 + name = strjoin(arg_dest, "/boot-efi.mount", NULL);
24 "Description=EFI System Partition\n\n"
28 "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
29 "Options=umask=0077\n",
30 SD_ID128_FORMAT_VAL(id));
33 - name = strjoin(arg_dest, "/boot.automount", NULL);
34 + name = strjoin(arg_dest, "/boot-efi.automount", NULL);
40 "Description=EFI System Partition Automount\n\n"
42 - "Where=/boot\n", f);
43 + "Where=/boot/efi\n", f);
46 - name = strjoin(arg_dest, "/local-fs.target.wants/boot.automount", NULL);
47 + name = strjoin(arg_dest, "/local-fs.target.wants/boot-efi.automount", NULL);
53 mkdir_parents(name, 0755);
55 - if (symlink("../boot.automount", name) < 0) {
56 + if (symlink("../boot-efi.automount", name) < 0) {
57 log_error("Failed to create symlink %s: %m", name);