code: 9ferno

Info  •  Files  •  Log

Revert "getting osinit.dis to work with the different inferno root directory"

This reverts commit c2a416869c5376a51d17cd246b187955023e349c.

--- a/os/init/mkfile

+++ b/os/init/mkfile

@@ -1,7 +1,6 @@

 <../../mkconfig

 OBJ=\

-	shell.dis\

 	wminit.dis\

 all:V:	$OBJ

--- a/os/pc64/mkfile

+++ b/os/pc64/mkfile

@@ -8,7 +8,7 @@

 SYSTARG=Inferno # $OSTARG

 OBJTYPE=amd64 # 386

-INSTALLDIR=$ROOT/Inferno/$OBJTYPE/	#path of directory where kernel is installed

+INSTALLDIR=$SRC/Inferno/$OBJTYPE/	#path of directory where kernel is installed

 #INSTALLDIR=/$OBJTYPE

 # must match mem.h

--- a/os/pc64/pc64

+++ b/os/pc64/pc64

@@ -198,6 +198,7 @@

 	/dis/lib/workdir.dis

 	/dis/sh/std.dis

 	/dis/9660srv.dis

+	/dis/bootrc

 bootdir

 	/$objtype/bin/paqfs

--- a/os/port/mkroot

+++ b/os/port/mkroot

@@ -5,7 +5,6 @@

 		conf = ARGV[1];

 		infernoroot = ENVIRON["ROOT"];

-		infernosrc = ENVIRON["SRC"];

 		init = ENVIRON["INIT"];

 		data2s = ENVIRON["DATA2S"];

 		nroot = 0;

@@ -23,9 +22,8 @@

 		dst[nroot] = $1;

 		if (NF > 1)

 			src[nroot] = infernoroot $2;

-		else if (dst[nroot] == "/osinit.dis"){

-			src[nroot] = infernosrc "/os/init/" init ".dis";

-		}

+		else if (dst[nroot] == "/osinit.dis")

+			src[nroot] = infernoroot "/os/init/" init ".dis";

 		else

 			src[nroot] = infernoroot $1;

 		for(i=0; i<nroot; i++)