]>
Commit | Line | Data |
---|---|---|
995ed764 TR |
1 | --- systemd-215/src/efi-boot-generator/efi-boot-generator.c.orig 2014-03-18 18:05:49.801378306 +0100 |
2 | +++ systemd-215/src/efi-boot-generator/efi-boot-generator.c 2014-07-11 11:44:46.017114762 +0200 | |
3 | @@ -69,9 +69,9 @@ int main(int argc, char *argv[]) { | |
b6da825e | 4 | return EXIT_SUCCESS; |
995ed764 | 5 | } |
b6da825e | 6 | |
995ed764 TR |
7 | - if (path_is_mount_point("/boot", true) <= 0 && |
8 | - dir_is_empty("/boot") <= 0) { | |
9 | - log_debug("/boot already populated, exiting."); | |
10 | + if (path_is_mount_point("/boot/efi", true) <= 0 && | |
11 | + dir_is_empty("/boot/efi") <= 0) { | |
12 | + log_debug("/boot/efi already populated, exiting."); | |
b6da825e | 13 | return EXIT_SUCCESS; |
995ed764 | 14 | } |
b6da825e | 15 | |
995ed764 | 16 | @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) { |
b6da825e JK |
17 | return EXIT_FAILURE; |
18 | } | |
19 | ||
995ed764 TR |
20 | - name = strappenda(arg_dest, "/boot.mount"); |
21 | + name = strappenda(arg_dest, "/boot-efi.mount"); | |
22 | f = fopen(name, "wxe"); | |
23 | if (!f) { | |
24 | log_error("Failed to create mount unit file %s: %m", name); | |
25 | @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) { | |
26 | "Description=EFI System Partition\n" | |
27 | "Documentation=man:systemd-efi-boot-generator(8)\n"); | |
28 | ||
29 | - r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat"); | |
30 | + r = generator_write_fsck_deps(f, arg_dest, what, "/boot/efi", "vfat"); | |
31 | if (r < 0) | |
b6da825e | 32 | return EXIT_FAILURE; |
995ed764 TR |
33 | |
34 | @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) { | |
35 | "\n" | |
b6da825e | 36 | "[Mount]\n" |
995ed764 | 37 | "What=%s\n" |
b6da825e JK |
38 | - "Where=/boot\n" |
39 | + "Where=/boot/efi\n" | |
995ed764 TR |
40 | "Type=vfat\n" |
41 | "Options=umask=0077,noauto\n", | |
42 | what); | |
43 | @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) { | |
b6da825e | 44 | return EXIT_FAILURE; |
995ed764 TR |
45 | } |
46 | ||
47 | - name = strappenda(arg_dest, "/boot.automount"); | |
48 | + name = strappenda(arg_dest, "/boot-efi.automount"); | |
49 | fclose(f); | |
50 | f = fopen(name, "wxe"); | |
51 | if (!f) { | |
52 | @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) { | |
b6da825e JK |
53 | "[Unit]\n" |
54 | "Description=EFI System Partition Automount\n\n" | |
55 | "[Automount]\n" | |
56 | - "Where=/boot\n", f); | |
57 | + "Where=/boot/efi\n", f); | |
58 | ||
995ed764 TR |
59 | fflush(f); |
60 | if (ferror(f)) { | |
61 | @@ -144,10 +144,10 @@ int main(int argc, char *argv[]) { | |
b6da825e | 62 | return EXIT_FAILURE; |
995ed764 | 63 | } |
b6da825e | 64 | |
995ed764 TR |
65 | - name = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount"); |
66 | + name = strappenda(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount"); | |
b6da825e JK |
67 | mkdir_parents(name, 0755); |
68 | ||
69 | - if (symlink("../boot.automount", name) < 0) { | |
70 | + if (symlink("../boot-efi.automount", name) < 0) { | |
71 | log_error("Failed to create symlink %s: %m", name); | |
72 | return EXIT_FAILURE; | |
73 | } |