some small changes
. add /sbin to tests $PATH for ping . take disable file mmap item from default boot menu . ask for feedback in motd . fix ext2fs on arm (the memory alloced with STATICINIT is flaky on arm) Change-Id: I7525207074d62abc47ed3891139f6ef7ef6025be
This commit is contained in:
parent
27d0ecdb62
commit
d1abad940a
5 changed files with 9 additions and 16 deletions
|
@ -4,6 +4,5 @@ default=2
|
||||||
menu=Start MINIX 3:load_mods /boot/minix_default/mod*;multiboot /boot/minix_default/kernel rootdevname=$rootdevname $args
|
menu=Start MINIX 3:load_mods /boot/minix_default/mod*;multiboot /boot/minix_default/kernel rootdevname=$rootdevname $args
|
||||||
menu=Start latest MINIX 3:load_mods /boot/minix_latest/mod*;multiboot /boot/minix_latest/kernel rootdevname=$rootdevname $args
|
menu=Start latest MINIX 3:load_mods /boot/minix_latest/mod*;multiboot /boot/minix_latest/kernel rootdevname=$rootdevname $args
|
||||||
menu=Start latest MINIX 3 in single user mode:load_mods /boot/minix_latest/mod*;multiboot /boot/minix_latest/kernel rootdevname=$rootdevname bootopts=-s $args
|
menu=Start latest MINIX 3 in single user mode:load_mods /boot/minix_latest/mod*;multiboot /boot/minix_latest/kernel rootdevname=$rootdevname bootopts=-s $args
|
||||||
menu=Start latest MINIX 3 without file mmap:load_mods /boot/minix_latest/mod*;multiboot /boot/minix_latest/kernel rootdevname=$rootdevname filemap=0 $args
|
|
||||||
menu=Edit menu option:edit
|
menu=Edit menu option:edit
|
||||||
menu=Drop to boot prompt:prompt
|
menu=Drop to boot prompt:prompt
|
||||||
|
|
2
etc/motd
2
etc/motd
|
@ -16,5 +16,5 @@ MINIX 3 supports multiple virtual terminals. Just use ALT+F1, F2, F3
|
||||||
and F4 to navigate among them.
|
and F4 to navigate among them.
|
||||||
|
|
||||||
For more information on how to use MINIX 3, see the wiki:
|
For more information on how to use MINIX 3, see the wiki:
|
||||||
http://wiki.minix3.org.
|
http://wiki.minix3.org. We'd like your feedback: http://minix3.org/community/
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "fs.h"
|
#include "fs.h"
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
#include <minix/com.h>
|
#include <minix/com.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include "buf.h"
|
#include "buf.h"
|
||||||
|
@ -60,9 +61,9 @@ int fs_readsuper()
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Fill in the super block. */
|
/* Fill in the super block. */
|
||||||
STATICINIT(superblock, 1);
|
if(!(superblock = malloc(sizeof(*superblock))))
|
||||||
if (!superblock)
|
|
||||||
panic("Can't allocate memory for superblock.");
|
panic("Can't allocate memory for superblock.");
|
||||||
|
|
||||||
superblock->s_dev = fs_dev; /* read_super() needs to know which dev */
|
superblock->s_dev = fs_dev; /* read_super() needs to know which dev */
|
||||||
r = read_super(superblock);
|
r = read_super(superblock);
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,6 @@ register struct super_block *sp; /* pointer to a superblock */
|
||||||
int r;
|
int r;
|
||||||
/* group descriptors, sp->s_group_desc points to this. */
|
/* group descriptors, sp->s_group_desc points to this. */
|
||||||
static struct group_desc *group_descs;
|
static struct group_desc *group_descs;
|
||||||
char *buf;
|
|
||||||
block_t gd_size; /* group descriptors table size in blocks */
|
block_t gd_size; /* group descriptors table size in blocks */
|
||||||
int gdt_position;
|
int gdt_position;
|
||||||
static char superblock_buf[1024];
|
static char superblock_buf[1024];
|
||||||
|
@ -149,16 +148,10 @@ register struct super_block *sp; /* pointer to a superblock */
|
||||||
|
|
||||||
gd_size = sp->s_gdb_count * sp->s_block_size;
|
gd_size = sp->s_gdb_count * sp->s_block_size;
|
||||||
|
|
||||||
buf = 0;
|
if(!(group_descs = malloc(gd_size * sizeof(struct group_desc))))
|
||||||
STATICINIT(buf, gd_size);
|
panic("can't allocate group desc array");
|
||||||
group_descs = (struct group_desc *) buf;
|
if(!(ondisk_group_descs = malloc(gd_size * sizeof(struct group_desc))))
|
||||||
|
panic("can't allocate group desc array");
|
||||||
buf = 0;
|
|
||||||
STATICINIT(buf, gd_size);
|
|
||||||
ondisk_group_descs = (struct group_desc *) buf;
|
|
||||||
|
|
||||||
if (!group_descs || !ondisk_group_descs)
|
|
||||||
panic("can't allocate memory for gdt buffer");
|
|
||||||
|
|
||||||
/* s_first_data_block (block number, where superblock is stored)
|
/* s_first_data_block (block number, where superblock is stored)
|
||||||
* is 1 for 1Kb blocks and 0 for larger blocks.
|
* is 1 for 1Kb blocks and 0 for larger blocks.
|
||||||
|
|
|
@ -7,7 +7,7 @@ then ROOT=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Initialization
|
# Initialization
|
||||||
PATH=:/bin:/usr/bin
|
PATH=:/bin:/usr/bin:/sbin
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
rm -rf DIR* # remove any old junk lying around
|
rm -rf DIR* # remove any old junk lying around
|
||||||
|
|
Loading…
Reference in a new issue