tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autopart fixes; halt sends SIGTERM; setup script without quotes;

Browse Source 
MAKEDEV makes random and cmos when called with std
This commit is contained in:
Ben Gras 2005-08-05 19:16:12 +00:00
parent 0c03b0c168
commit a9b7d3a172
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/ibm/autopart.c
View File

@ -1226,8 +1226,9 @@ void check_ind(struct part_entry *pe)
/* If there are no other partitions then make this new one active. */ /* If there are no other partitions then make this new one active. */
{ {
struct part_entry *pe2; struct part_entry *pe2;
int i = 0;
for (pe2= table + 1; pe2 < table + 1 + NR_PARTITIONS; pe2++) for (pe2= table + 1; pe2 < table + 1 + NR_PARTITIONS; pe2++, i++)
if (pe2->sysind != NO_PART && (pe2->bootind & ACTIVE_FLAG)) if (pe2->sysind != NO_PART && (pe2->bootind & ACTIVE_FLAG))
return; return;
@ -1828,10 +1829,7 @@ void m_read(int ev, object_t *op)
stat_start(0); stat_start(0);
fflush(stdout); fflush(stdout);
if (((device= open(curdev->name, mode= O_RDWR, 0666)) < 0 if ((device= open(curdev->name, mode= O_RDWR, 0666)) < 0) {
&& (errno != EACCES
|| (!nordonly && (device= open(curdev->name, mode= O_RDONLY)) < 0)))
) {
stat_start(1); stat_start(1);
if(!probing) if(!probing)
printf("%s: %s", curdev->name, strerror(errno)); printf("%s: %s", curdev->name, strerror(errno));
@ -2602,12 +2600,10 @@ do_autopart(int resultfd)
char partbuf[100]; char partbuf[100];
#if 0
printf("\nThis is your current partition table:\n"); printf("\nThis is your current partition table:\n");
m_dump(orig_table); m_dump(orig_table);
printf("\nThis will be your new partition table:\n"); printf("\nThis will be your new partition table:\n");
m_dump(table); m_dump(table);
#endif
printf("\nThis is the point of no return. You have selected to install MINIX\n"); printf("\nThis is the point of no return. You have selected to install MINIX\n");
printf("into region %d of disk %d. If you agree with this selection, your\n", (int)(r-regions), (int) (curdev-firstdev)); printf("into region %d of disk %d. If you agree with this selection, your\n", (int)(r-regions), (int) (curdev-firstdev));

5
commands/reboot/halt.c
View File

@ -101,8 +101,11 @@ char **argv;
if (fast) { if (fast) {
/* But not too fast... */ /* But not too fast... */
signal(SIGTERM, SIG_IGN);
kill(1, SIGTERM);
printf("Sending SIGTERM to all processes ...\n");
kill(-1, SIGTERM);
sleep(1); sleep(1);
} else { } else {
/* Run the shutdown scripts. */ /* Run the shutdown scripts. */
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);

2
commands/scripts/MAKEDEV.sh
View File

@ -12,7 +12,7 @@ case $#:$1 in
set -$- mem fd0 fd1 fd0p0 fd1p0 \ set -$- mem fd0 fd1 fd0p0 fd1p0 \
c0d0 c0d0p0 c0d0p0s0 c0d1 c0d1p0 c0d1p0s0 \ c0d0 c0d0p0 c0d0p0s0 c0d1 c0d1p0 c0d1p0s0 \
c0d2 c0d2p0 c0d2p0s0 c0d3 c0d3p0 c0d3p0s0 \ c0d2 c0d2p0 c0d2p0s0 c0d3 c0d3p0 c0d3p0s0 \
tty ttyc1 ttyc2 ttyc3 tty00 tty01 ttyp0 ttyp1 ttyp2 ttyp3 eth klog tty ttyc1 ttyc2 ttyc3 tty00 tty01 ttyp0 ttyp1 ttyp2 ttyp3 eth klog random cmos
;; ;;
0:|1:-\?) 0:|1:-\?)
cat >&2 <<EOF cat >&2 <<EOF

2
commands/scripts/setup.sh
View File

@ -388,7 +388,7 @@ if [ $cache -eq 0 ]; then cache=; else cache="ramsize=$cache"; fi
# Make bootable. # Make bootable.
installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit
edparams /dev/$root "rootdev=$root; ramimagedev=$root; $cache; main() { echo \"This is the MINIX 3 boot monitor.\"; echo \"MINIX will load in 5 seconds, or press ESC.\"; trap 5000 boot; menu; }; save" || exit edparams /dev/$root "rootdev=$root; ramimagedev=$root; $cache; main() { echo This is the MINIX 3 boot monitor.; echo MINIX will load in 5 seconds, or press ESC.; trap 5000 boot; menu; }; save" || exit
pfile="/usr/src/tools/fdbootparams" pfile="/usr/src/tools/fdbootparams"
echo "Remembering boot parameters in ${pfile}." echo "Remembering boot parameters in ${pfile}."
echo "rootdev=$root; ramimagedev=$root; $cache; save" >$pfile || exit echo "rootdev=$root; ramimagedev=$root; $cache; save" >$pfile || exit