sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename install steps; add copying /usr/lib/* to /lib/*

Browse source
This commit is contained in:
Ben Gras 2005-08-08 18:36:12 +00:00
parent 560466ed8e
commit 08e0e1bcef
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commands/ibm/autopart.c
View file

@ -2553,7 +2553,7 @@ do_autopart(int resultfd)
probing = 1; probing = 1;
autopartmode = 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 { do {
curdev = select_disk(); curdev = select_disk();
@ -2570,13 +2570,13 @@ do_autopart(int resultfd)
memcpy(orig_table, table, sizeof(table)); memcpy(orig_table, table, sizeof(table));
do { 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. */ /* Show regions. */
r = select_region(); r = select_region();
} while(!r); /* Back to step 2. */ } 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. */ /* Write things. */
if(scribble_region(r, &pe)) { if(scribble_region(r, &pe)) {

15
commands/scripts/setup.sh
View file

@ -88,7 +88,7 @@ ok=""
while [ "$ok" = "" ] while [ "$ok" = "" ]
do do
echo " echo "
--- Step 2 --- Partitioning ----------------------------------------- --- Step 2 --- Create a MINIX 3 partition ---------------------------
" "
echo -n "Now is the MINIX 3 partitioning step. Do you want to echo -n "Now is the MINIX 3 partitioning step. Do you want to
follow the (A)utomatic or the e(X)pert mode? [A] " follow the (A)utomatic or the e(X)pert mode? [A] "
@ -179,7 +179,7 @@ hex2int()
echo $i echo $i
} }
echo " echo "
--- Step 3 --- Networking ------------------------------------------- --- Step 3 --- Select your Ethernet chip ----------------------------
" "
# Ask user about networking # Ask user about networking
@ -235,7 +235,7 @@ esac
blockdefault=8 blockdefault=8
echo " echo "
--- Step 4 --- Block size ------------------------------------------- --- Step 4 --- Select a disk block size -----------------------------
" "
echo "\ echo "\
The default block size on the disk is $blockdefault KB. The default block size on the disk is $blockdefault KB.
@ -258,13 +258,14 @@ done
blocksizebytes="`expr $blocksize '*' 1024`" blocksizebytes="`expr $blocksize '*' 1024`"
echo " echo "
--- Step 5 --- Swap space ------------------------------------------- --- Step 5 --- Allocate swap space ----------------------------------
" "
echo -n " echo -n "
How much swap space would you like? Swapspace is only needed if this 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 system is memory starved. If you have 256 MB of memory or more, you
32-bit system with less then 4M. 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] " Size in kilobytes? [$swapadv] "
@ -303,7 +304,7 @@ else
fi fi
echo " echo "
--- Step 6 --- Copy files ------------------------------------------- --- Step 6 --- Copy files to hard disk ------------------------------
" "
mkfs -B $blocksizebytes /dev/$usr mkfs -B $blocksizebytes /dev/$usr

3
tools/chrootmake.sh
View file

@ -8,5 +8,8 @@ make hdboot || exit 1
cp ../boot/boot /boot/boot || exit 1 cp ../boot/boot /boot/boot || exit 1
cd /usr/src || exit 1 cd /usr/src || exit 1
make clean make clean
# Put compiler and libraries on root (ramdisk if enabled)
cp /usr/lib/* /lib
cp /usr/lib/i386/* /lib/i386/
exit 0 exit 0

2
tools/release.sh
View file

@ -37,7 +37,7 @@ echo " * Cleanup old files"
rm -rf $RELEASEDIR $ISO $IMAGE $ROOTIMAGE $ISOGZ $CDFILES rm -rf $RELEASEDIR $ISO $IMAGE $ROOTIMAGE $ISOGZ $CDFILES
mkdir -p $CDFILES || exit mkdir -p $CDFILES || exit
mkdir -p $RELEASEDIR mkdir -p $RELEASEDIR
mkfs -b 1440 -B 1024 $RAM || exit mkfs -b 16384 -B 1024 $RAM || exit
echo " * chowning to bin" echo " * chowning to bin"
chown -R bin /usr/src chown -R bin /usr/src
echo " * mounting $RAM as $RELEASEDIR" echo " * mounting $RAM as $RELEASEDIR"