Minor fixes. (Skip test 28 LINK_MAX links generation, it takes too long.)

diff --git a/test/test28.c b/test/test28.c
index 3c786db66a3dc690f1e6c07b3cf7ad166a6d7b22..745e3f7601e544f7f05b07207f998fbb9bd9d928 100644 (file)
--- a/test/test28.c
+++ b/test/test28.c
@@ -208,9 +208,11 @@ void test28b()
   if (rmdir(ToLongPath) != -1) e(21);
   if (errno != ENAMETOOLONG) e(22);
 
-  /* Test what happens if the parent link count > LINK_MAX. */
   if (mkdir("foo", 0777) != 0) e(23);
   System("touch foo/xyzzy");
+#if 0
+  /* Test what happens if the parent link count > LINK_MAX. */
+  /* This takes too long. */
   for (nlink = 1; nlink < LINK_MAX; nlink++) { /* make all */
        sprintf(bar, "foo/bar.%d", nlink);
        if (link("foo/xyzzy", bar) != 0) e(24);
@@ -220,6 +222,7 @@ void test28b()
   if (link("foo/xyzzy", "nono") != -1) e(27);  /* no more */
   if (errno != EMLINK) e(28);  /* entrys. */
   System("rm -rf foo/nono");   /* Just in case. */
+#endif
 
   /* Test if rmdir removes only empty dirs */
   if (rmdir("foo") != -1) e(29);/* not empty */

diff --git a/tools/mkboot b/tools/mkboot
index 38e578194777faa5dd74ac662ecbd2f582ddaf26..98431b8b98771c06ede3d4ac7392961dcc9af805 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -165,7 +165,8 @@ cdfdboot)
        cp -p ../boot/boot /mnt/boot/boot || exit 1
        umount $dev || exit 1
        installboot -d $dev ../boot/bootblock boot/boot || exit 1
-       edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; leader() { echo If the system cannot find root, please hit ESC and set your\nramimagedev to the CD device, partition 1. e.g.\nramimagedev=c0d2p1 .. then boot to start.\n\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
+#      edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; leader() { echo If the system cannot find root, please hit ESC and set your\nramimagedev to the CD device, partition 1. e.g.\nramimagedev=c0d2p1 .. then boot to start.\n\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
+       edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; bootcd=1; main(){delay 10000;boot}; save' || exit
 
        # copy image
        dd if=$dev of=cdfdimage bs=8192 count=180