Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

If the storage device is not initializing, just try everything #30

Merged
merged 1 commit into from
Dec 1, 2023
Merged

If the storage device is not initializing, just try everything #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions bin/initoverlayfs-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exec_erofs() {
"$SKIPCPIO_BIN" "/boot/initramfs-$kver.img" | "$CAT" | cpio -ivd
popd
rm -f "/boot/initoverlayfs-$kver.img"
mkfs.erofs "$erofs_compression" "/boot/initoverlayfs-$kver.img" ${INITRAMFS_DUMP_DIR}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It may have been this change that was breaking the other PR, we should never have an empty "" string here, no quotes is what works here

mkfs.erofs $erofs_compression "/boot/initoverlayfs-$kver.img" ${INITRAMFS_DUMP_DIR}
}

# Support for ext4 is currently under development.
Expand Down Expand Up @@ -138,14 +138,15 @@ if [ -z "$kver" ]; then
kver="$(uname -r)"
fi

if ! [ -e "$INITOVERLAYFS_CONF" ]; then
if ! [ -e "$INITOVERLAYFS_CONF" ] || ! grep -q '[^[:space:]]' "$INITOVERLAYFS_CONF"; then
boot_partition=$(< /etc/fstab grep "/boot.*ext4" | awk '{print $1}')
printf "%s\n%s\n%s\n%s\n%s\n" \
printf "%s\n%s\n%s\n%s\n%s\n%s\n" \
"bootfs $boot_partition" \
"bootfstype ext4" \
"initoverlayfs_builder dracut -H -f -v -M --reproducible -o \"initoverlayfs\"" \
"initrd_builder dracut -H -f -v -M --reproducible -m \"kernel-modules udev-rules initoverlayfs\" -o \"bash systemd systemd-initrd i18n kernel-modules-extra rootfs-block dracut-systemd usrmount base fs-lib microcode_ctl-fw_dir_override shutdown nss-softokn\"" \
"udev_trigger udevadm trigger --type=devices --action=add --subsystem-match=module --subsystem-match=block --subsystem-match=virtio --subsystem-match=pci --subsystem-match=nvme --subsystem-match=mmc --subsystem-match=mmc_host --subsystem-match=platform" > $INITOVERLAYFS_CONF
"udev_trigger udevadm trigger --type=devices --action=add --subsystem-match=module --subsystem-match=block --subsystem-match=virtio --subsystem-match=pci --subsystem-match=nvme --subsystem-match=mmc --subsystem-match=mmc_host --subsystem-match=platform" \
"udev_trigger_generic udevadm trigger --type=devices --action=add" > $INITOVERLAYFS_CONF

erofs_compression_supported="true"
. /etc/os-release
Expand Down
16 changes: 13 additions & 3 deletions config-parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ static inline int conf_construct(conf* c) {
c->fstype.scoped = (str*)calloc(1, sizeof(str));
c->udev_trigger.val = (str*)calloc(1, sizeof(str));
c->udev_trigger.scoped = (str*)calloc(1, sizeof(str));
c->udev_trigger_generic.val = (str*)calloc(1, sizeof(str));
c->udev_trigger_generic.scoped = (str*)calloc(1, sizeof(str));
return !c->bootfs.val || !c->bootfs.scoped || !c->bootfstype.val ||
!c->bootfstype.scoped || !c->fs.val || !c->fs.scoped ||
!c->fstype.val || !c->fstype.scoped || !c->udev_trigger.val ||
!c->udev_trigger.scoped;
!c->udev_trigger.scoped || !c->udev_trigger_generic.val ||
!c->udev_trigger_generic.scoped;
}

static inline void set_conf(pair* conf, str** line, const size_t key_len) {
Expand All @@ -41,6 +44,9 @@ static inline void conf_set_pick(conf* c, str** line) {
const str fstype_str = {.c_str = "fstype", .len = sizeof("fstype") - 1};
const str udev_trigger_str = {.c_str = "udev_trigger",
.len = sizeof("udev_trigger") - 1};
const str udev_trigger_generic_str = {
.c_str = "udev_trigger_generic",
.len = sizeof("udev_trigger_generic") - 1};

if (is_line_key(*line, &bootfs_str))
set_conf(&c->bootfs, line, bootfs_str.len);
Expand All @@ -52,17 +58,21 @@ static inline void conf_set_pick(conf* c, str** line) {
set_conf(&c->fstype, line, fstype_str.len);
else if (is_line_key(*line, &udev_trigger_str))
set_conf(&c->udev_trigger, line, udev_trigger_str.len);
else if (is_line_key(*line, &udev_trigger_generic_str))
set_conf(&c->udev_trigger_generic, line, udev_trigger_generic_str.len);
}

static inline conf* conf_print(conf* c) {
#ifdef DEBUG
printd(
"bootfs: {\"%s\", \"%s\"}, bootfstype: {\"%s\", \"%s\"}, fs: {\"%s\", "
"\"%s\"}, fstype: {\"%s\", \"%s\"}, udev_trigger: {\"%s\", \"%s\"}\n",
"\"%s\"}, fstype: {\"%s\", \"%s\"}, udev_trigger: {\"%s\", \"%s\"}, "
"udev_trigger_generic: {\"%s\", \"%s\"}\n",
c->bootfs.val->c_str, c->bootfs.scoped->c_str, c->bootfstype.val->c_str,
c->bootfstype.scoped->c_str, c->fs.val->c_str, c->fs.scoped->c_str,
c->fstype.val->c_str, c->fstype.scoped->c_str, c->udev_trigger.val->c_str,
c->udev_trigger.scoped->c_str);
c->udev_trigger.scoped->c_str, c->udev_trigger_generic.val->c_str,
c->udev_trigger_generic.scoped->c_str);
#endif
return c;
}
Expand Down
23 changes: 19 additions & 4 deletions storage-init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,21 +596,36 @@ int main(void) {
.bootfstype = {0, 0},
.fs = {0, 0},
.fstype = {0, 0},
.udev_trigger = {0, 0}};
.udev_trigger = {0, 0},
.udev_trigger_generic = {0, 0}};
if (conf_construct(&conf))
return 0;

conf_read(&conf, "/etc/initoverlayfs.conf");
autofree char** udev_argv = cmd_to_argv(conf.udev_trigger.val->c_str);
autofree char** udev_trigger_argv = cmd_to_argv(conf.udev_trigger.val->c_str);
waitpid(udevd_pid, 0, 0);
const pid_t udev_trigger_pid = udev_trigger(udev_argv);
const pid_t udev_trigger_pid = udev_trigger(udev_trigger_argv);
convert_bootfs(&conf);
convert_fs(&conf);
waitpid(udev_trigger_pid, 0, 0);
waitpid(loop_pid, 0, 0);
pid_t udev_wait_pid;
fork_execlp_no_wait(udev_wait_pid, "udevadm", "wait", "-t", "8",
conf.bootfs.val->c_str);
int status;
waitpid(udev_wait_pid, &status, 0);
if (WIFEXITED(status) && WEXITSTATUS(status)) {
print("optimized udev trigger failed, fall back to generic: %d && %d\n",
WIFEXITED(status), WEXITSTATUS(status));
autofree char** udev_trigger_generic_argv =
cmd_to_argv(conf.udev_trigger_generic.val->c_str);
const pid_t udev_trigger_generic_pid =
udev_trigger(udev_trigger_generic_argv);
waitpid(udev_trigger_generic_pid, 0, 0);
}

fork_execlp("udevadm", "wait", conf.bootfs.val->c_str);
errno = 0;

mounts(&conf);
if (switchroot("/initoverlayfs")) {
print("switchroot(\"/initoverlayfs\") %d (%s)\n", errno, strerror(errno));
Expand Down
5 changes: 5 additions & 0 deletions storage-init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ typedef struct conf {
pair fs;
pair fstype;
pair udev_trigger;
pair udev_trigger_generic;
} conf;

static inline void cleanup_free_conf(conf* p) {
Expand All @@ -77,17 +78,21 @@ static inline void cleanup_free_conf(conf* p) {
free(p->fstype.scoped->c_str);
if (p->udev_trigger.scoped)
free(p->udev_trigger.scoped->c_str);
if (p->udev_trigger_generic.scoped)
free(p->udev_trigger_generic.scoped->c_str);

free(p->bootfs.scoped);
free(p->bootfstype.scoped);
free(p->fs.scoped);
free(p->fstype.scoped);
free(p->udev_trigger.scoped);
free(p->udev_trigger_generic.scoped);
free(p->bootfs.val);
free(p->bootfstype.val);
free(p->fs.val);
free(p->fstype.val);
free(p->udev_trigger.val);
free(p->udev_trigger_generic.val);
}

static inline void cleanup_free(void* p) {
Expand Down
Loading