#include "discover/parser-conf.h"
#include "discover/parser.h"
-#define BLS_DIR "/loader/entries"
+static const char *const bls_dirs[] = {
+ "/loader/entries",
+ "/boot/loader/entries",
+ NULL
+};
struct bls_state {
struct discover_boot_option *opt;
struct conf_context *conf;
struct bls_state *state;
char *buf, *filename;
+ const char * const *dir;
const char *blsdir;
int n, len, rc = -1;
+ struct stat statbuf;
conf = talloc_zero(dc, struct conf_context);
if (!conf)
blsdir = script_env_get(script, "blsdir");
if (!blsdir)
- blsdir = BLS_DIR;
+ for (dir = bls_dirs; *dir; dir++)
+ if (!parser_stat_path(dc, dc->device, *dir, &statbuf)) {
+ blsdir = *dir;
+ break;
+ }
+
+ if (!blsdir) {
+ device_handler_status_dev_info(dc->handler, dc->device,
+ _("BLS directory wasn't found"));
+ goto err;
+ }
n = parser_scandir(dc, blsdir, &bls_entries, bls_filter, bls_sort);
if (n <= 0)
if (n > 0) {
device_handler_status_dev_info(dc->handler, dc->device,
_("Scanning %s failed"),
- BLS_DIR);
+ blsdir);
do {
free(bls_entries[n]);
} while (n-- > 0);
struct discover_boot_option *opt;
struct discover_context *ctx;
+ test_add_dir(test, test->ctx->device, "/boot/loader/entries");
+
test_add_file_string(test, test->ctx->device,
- "/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf",
+ "/boot/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf",
"title Fedora (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n"
- "linux /vmlinuz-4.15.2-302.fc28.x86_64\n"
- "initrd /initramfs-4.15.2-302.fc28.x86_64.img\n"
+ "linux /boot/vmlinuz-4.15.2-302.fc28.x86_64\n"
+ "initrd /boot/initramfs-4.15.2-302.fc28.x86_64.img\n"
"options root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root\n");
test_read_conf_embedded(test, "/boot/grub2/grub.cfg");
struct discover_boot_option *opt;
struct discover_context *ctx;
+ test_add_dir(test, test->ctx->device, "/boot/loader/entries");
+
test_add_file_string(test, test->ctx->device,
- "/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-300.fc28.x86_64.conf",
+ "/boot/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-300.fc28.x86_64.conf",
"title Fedora (4.15.2-300.fc28.x86_64) 28 (Twenty Eight)\n"
- "linux /vmlinuz-4.15.2-300.fc28.x86_64\n"
- "initrd /initramfs-4.15.2-300.fc28.x86_64.img\n"
+ "linux /boot/vmlinuz-4.15.2-300.fc28.x86_64\n"
+ "initrd /boot/initramfs-4.15.2-300.fc28.x86_64.img\n"
"options root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root\n\n");
test_add_file_string(test, test->ctx->device,
- "/loader/entries/6c063c8e48904f2684abde8eea303f41-4.14.18-300.fc28.x86_64.conf",
+ "/boot/loader/entries/6c063c8e48904f2684abde8eea303f41-4.14.18-300.fc28.x86_64.conf",
"title Fedora (4.14.18-300.fc28.x86_64) 28 (Twenty Eight)\n"
- "linux /vmlinuz-4.14.18-300.fc28.x86_64\n"
- "initrd /initramfs-4.14.18-300.fc28.x86_64.img\n"
+ "linux /boot/vmlinuz-4.14.18-300.fc28.x86_64\n"
+ "initrd /boot/initramfs-4.14.18-300.fc28.x86_64.img\n"
"options root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root\n");
test_read_conf_embedded(test, "/boot/grub2/grub.cfg");
struct discover_boot_option *opt;
struct discover_context *ctx;
+ test_add_dir(test, test->ctx->device, "/boot/loader/entries");
+
test_add_file_string(test, test->ctx->device,
"/boot/grub2/grubenv",
"# GRUB Environment Block\n"
"kernelopts=root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/root\n");
test_add_file_string(test, test->ctx->device,
- "/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf",
+ "/boot/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf",
"title Fedora (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n"
- "linux /vmlinuz-4.15.2-302.fc28.x86_64\n"
- "initrd /initramfs-4.15.2-302.fc28.x86_64.img\n"
+ "linux /boot/vmlinuz-4.15.2-302.fc28.x86_64\n"
+ "initrd /boot/initramfs-4.15.2-302.fc28.x86_64.img\n"
"options $kernelopts\n");
test_read_conf_embedded(test, "/boot/grub2/grub.cfg");
struct discover_boot_option *opt;
struct discover_context *ctx;
+ test_add_dir(test, test->ctx->device, "/loader/entries");
+
test_add_file_string(test, test->ctx->device,
"/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf",
"title Fedora (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n"
struct discover_boot_option *opt;
struct discover_context *ctx;
+ test_add_dir(test, test->ctx->device, "/loader/entries");
+
test_add_file_string(test, test->ctx->device,
"/loader/entries/6c063c8e48904f2684abde8eea303f41-4.15.2-302.fc28.x86_64.conf",
"title Fedora (4.15.2-302.fc28.x86_64) 28 (Twenty Eight)\n"
struct discover_boot_option *opt;
struct discover_context *ctx;
+ test_add_dir(test, test->ctx->device, "/loader/entries");
+
test_add_file_string(test, test->ctx->device,
"/boot/grub2/grubenv",
"# GRUB Environment Block\n"