summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot/bootctl.c34
-rw-r--r--src/boot/efi/.gitignore (renamed from src/sd-boot/.gitignore)0
-rw-r--r--src/boot/efi/boot.c (renamed from src/sd-boot/sd-boot.c)8
-rw-r--r--src/boot/efi/console.c (renamed from src/sd-boot/console.c)0
-rw-r--r--src/boot/efi/console.h (renamed from src/sd-boot/console.h)0
-rw-r--r--src/boot/efi/graphics.c (renamed from src/sd-boot/graphics.c)0
-rw-r--r--src/boot/efi/graphics.h (renamed from src/sd-boot/graphics.h)0
-rw-r--r--src/boot/efi/linux.c (renamed from src/sd-boot/linux.c)0
-rw-r--r--src/boot/efi/linux.h (renamed from src/sd-boot/linux.h)0
-rw-r--r--src/boot/efi/pefile.c (renamed from src/sd-boot/pefile.c)0
-rw-r--r--src/boot/efi/pefile.h (renamed from src/sd-boot/pefile.h)0
-rw-r--r--src/boot/efi/stub.c (renamed from src/sd-boot/stub.c)0
-rw-r--r--src/boot/efi/util.c (renamed from src/sd-boot/util.c)0
-rw-r--r--src/boot/efi/util.h (renamed from src/sd-boot/util.h)0
14 files changed, 21 insertions, 21 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 3b6df42910..73450e283d 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -215,7 +215,7 @@ fail:
return r;
}
-/* search for "#### LoaderInfo: sd-boot 218 ####" string inside the binary */
+/* search for "#### LoaderInfo: systemd-boot 218 ####" string inside the binary */
static int get_file_version(FILE *f, char **v) {
struct stat st;
char *buf;
@@ -351,7 +351,7 @@ static int status_binaries(const char *esp_path, sd_id128_t partition) {
r = enumerate_binaries(esp_path, "EFI/systemd", NULL);
if (r == 0)
- fprintf(stderr, "sd-boot not installed in ESP.\n");
+ fprintf(stderr, "systemd-boot not installed in ESP.\n");
else if (r < 0)
return r;
@@ -710,7 +710,7 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
_cleanup_free_ char *v = NULL;
int r;
- if (asprintf(&p, SD_BOOTLIBDIR "/%s", name) < 0) {
+ if (asprintf(&p, BOOTLIBDIR "/%s", name) < 0) {
fprintf(stderr, "Out of memory.\n");
return -ENOMEM;
}
@@ -722,11 +722,11 @@ static int copy_one_file(const char *esp_path, const char *name, bool force) {
r = copy_file(p, q, force);
- if (startswith(name, "sd-boot")) {
+ if (startswith(name, "systemd-boot")) {
int k;
/* Create the EFI default boot loader name (specified for removable devices) */
- if (asprintf(&v, "%s/EFI/Boot/BOOT%s", esp_path, name + strlen("sd-boot")) < 0) {
+ if (asprintf(&v, "%s/EFI/Boot/BOOT%s", esp_path, name + strlen("systemd-boot")) < 0) {
fprintf(stderr, "Out of memory.\n");
return -ENOMEM;
}
@@ -756,9 +756,9 @@ static int install_binaries(const char *esp_path, bool force) {
return r;
}
- d = opendir(SD_BOOTLIBDIR);
+ d = opendir(BOOTLIBDIR);
if (!d) {
- fprintf(stderr, "Failed to open "SD_BOOTLIBDIR": %m\n");
+ fprintf(stderr, "Failed to open "BOOTLIBDIR": %m\n");
return -errno;
}
@@ -814,7 +814,7 @@ static int find_slot(sd_id128_t uuid, const char *path, uint16_t *id) {
if (n_options < 0)
return n_options;
- /* find already existing sd-boot entry */
+ /* find already existing systemd-boot entry */
for (i = 0; i < n_options; i++)
if (same_entry(options[i], uuid, path)) {
new_id = options[i];
@@ -1036,7 +1036,7 @@ static int remove_boot_efi(const char *esp_path) {
if (r < 0)
goto finish;
- if (r > 0 && strncmp(v, "sd-boot ", 10) == 0) {
+ if (r > 0 && strncmp(v, "systemd-boot ", 10) == 0) {
r = unlink(q);
if (r < 0) {
@@ -1089,7 +1089,7 @@ static int remove_binaries(const char *esp_path) {
char *p;
int r, q;
- if (asprintf(&p, "%s/EFI/sd-boot", esp_path) < 0) {
+ if (asprintf(&p, "%s/EFI/systemd-boot", esp_path) < 0) {
fprintf(stderr, "Out of memory.\n");
return -ENOMEM;
}
@@ -1113,7 +1113,7 @@ static int remove_binaries(const char *esp_path) {
if (q < 0 && r == 0)
r = q;
- q = rmdir_one(esp_path, "EFI/sd-boot");
+ q = rmdir_one(esp_path, "EFI/systemd-boot");
if (q < 0 && r == 0)
r = q;
@@ -1196,10 +1196,10 @@ static int help(void) {
" --no-variables Don't touch EFI variables\n"
"\n"
"Comands:\n"
- " status Show status of installed sd-boot and EFI variables\n"
- " install Install sd-boot to the ESP and EFI variables\n"
- " update Update sd-boot in the ESP and EFI variables\n"
- " remove Remove sd-boot from the ESP and EFI variables\n",
+ " status Show status of installed systemd-boot and EFI variables\n"
+ " install Install systemd-boot to the ESP and EFI variables\n"
+ " update Update systemd-boot in the ESP and EFI variables\n"
+ " remove Remove systemd-boot from the ESP and EFI variables\n",
program_invocation_short_name);
return 0;
@@ -1371,7 +1371,7 @@ static int bootctl_main(int argc, char*argv[]) {
if (arg_touch_variables)
r = install_variables(arg_path,
part, pstart, psize, uuid,
- "/EFI/systemd/sd-boot" EFI_MACHINE_TYPE_NAME ".efi",
+ "/EFI/systemd/systemd-boot" EFI_MACHINE_TYPE_NAME ".efi",
arg_action == ACTION_INSTALL);
break;
@@ -1379,7 +1379,7 @@ static int bootctl_main(int argc, char*argv[]) {
r = remove_binaries(arg_path);
if (arg_touch_variables) {
- q = remove_variables(uuid, "/EFI/systemd/sd-boot" EFI_MACHINE_TYPE_NAME ".efi", true);
+ q = remove_variables(uuid, "/EFI/systemd/systemd-boot" EFI_MACHINE_TYPE_NAME ".efi", true);
if (q < 0 && r == 0)
r = q;
}
diff --git a/src/sd-boot/.gitignore b/src/boot/efi/.gitignore
index 55b0da4678..55b0da4678 100644
--- a/src/sd-boot/.gitignore
+++ b/src/boot/efi/.gitignore
diff --git a/src/sd-boot/sd-boot.c b/src/boot/efi/boot.c
index 94039ead31..7605c6532d 100644
--- a/src/sd-boot/sd-boot.c
+++ b/src/boot/efi/boot.c
@@ -29,7 +29,7 @@
#endif
/* magic string to find in the binary image */
-static const char __attribute__((used)) magic[] = "#### LoaderInfo: sd-boot " VERSION " ####";
+static const char __attribute__((used)) magic[] = "#### LoaderInfo: systemd-boot " VERSION " ####";
static const EFI_GUID global_guid = EFI_GLOBAL_VARIABLE;
@@ -405,7 +405,7 @@ static VOID print_status(Config *config, EFI_FILE *root_dir, CHAR16 *loaded_imag
break;
}
- Print(L"sd-boot version: " VERSION "\n");
+ Print(L"systemd-boot version: " VERSION "\n");
Print(L"architecture: " EFI_MACHINE_TYPE_NAME "\n");
Print(L"loaded image: %s\n", loaded_image_path);
Print(L"UEFI specification: %d.%02d\n", ST->Hdr.Revision >> 16, ST->Hdr.Revision & 0xffff);
@@ -844,7 +844,7 @@ static BOOLEAN menu_run(Config *config, ConfigEntry **chosen_entry, EFI_FILE *ro
break;
case KEYPRESS(0, 0, 'v'):
- status = PoolPrint(L"sd-boot " VERSION " (" EFI_MACHINE_TYPE_NAME "), UEFI Specification %d.%02d, Vendor %s %d.%02d",
+ status = PoolPrint(L"systemd-boot " VERSION " (" EFI_MACHINE_TYPE_NAME "), UEFI Specification %d.%02d, Vendor %s %d.%02d",
ST->Hdr.Revision >> 16, ST->Hdr.Revision & 0xffff,
ST->FirmwareVendor, ST->FirmwareRevision >> 16, ST->FirmwareRevision & 0xffff);
break;
@@ -1831,7 +1831,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
InitializeLib(image, sys_table);
init_usec = time_usec();
efivar_set_time_usec(L"LoaderTimeInitUSec", init_usec);
- efivar_set(L"LoaderInfo", L"sd-boot " VERSION, FALSE);
+ efivar_set(L"LoaderInfo", L"systemd-boot " VERSION, FALSE);
s = PoolPrint(L"%s %d.%02d", ST->FirmwareVendor, ST->FirmwareRevision >> 16, ST->FirmwareRevision & 0xffff);
efivar_set(L"LoaderFirmwareInfo", s, FALSE);
FreePool(s);
diff --git a/src/sd-boot/console.c b/src/boot/efi/console.c
index 6206c80317..6206c80317 100644
--- a/src/sd-boot/console.c
+++ b/src/boot/efi/console.c
diff --git a/src/sd-boot/console.h b/src/boot/efi/console.h
index 5c7808a067..5c7808a067 100644
--- a/src/sd-boot/console.h
+++ b/src/boot/efi/console.h
diff --git a/src/sd-boot/graphics.c b/src/boot/efi/graphics.c
index 11305b8d06..11305b8d06 100644
--- a/src/sd-boot/graphics.c
+++ b/src/boot/efi/graphics.c
diff --git a/src/sd-boot/graphics.h b/src/boot/efi/graphics.h
index 8665afde97..8665afde97 100644
--- a/src/sd-boot/graphics.h
+++ b/src/boot/efi/graphics.h
diff --git a/src/sd-boot/linux.c b/src/boot/efi/linux.c
index 809c69310e..809c69310e 100644
--- a/src/sd-boot/linux.c
+++ b/src/boot/efi/linux.c
diff --git a/src/sd-boot/linux.h b/src/boot/efi/linux.h
index aff69a9778..aff69a9778 100644
--- a/src/sd-boot/linux.h
+++ b/src/boot/efi/linux.h
diff --git a/src/sd-boot/pefile.c b/src/boot/efi/pefile.c
index e6fedbc929..e6fedbc929 100644
--- a/src/sd-boot/pefile.c
+++ b/src/boot/efi/pefile.c
diff --git a/src/sd-boot/pefile.h b/src/boot/efi/pefile.h
index ca2f9a2508..ca2f9a2508 100644
--- a/src/sd-boot/pefile.h
+++ b/src/boot/efi/pefile.h
diff --git a/src/sd-boot/stub.c b/src/boot/efi/stub.c
index e18faac669..e18faac669 100644
--- a/src/sd-boot/stub.c
+++ b/src/boot/efi/stub.c
diff --git a/src/sd-boot/util.c b/src/boot/efi/util.c
index 5678b50c31..5678b50c31 100644
--- a/src/sd-boot/util.c
+++ b/src/boot/efi/util.c
diff --git a/src/sd-boot/util.h b/src/boot/efi/util.h
index efaafd7492..efaafd7492 100644
--- a/src/sd-boot/util.h
+++ b/src/boot/efi/util.h
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-14 02:57:56 +0000