diff --git a/commands/ibm/autopart.c b/commands/ibm/autopart.c index f60fc7eef..571c726ec 100755 --- a/commands/ibm/autopart.c +++ b/commands/ibm/autopart.c @@ -2553,7 +2553,7 @@ do_autopart(int resultfd) probing = 1; autopartmode = 1; - printf("\n\n --- Step 2.1 --- Select drive ---------------------------------------\n\n"); + printf("\n\n --- Step 2.1 --- Select drive and region -----------------------------\n\n"); do { curdev = select_disk(); @@ -2570,13 +2570,13 @@ do_autopart(int resultfd) memcpy(orig_table, table, sizeof(table)); do { - printf("\n\n --- Step 2.2 --- Select region to install in ------------------------\n\n"); + printf("\n\n --- Step 2.1 --- Select drive and region -----------------------------\n\n"); /* Show regions. */ r = select_region(); } while(!r); /* Back to step 2. */ - printf("\n\n --- Step 2.3 --- Write table to disk --------------------------------\n\n"); + printf("\n\n --- Step 2.2 --- Confirm your choice ---------------------------------\n\n"); /* Write things. */ if(scribble_region(r, &pe)) { diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh index e19eb048f..d45f7cfef 100755 --- a/commands/scripts/setup.sh +++ b/commands/scripts/setup.sh @@ -88,7 +88,7 @@ ok="" while [ "$ok" = "" ] do echo " - --- Step 2 --- Partitioning ----------------------------------------- + --- Step 2 --- Create a MINIX 3 partition --------------------------- " echo -n "Now is the MINIX 3 partitioning step. Do you want to follow the (A)utomatic or the e(X)pert mode? [A] " @@ -179,7 +179,7 @@ hex2int() echo $i } echo " - --- Step 3 --- Networking ------------------------------------------- + --- Step 3 --- Select your Ethernet chip ---------------------------- " # Ask user about networking @@ -235,7 +235,7 @@ esac blockdefault=8 echo " - --- Step 4 --- Block size ------------------------------------------- + --- Step 4 --- Select a disk block size ----------------------------- " echo "\ The default block size on the disk is $blockdefault KB. @@ -258,13 +258,14 @@ done blocksizebytes="`expr $blocksize '*' 1024`" echo " - --- Step 5 --- Swap space ------------------------------------------- + --- Step 5 --- Allocate swap space ---------------------------------- " echo -n " How much swap space would you like? Swapspace is only needed if this -system is memory starved, like a 16-bit system with less then 2M, or a -32-bit system with less then 4M. +system is memory starved. If you have 256 MB of memory or more, you +probably don't need it. If you have less and want to run many programs +at once, I suggest setting it to the memory size. Size in kilobytes? [$swapadv] " @@ -303,7 +304,7 @@ else fi echo " - --- Step 6 --- Copy files ------------------------------------------- + --- Step 6 --- Copy files to hard disk ------------------------------ " mkfs -B $blocksizebytes /dev/$usr diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh index f7557efb0..7a42f9d7e 100755 --- a/tools/chrootmake.sh +++ b/tools/chrootmake.sh @@ -8,5 +8,8 @@ make hdboot || exit 1 cp ../boot/boot /boot/boot || exit 1 cd /usr/src || exit 1 make clean +# Put compiler and libraries on root (ramdisk if enabled) +cp /usr/lib/* /lib +cp /usr/lib/i386/* /lib/i386/ exit 0 diff --git a/tools/release.sh b/tools/release.sh index dd0d1aca4..3d0ac10bc 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -37,7 +37,7 @@ echo " * Cleanup old files" rm -rf $RELEASEDIR $ISO $IMAGE $ROOTIMAGE $ISOGZ $CDFILES mkdir -p $CDFILES || exit mkdir -p $RELEASEDIR -mkfs -b 1440 -B 1024 $RAM || exit +mkfs -b 16384 -B 1024 $RAM || exit echo " * chowning to bin" chown -R bin /usr/src echo " * mounting $RAM as $RELEASEDIR"