MyFavMirrors
/
Ventoy
mirror of https://github.com/ventoy/Ventoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support for latest snapshot FreeBSD 13.0

This commit is contained in:
longpanda 2021-01-01 22:37:22 +08:00
parent 041ccb7435
commit 6434e453b2
8 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
INSTALL/ventoy/ventoy_unix.cpio
View File

Binary file not shown.

2
Unix/pack_unix.sh
View File

@ -4,7 +4,9 @@ VENTOY_PATH=$PWD/../
rm -f ventoy_unix.cpio rm -f ventoy_unix.cpio
mv ./ventoy_unix/DragonFly ./
find ./ventoy_unix | cpio -o -H newc>ventoy_unix.cpio find ./ventoy_unix | cpio -o -H newc>ventoy_unix.cpio
mv ./DragonFly ./ventoy_unix/
echo '======== SUCCESS =============' echo '======== SUCCESS ============='

BIN
Unix/ventoy_unix.cpio
View File

Binary file not shown.

BIN
Unix/ventoy_unix/DragonFly/sbin/init
View File

Binary file not shown.

BIN
Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/32/geom_ventoy.ko.xz
View File

Binary file not shown.

BIN
Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/64/geom_ventoy.ko.xz
View File

Binary file not shown.

17
Unix/ventoy_unix_src/DragonFly/oinit.c
View File

@ -157,20 +157,31 @@ static void ventoy_init(char **argv_orig)
vdebug("[VTOY] step 7: switch root ...\n"); vdebug("[VTOY] step 7: switch root ...\n");
error = chdir("/new_root"); error = chdir("/new_root");
if (error) if (error)
goto chroot_failed; {
printf("[VTOY] chdir /new_root failed %d\n", error);
goto chroot_failed;
}
error = chroot_kernel("/new_root"); error = chroot_kernel("/new_root");
if (error) if (error)
goto chroot_failed; {
printf("[VTOY] chroot_kernel /new_root failed %d\n", error);
goto chroot_failed;
}
error = chroot("/new_root"); error = chroot("/new_root");
if (error) if (error)
goto chroot_failed; {
printf("[VTOY] chroot /new_root failed %d\n", error);
goto chroot_failed;
}
vdebug("[VTOY] step 8: now run /sbin/init ...\n");
execv("/sbin/init", __DECONST(char **, argv_orig)); execv("/sbin/init", __DECONST(char **, argv_orig));
/* We failed to exec /sbin/init in the chroot, sleep forever */ /* We failed to exec /sbin/init in the chroot, sleep forever */
chroot_failed: chroot_failed:
printf("[VTOY] ################### DEAD ################\n");
while(1) { while(1) {
sleep(3); sleep(3);
}; };

10
Unix/ventoy_unix_src/DragonFly/walk_disk.c
View File

@ -173,9 +173,13 @@ int prepare_dmtable(void)
fread(&desc, 1, sizeof(desc), fIn); fread(&desc, 1, sizeof(desc), fIn);
vdebug("[VTOY] disksize:%lu part1size:%lu chunkcount:%u\n", desc.disk_size, desc.part1_size, desc.img_chunk_count); vdebug("[VTOY] disksize:%lu part1size:%lu chunkcount:%u\n", desc.disk_size, desc.part1_size, desc.img_chunk_count);
find_disk_by_size(desc.part1_size, NULL, &count, disk); for (i = 0; count <= 0 && i < 10; i++)
vdebug("[VTOY] find disk by part1 size: %d %s\n", count, disk); {
sleep(2);
find_disk_by_size(desc.part1_size, NULL, &count, disk);
vdebug("[VTOY] find disk by part1 size, i=%d, count=%d, %s\n", i, count, disk);
}
if (count == 0) if (count == 0)
{ {