oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscellaneous small fixes to prettify startup output.

Browse Source
This commit is contained in:
Jorrit Herder 2005-08-02 15:56:24 +00:00
parent 7af2b107d4
commit 0bd61375ad
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/fxp/fxp.c
View File

@ -273,8 +273,6 @@ int main(void)
v= 0; v= 0;
#if 0 #if 0
(void) env_parse("ETH_IGN_PROTO", "x", 0, &v, 0x0000L, 0xFFFFL); (void) env_parse("ETH_IGN_PROTO", "x", 0, &v, 0x0000L, 0xFFFFL);
#else
printf("not calling env_parse for ETH_IGN_PROTO\n");
#endif #endif
eth_ign_proto= htons((u16_t) v); eth_ign_proto= htons((u16_t) v);
@ -432,11 +430,8 @@ static void fxp_pci_conf()
if (!env_prefix(envvar, "pci")) if (!env_prefix(envvar, "pci"))
env_panic(envvar); env_panic(envvar);
} }
#else
printf("FXP: not calling getenv\n");
#endif #endif
printf("not calling env_parse\n");
v= 0; v= 0;
#if 0 #if 0
(void) env_parse(envvar, envfmt, 1, &v, 0, 255); (void) env_parse(envvar, envfmt, 1, &v, 0, 255);
@ -935,7 +930,6 @@ fxp_t *fp;
} }
#else #else
i= 0; i= 0;
printf("not calling env_parse\n");
#endif #endif
#if 0 #if 0

2
drivers/memory/random.c
View File

@ -214,7 +214,6 @@ PRIVATE void reseed()
return; return;
reseed_count++; reseed_count++;
printf("reseed: round %d, samples = %d\n", reseed_count, samples);
SHA256_Init(&ctx); SHA256_Init(&ctx);
if (got_seeded) if (got_seeded)
SHA256_Update(&ctx, random_key, sizeof(random_key)); SHA256_Update(&ctx, random_key, sizeof(random_key));
@ -225,7 +224,6 @@ PRIVATE void reseed()
{ {
if ((reseed_count & (1UL << (i-1))) != 0) if ((reseed_count & (1UL << (i-1))) != 0)
break; break;
printf("random_reseed: adding pool %d\n", i);
SHA256_Final(digest, &pool_ctx[i]); SHA256_Final(digest, &pool_ctx[i]);
SHA256_Update(&ctx, digest, sizeof(digest)); SHA256_Update(&ctx, digest, sizeof(digest));
SHA256_Init(&pool_ctx[i]); SHA256_Init(&pool_ctx[i]);

4
etc/usr/rc
View File

@ -67,7 +67,7 @@ start)
then then
cat < $RANDOM_FILE >/dev/random cat < $RANDOM_FILE >/dev/random
# overwrite $RANDOM_FILE. We don't want to use this data again # overwrite $RANDOM_FILE. We don't want to use this data again
dd if=/dev/random of=$RANDOM_FILE bs=1024 count=1 dd if=/dev/random of=$RANDOM_FILE bs=1024 count=1 2> /dev/null
fi fi
# Start servers and drivers set at the boot monitor. # Start servers and drivers set at the boot monitor.
@ -93,6 +93,7 @@ start)
if [ ! -f /CD ] if [ ! -f /CD ]
then daemonize cron then daemonize cron
fi fi
echo .
if [ "$net" ] if [ "$net" ]
then then
@ -102,6 +103,7 @@ start)
. /etc/rc.net . /etc/rc.net
else else
# Standard network daemons. # Standard network daemons.
echo -n "Starting networking:"
daemonize dhcpd daemonize dhcpd
daemonize nonamed daemonize nonamed
daemonize talkd daemonize talkd

3
servers/pm/main.c
View File

@ -203,13 +203,14 @@ PRIVATE void pm_init()
rmp->mp_parent = PM_PROC_NR; rmp->mp_parent = PM_PROC_NR;
rmp->mp_flags |= IN_USE; rmp->mp_flags |= IN_USE;
rmp->mp_nice = 0; rmp->mp_nice = 0;
sigemptyset(&rmp->mp_ignore);
} }
else { /* system process */ else { /* system process */
rmp->mp_pid = get_free_pid(); rmp->mp_pid = get_free_pid();
rmp->mp_parent = SM_PROC_NR; rmp->mp_parent = SM_PROC_NR;
rmp->mp_flags |= IN_USE | DONT_SWAP | PRIV_PROC; rmp->mp_flags |= IN_USE | DONT_SWAP | PRIV_PROC;
sigfillset(&rmp->mp_ignore);
} }
sigemptyset(&rmp->mp_ignore);
sigemptyset(&rmp->mp_sigmask); sigemptyset(&rmp->mp_sigmask);
sigemptyset(&rmp->mp_catch); sigemptyset(&rmp->mp_catch);
sigemptyset(&rmp->mp_sig2mess); sigemptyset(&rmp->mp_sig2mess);