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

Lots of nits by ast@

Browse source
This commit is contained in:
Ben Gras 2005-08-08 14:28:32 +00:00
parent bbaa3f6bc3
commit 5865124330
2 changed files with 35 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
commands/ibm/autopart.c
View file

@ -326,7 +326,7 @@ void newdevice(char *name, int scanning, int disk_only)
} }
/* Interesting device found. */ /* Interesting device found. */
} else { } else {
(void) stat(name, &st); if(stat(name, &st) < 0) { perror(name); return; }
} }
new= alloc(sizeof(*new)); new= alloc(sizeof(*new));
@ -2384,7 +2384,7 @@ select_region(void)
if(nr_regions > 1) { if(nr_regions > 1) {
printf("\nPlease enter the region number you want to install MINIX into"); printf("\nPlease enter the region number you want to install MINIX into");
if(used_regions > 0) { if(used_regions > 0) {
printf("\nor enter 'F' to free a disk region that is currently in use"); printf("\nor enter 'D' to Delete an existing partition");
} }
printf(": "); printf(": ");
fflush(NULL); fflush(NULL);
@ -2392,7 +2392,7 @@ select_region(void)
if(!fgets(line, sizeof(line)-2, stdin)) if(!fgets(line, sizeof(line)-2, stdin))
exit(1); exit(1);
if(toupper(line[0]) == 'F') { if(toupper(line[0]) == 'D') {
may_kill_region(); may_kill_region();
return NULL; return NULL;
} }
@ -2556,18 +2556,6 @@ do_autopart(int resultfd)
probing = 1; probing = 1;
autopartmode = 1; autopartmode = 1;
printf("\nWelcome to the autopart process. There are three sub-steps:\n\n"
"2.1. Select the drive you want to use.\n"
"2.2. Select a region to install MINIX in.\n"
"2.3. After confirmation, write new table to disk.\n"
"\n"
"Nothing will happen to your disk before step 2.3.\n\n"
);
printf("Press ENTER to continue: ");
fflush(stdout);
if(!fgets(sure, sizeof(sure)-1, stdin)) exit(1);
printf("\n\n --- Step 2.1 --- Select drive ---------------------------------------\n\n"); printf("\n\n --- Step 2.1 --- Select drive ---------------------------------------\n\n");
do { do {

61
commands/scripts/setup.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# setup 4.1 - install a Minix distribution Author: Kees J. Bot # setup 4.1 - install a MINIX distribution Author: Kees J. Bot
# 20 Dec 1994 # 20 Dec 1994
LOCALRC=/usr/etc/rc.local LOCALRC=/usr/etc/rc.local
@ -33,7 +33,7 @@ then echo "Please run setup as root."
exit 1 exit 1
fi fi
# Installing Minix on the hard disk. # Installing MINIX on the hard disk.
case "$0" in case "$0" in
/tmp/*) /tmp/*)
@ -63,19 +63,19 @@ case $thisroot:$fdusr in
esac esac
echo -n "\ echo -n "\
This is the Minix installation script. This is the MINIX installation script.
Note 1: If the screen blanks suddenly then hit CTRL+F3 to select \"software Note 1: If the screen blanks suddenly then hit CTRL+F3 to select \"software
scrolling\". scrolling\".
Note 2: If things go wrong then hit DEL and start over. Note 2: If things go wrong then hit DEL and start over.
Note 3: Some questions have default answers, like this: [y] Note 3: Some questions have default answers, like this: [y]
Simply hit RETURN (or ENTER) if you want to choose that answer. Simply hit ENTER if you want to choose that answer.
Note 4: If you see a colon (:) then you should hit RETURN to continue. Note 4: If you see a colon (:) then you should hit ENTER to continue.
:" :"
read ret read ret
echo " echo "
--- Step 1 --- Select keyboard type. -------------------------------- --- Step 1 --- Select keyboard type ---------------------------------
What type of keyboard do you have? You can choose one of: What type of keyboard do you have? You can choose one of:
" "
@ -107,23 +107,23 @@ if [ -z "$auto" ]
then then
# Expert mode # Expert mode
echo -n " echo -n "
Minix needs one primary partition of at about 210 MB for a full install MINIX needs one primary partition of at about 210 MB for a full install
with sources. (The full install also fits in about 180 MB, but it with sources. (The full install also fits in about 180 MB, but it
needs more if fully recompiled. Add more space to taste.) needs more if fully recompiled. Add more space to taste.)
* Minix currently only understands filesystems up to 4GB, so don't make * MINIX currently only understands filesystems up to 4GB, so don't make
it bigger. it bigger.
If there is no free space on your disk then you have to back up one of the If there is no free space on your disk then you have to back up one of the
other partitions, shrink, and reinstall. See the appropriate manuals of the other partitions, shrink, and reinstall. See the appropriate manuals of the
the operating systems currently installed. Restart your Minix installation the operating systems currently installed. Restart your MINIX installation
after you have made space. after you have made space.
To make this partition you will be put in the editor \"part\". Follow the To make this partition you will be put in the editor \"part\". Follow the
advice under the '!' key to make a new partition of type MINIX. Do not advice under the '!' key to make a new partition of type MINIX. Do not
touch an existing partition unless you know precisely what you are doing! touch an existing partition unless you know precisely what you are doing!
Please note the name of the partition (e.g. c0d0p1, c0d1p3, c1d1p0) you Please note the name of the partition (e.g. c0d0p1, c0d1p3, c1d1p0) you
make. (See the devices section in usage(8) on Minix device names.) make. (See the devices section in usage(8) on MINIX device names.)
:" :"
read ret read ret
@ -133,7 +133,7 @@ make. (See the devices section in usage(8) on Minix device names.)
echo -n " echo -n "
Please finish the name of the primary partition you have created: Please finish the name of the primary partition you have created:
(Just type RETURN if you want to rerun \"part\") /dev/" (Just type ENTER if you want to rerun \"part\") /dev/"
read primary read primary
done done
else else
@ -184,19 +184,17 @@ echo "
# Ask user about networking # Ask user about networking
echo "" echo ""
echo "Minix currently supports the Intel Pro/100 and RealTek 8139 " echo "MINIX currently supports the following Ethernet cards. Please choose: "
echo "Ethernet cards. Please choose: "
echo "" echo ""
echo "0. No Ethernet card (no networking)" echo "0. No Ethernet card (no networking)"
echo "1. An Intel Pro/100 Ethernet card is installed" echo "1. Intel Pro/100"
echo "2. A Realtek 8139 Ethernet card is installed" echo "2. Realtek 8139 based card"
echo "3. A Realtek 8029 Ethernet card is installed (emulated by Qemu)" echo "3. Realtek 8029 based card (emulated by Qemu)"
echo "4. An NE2000, 3com 503 or WD based Ethernet card " echo "4. NE2000, 3com 503 or WD based card (NE2000 is emulated by Bochs)"
echo " is installed (NE2000 is emulated by Bochs)" echo "5. A 3com 501 or 509"
echo "5. A 3com 501 or 509 Ethernet card is installed " echo "6. A different Ethernet card (no networking)"
echo "6. A different Ethernet card is installed (no networking)"
echo "" echo ""
echo "In with some cards, you'll have to edit $LOCALRC " echo "With some cards, you'll have to edit $LOCALRC "
echo "after installing to the proper parameters." echo "after installing to the proper parameters."
echo "" echo ""
echo "You can always change your mind after the install." echo "You can always change your mind after the install."
@ -213,7 +211,7 @@ case "$eth" in
5) driver=dpeth; ;; 5) driver=dpeth; ;;
esac esac
# Compute the amount of memory available to Minix. # Compute the amount of memory available to MINIX.
memsize=0 memsize=0
ifs="$IFS" ifs="$IFS"
IFS=',' IFS=','
@ -243,7 +241,7 @@ echo "\
The default block size on the disk is $blockdefault KB. However, sizes of 1 to $blockdefault KB The default block size on the disk is $blockdefault KB. However, sizes of 1 to $blockdefault KB
are also supported. If you have a small disk or small RAM you may want less are also supported. If you have a small disk or small RAM you may want less
than $blockdefault KB, in which case type a block size from 1 to 8 (1, 2, 4 or $blockdefault are than $blockdefault KB, in which case type a block size from 1 to 8 (1, 2, 4 or $blockdefault are
suggested values). Otherwise hit RETURN for the default of $blockdefault KB blocks, which suggested values). Otherwise hit ENTER for the default of $blockdefault KB blocks, which
should be fine in most cases." should be fine in most cases."
while [ -z "$blocksize" ] while [ -z "$blocksize" ]
@ -266,9 +264,10 @@ echo "
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, like a 16-bit system with less then 2M, or a
32-bit system with less then 4M. Minix swapping isn't very good yet, so 32-bit system with less then 4M.
there is no need for it otherwise.
Size in kilobytes? [$swapadv] " Size in kilobytes? [$swapadv] "
swapsize= swapsize=
read swapsize read swapsize
test -z "$swapsize" && swapsize=$swapadv test -z "$swapsize" && swapsize=$swapadv
@ -281,7 +280,7 @@ The following subpartitions are about to be created on /dev/$primary:
Swap subpartition: /dev/$swap $swapsize kb Swap subpartition: /dev/$swap $swapsize kb
/usr subpartition: /dev/$usr rest of $primary /usr subpartition: /dev/$usr rest of $primary
Hit return if everything looks fine, or hit DEL to bail out if you want to Hit ENTER if everything looks fine, or hit DEL to bail out if you want to
think it over. The next step will destroy /dev/$primary. think it over. The next step will destroy /dev/$primary.
:" :"
read ret read ret
@ -304,7 +303,7 @@ else
fi fi
echo " echo "
--- Step 5 --- Copy files ------------------------------------------- --- Step 6 --- Copy files -------------------------------------------
" "
mkfs -B $blocksizebytes /dev/$usr mkfs -B $blocksizebytes /dev/$usr
@ -406,7 +405,9 @@ echo "rootdev=$root; ramimagedev=$root; $cache; save" >$pfile || exit
sync sync
echo " echo "
Please type 'shutdown' to exit Minix. Please type 'shutdown' to exit MINIX 3 and enter the boot monitor.
You can type 'boot $primary' to try the newly installed Minix system. See At the boot monitor prompt, you can type 'boot $primary' to try the
\"TESTING\" in the usage manual." newly installed MINIX system.
See Part IV: Testing in the usage manual.
"