struct pb_cui {
struct pmenu *mm;
struct cui *cui;
- struct opts opts;
};
static struct pb_cui *pb_from_cui(struct cui *cui)
assert(pb->cui->current == &pb->cui->main->scr);
- return pb_run_kexec(cod->kd, pb->opts.dry_run);
+ return pb_run_kexec(cod->bd, pb->cui->dry_run);
}
/**
m->on_open = cui_on_open;
- m->scr.frame.title = talloc_strdup(m, "Petitboot");
+ m->scr.frame.title = talloc_asprintf(m,
+ "Petitboot (" PACKAGE_VERSION ")%s",
+ (pb_cui->cui->dry_run ? " (dry-run)" : ""));
m->scr.frame.help = talloc_strdup(m,
"ESC=exit, Enter=accept, e=edit, o=open");
m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
static struct sigaction sa;
int result;
int cui_result;
+ struct opts opts;
- result = opts_parse(&pb.opts, argc, argv);
+ result = opts_parse(&opts, argc, argv);
if (result) {
print_usage();
return EXIT_FAILURE;
}
- if (pb.opts.show_help == opt_yes) {
+ if (opts.show_help == opt_yes) {
print_usage();
return EXIT_SUCCESS;
}
- if (pb.opts.show_version == opt_yes) {
+ if (opts.show_version == opt_yes) {
print_version();
return EXIT_SUCCESS;
}
- if (strcmp(pb.opts.log_file, "-")) {
- FILE *log = fopen(pb.opts.log_file, "a");
+ if (strcmp(opts.log_file, "-")) {
+ FILE *log = fopen(opts.log_file, "a");
assert(log);
pb_log_set_stream(log);
return EXIT_FAILURE;
}
- pb.cui = cui_init(&pb, pb_kexec_cb, NULL, pb.opts.start_daemon);
+ pb.cui = cui_init(&pb, pb_kexec_cb, NULL, opts.start_daemon,
+ opts.dry_run);
if (!pb.cui)
return EXIT_FAILURE;