support for latest snapshot FreeBSD 13.0

diff --git a/INSTALL/ventoy/ventoy_unix.cpio b/INSTALL/ventoy/ventoy_unix.cpio
index f4cf2e1d8b30fe61f54063ff53c7ca7949a749c8..ff97b5e75a12e9444d0c2808606578adcbf62eab 100644 (file)
Binary files a/INSTALL/ventoy/ventoy_unix.cpio and b/INSTALL/ventoy/ventoy_unix.cpio differ

diff --git a/Unix/pack_unix.sh b/Unix/pack_unix.sh
index 24048cffa8e1b63dca0121b705f93db1626f10a8..1515d8ccd3479ff483d380570dddcac2d969d5de 100644 (file)
--- a/Unix/pack_unix.sh
+++ b/Unix/pack_unix.sh
@@ -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 ============='
 

diff --git a/Unix/ventoy_unix.cpio b/Unix/ventoy_unix.cpio
index f4cf2e1d8b30fe61f54063ff53c7ca7949a749c8..ff97b5e75a12e9444d0c2808606578adcbf62eab 100644 (file)
Binary files a/Unix/ventoy_unix.cpio and b/Unix/ventoy_unix.cpio differ

diff --git a/Unix/ventoy_unix/DragonFly/sbin/init b/Unix/ventoy_unix/DragonFly/sbin/init
index 248631f2992a805cfe1c213a1621e8ff3095802a..a720b579db6f47c7a4a4e7decca8672de2659bcb 100644 (file)
Binary files a/Unix/ventoy_unix/DragonFly/sbin/init and b/Unix/ventoy_unix/DragonFly/sbin/init differ

diff --git a/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/32/geom_ventoy.ko.xz b/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/32/geom_ventoy.ko.xz
index facac0e0291fb9d7e69b1babe4af3668100b19bd..38eb428b4b0bfe699b29722973feede28a658349 100644 (file)
Binary files a/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/32/geom_ventoy.ko.xz and b/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/32/geom_ventoy.ko.xz differ

diff --git a/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/64/geom_ventoy.ko.xz b/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/64/geom_ventoy.ko.xz
index 22f55f70896d6c927aaba73832efa8d5cc7e2eb1..5afe74d9b84ef1f2ba3e40b196c0844fd51b3c34 100644 (file)
Binary files a/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/64/geom_ventoy.ko.xz and b/Unix/ventoy_unix/FreeBSD/geom_ventoy_ko/13.x/64/geom_ventoy.ko.xz differ

diff --git a/Unix/ventoy_unix_src/DragonFly/oinit.c b/Unix/ventoy_unix_src/DragonFly/oinit.c
index c45ddd131a9b7c9b1588fcd90477e126f02b8d3b..ae59123927f6bb8408e4d3fad389a2864e61e1de 100644 (file)
--- a/Unix/ventoy_unix_src/DragonFly/oinit.c
+++ b/Unix/ventoy_unix_src/DragonFly/oinit.c
@@ -157,20 +157,31 @@ static void ventoy_init(char **argv_orig)
     vdebug("[VTOY] step 7: switch root ...\n");
        error = chdir("/new_root");
        if (error)
     vdebug("[VTOY] step 7: switch root ...\n");
        error = chdir("/new_root");
        if (error)

-               goto chroot_failed;
+       {
+           printf("[VTOY] chdir /new_root failed %d\n", error);
+           goto chroot_failed;
+    }

 
        error = chroot_kernel("/new_root");
        if (error)
 
        error = chroot_kernel("/new_root");
        if (error)

-               goto chroot_failed;
+       {
+           printf("[VTOY] chroot_kernel /new_root failed %d\n", error);
+           goto chroot_failed;
+    }

 
        error = chroot("/new_root");
        if (error)
 
        error = chroot("/new_root");
        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));
 
        /* We failed to exec /sbin/init in the chroot, sleep forever */
 chroot_failed:
        execv("/sbin/init", __DECONST(char **, argv_orig));
 
        /* We failed to exec /sbin/init in the chroot, sleep forever */
 chroot_failed:

+    printf("[VTOY] ################### DEAD ################\n");

        while(1) {
                sleep(3);
        };
        while(1) {
                sleep(3);
        };

diff --git a/Unix/ventoy_unix_src/DragonFly/walk_disk.c b/Unix/ventoy_unix_src/DragonFly/walk_disk.c
index f743529ae5c261decb802a45c02fdbb768821532..93d0d0dedecc24caa7d2ef461f858f9d4a83dbaa 100644 (file)
--- a/Unix/ventoy_unix_src/DragonFly/walk_disk.c
+++ b/Unix/ventoy_unix_src/DragonFly/walk_disk.c
@@ -173,9 +173,13 @@ int prepare_dmtable(void)
     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);
     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);

-
-    find_disk_by_size(desc.part1_size, NULL, &count, disk);
-    vdebug("[VTOY] find disk by part1 size: %d %s\n", count, disk);
+    
+    for (i = 0; count <= 0 && i < 10; i++)
+    {
+        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)
     {