rs changes (also use driver configurations in the image ramdisk)

This commit is contained in:
Philip Homburg
2006-10-31 13:35:04 +00:00
parent 9ac537eb7c
commit 0c1d433f60
11 changed files with 197 additions and 30 deletions

View File

@@ -2,13 +2,14 @@
PROGRAMS=at_wini bios_wini cdprobe dev2name floppy loadramdisk newroot \
pci sh service sysenv mfs
EXTRA=drivers.conf passwd
MAKEDEV=/usr/bin/MAKEDEV
all: image.c image.s
clean:
rm -rf $(PROGRAMS) bintoc image image.c image.s t proto.gen
rm -rf $(PROGRAMS) $(EXTRA) bintoc image image.c image.s t proto.gen
image.c: bintoc image
./bintoc -o $@ image
@@ -21,7 +22,7 @@ image.s: image.c
bintoc: bintoc.c
$(CC) -o $@ bintoc.c
image: proto.gen mtab rc $(PROGRAMS)
image: proto.gen mtab rc $(PROGRAMS) $(EXTRA)
mkfs -B 2048 image proto.gen || { rm -f image; false; }
at_wini: ../../at_wini/at_wini
@@ -96,6 +97,12 @@ mfs: ../../../servers/mfs/mfs
../../../servers/mfs/mfs:
cd ../../../servers/mfs && make
drivers.conf: ../../../etc/drivers.conf
install -s ../../../etc/$@ $@
passwd: ../../../etc/passwd
install -s ../../../etc/$@ $@
depend:
/usr/bin/mkdep "$(CC) -E $(CPPFLAGS)" *.c > .depend

View File

@@ -19,7 +19,9 @@ d--755 0 0
@DEV@
$
etc d--755 0 0
drivers.conf ---644 0 0 drivers.conf
mtab ---644 0 0 mtab
passwd ---644 0 0 passwd
rc ---755 0 0 rc
$
$

View File

@@ -1,13 +1,13 @@
#!/bin/sh
set -e
/bin/service up /bin/pci
/bin/service -c up /bin/floppy -dev /dev/fd0
/bin/service up /bin/pci -config /etc/drivers.conf
/bin/service -c up /bin/floppy -config /etc/drivers.conf -dev /dev/fd0
if [ X`/bin/sysenv bios_wini` = Xyes ]
then
echo Using bios_wini.
/bin/service -c up /bin/bios_wini -dev /dev/c0d0
else
/bin/service -c up /bin/at_wini -dev /dev/c0d0
/bin/service -c up /bin/at_wini -dev /dev/c0d0 -script /etc/rs.single -config /etc/drivers.conf
fi
rootdev=`sysenv rootdev` || echo 'No rootdev?'