]>
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 | |
7edc5189 | 4 | @@ -69,15 +69,15 @@ |
b6da825e | 5 | return EXIT_SUCCESS; |
995ed764 | 6 | } |
b6da825e | 7 | |
c6575658 JR |
8 | - r = path_is_mount_point("/boot", AT_SYMLINK_FOLLOW); |
9 | + r = path_is_mount_point("/boot/efi", AT_SYMLINK_FOLLOW); | |
7edc5189 JR |
10 | if (r > 0) { |
11 | - log_debug("/boot is already a mount point, exiting."); | |
12 | + log_debug("/boot/efi is already a mount point, exiting."); | |
13 | return EXIT_SUCCESS; | |
14 | } | |
15 | if (r == -ENOENT) | |
16 | - log_debug("/boot does not exist, continuing."); | |
17 | - else if (dir_is_empty("/boot") <= 0) { | |
995ed764 | 18 | - log_debug("/boot already populated, exiting."); |
7edc5189 JR |
19 | + log_debug("/boot/efi does not exist, continuing."); |
20 | + else if (dir_is_empty("/boot/efi") <= 0) { | |
995ed764 | 21 | + log_debug("/boot/efi already populated, exiting."); |
b6da825e | 22 | return EXIT_SUCCESS; |
995ed764 | 23 | } |
b6da825e | 24 | |
7dffbad7 | 25 | @@ -84,7 +84,7 @@ |
b6da825e JK |
26 | return EXIT_FAILURE; |
27 | } | |
28 | ||
2f2b39e6 JR |
29 | - name = strjoina(arg_dest, "/boot.mount"); |
30 | + name = strjoina(arg_dest, "/boot-efi.mount"); | |
995ed764 TR |
31 | f = fopen(name, "wxe"); |
32 | if (!f) { | |
7dffbad7 JK |
33 | log_error_errno(errno, "Failed to create mount unit file %s: %m", name); |
34 | @@ -105,7 +105,7 @@ | |
995ed764 TR |
35 | "Description=EFI System Partition\n" |
36 | "Documentation=man:systemd-efi-boot-generator(8)\n"); | |
37 | ||
38 | - r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat"); | |
39 | + r = generator_write_fsck_deps(f, arg_dest, what, "/boot/efi", "vfat"); | |
40 | if (r < 0) | |
b6da825e | 41 | return EXIT_FAILURE; |
995ed764 | 42 | |
7dffbad7 | 43 | @@ -113,7 +113,7 @@ |
995ed764 | 44 | "\n" |
b6da825e | 45 | "[Mount]\n" |
995ed764 | 46 | "What=%s\n" |
b6da825e JK |
47 | - "Where=/boot\n" |
48 | + "Where=/boot/efi\n" | |
995ed764 TR |
49 | "Type=vfat\n" |
50 | "Options=umask=0077,noauto\n", | |
51 | what); | |
7dffbad7 | 52 | @@ -124,7 +124,7 @@ |
b6da825e | 53 | return EXIT_FAILURE; |
995ed764 TR |
54 | } |
55 | ||
2f2b39e6 JR |
56 | - name = strjoina(arg_dest, "/boot.automount"); |
57 | + name = strjoina(arg_dest, "/boot-efi.automount"); | |
995ed764 TR |
58 | fclose(f); |
59 | f = fopen(name, "wxe"); | |
60 | if (!f) { | |
7dffbad7 | 61 | @@ -136,7 +136,7 @@ |
b6da825e JK |
62 | "[Unit]\n" |
63 | "Description=EFI System Partition Automount\n\n" | |
64 | "[Automount]\n" | |
7edc5189 JR |
65 | - "Where=/boot\n" |
66 | + "Where=/boot/efi\n" | |
67 | "TimeoutIdleSec=120\n", f); | |
b6da825e | 68 | |
995ed764 | 69 | fflush(f); |
7dffbad7 | 70 | @@ -144,10 +144,10 @@ |
b6da825e | 71 | return EXIT_FAILURE; |
995ed764 | 72 | } |
b6da825e | 73 | |
2f2b39e6 JR |
74 | - name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount"); |
75 | + name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount"); | |
b6da825e JK |
76 | mkdir_parents(name, 0755); |
77 | ||
78 | - if (symlink("../boot.automount", name) < 0) { | |
79 | + if (symlink("../boot-efi.automount", name) < 0) { | |
7dffbad7 | 80 | log_error_errno(errno, "Failed to create symlink %s: %m", name); |
b6da825e JK |
81 | return EXIT_FAILURE; |
82 | } |