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