diff --git a/.Floppies/A2OSX.BUILDlc.po b/.Floppies/A2OSX.BUILDlc.po new file mode 100644 index 00000000..8614d47b Binary files /dev/null and b/.Floppies/A2OSX.BUILDlc.po differ diff --git a/ETC/INIT.txt b/ETC/INIT.txt index a629e3a7..629f450e 100644 --- a/ETC/INIT.txt +++ b/ETC/INIT.txt @@ -1,34 +1,21 @@ NEW -PREFIX -AUTO 4,1 -#!/BIN/SH + AUTO 3,1 +#!/bin/sh ECHO *** A2osX INIT Script *** -SET PS1 = '$PWD' -SET PATH = ${PATH}:${ROOT}BIN/DEV/ -SET DRV = ${DRV}:${ROOT}DRV/GUI/ -SET LIB = ${LIB}:${ROOT}LIB/GUI/ # Main Screens -NOHUP GETTY /DEV/TTY1 ${ROOT}SBIN/LOGIN & -NOHUP GETTY /DEV/TTY2 ${ROOT}SBIN/LOGIN & -NOHUP GETTY /DEV/TTY3 ${ROOT}SBIN/LOGIN & -NOHUP GETTY /DEV/TTY4 ${ROOT}SBIN/LOGIN & +NOHUP getty /dev/tty1 ${ROOT}sbin/login & +NOHUP getty /dev/tty2 ${ROOT}sbin/login & +NOHUP getty /dev/tty3 ${ROOT}sbin/login & +NOHUP getty /dev/tty4 ${ROOT}sbin/login & # Serial Login #INSDRV SSC.DRV 9600,N,8,1,X #INSDRV SSC.I.DRV 9600,N,8,1,X -#STARTPROC GETTY /DEV/COM2 ${ROOT}SBIN/LOGIN +#NOHUP getty /DEV/COM2 ${ROOT}SBIN/LOGIN & #INSDRV PIC.DRV -# Network Section -#INSDRV UTHERNET.DRV 00:0E:3A:12:34:56 -#INSDRV LANCEGS.DRV -#INSDRV UTHER2.AI.DRV 00:08:DC:12:34:56 -#INSDRV UTHERNET2.DRV 00:08:DC:12:34:56 -#NETWORKD & -#TELNETD & -#HTTPD & # GUI Section #INSDRV MOUSE.DRV #INSDRV DHGR.DRV -#GUI & +#NOHUP GUI & ECHO *** End INIT *** MAN TEXT ETC/INIT diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 39a1f141..1ed74b6d 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -89,7 +89,7 @@ Kernel.Init3 sta SETALTZP stz IRQ.InLib sta SETALTCHAR - sta CLRMIXED + sta SETMIXED sta CLRHIRES sta SET80STORE sta CLRPAGE2 @@ -151,11 +151,12 @@ Kernel.Init3C >PUSHBI 0 jsr PwdMgrInit - lda KBD - bpl .7 - sta KBDSTROBE - cmp #146 CTRL-R for ROOT mode - bne .7 +* lda KBD +* bpl .7 +* sta KBDSTROBE +* cmp #146 CTRL-R for ROOT mode +* bne .7 + >PUSHBI 0 >LDYAI MSG.CTRLR >SYSCALL2 printf @@ -1040,15 +1041,6 @@ PwdMgrInit >LDYAI MSG.PWD sta S.Table.hFile rts *-------------------------------------- -PwdMgr.ROOT .DA #S.SESSION.P.ROOT - .DA #0 UID - .DA #0 GID - .AZ "ROOT" NAME - .AZ "Root User" GECOS - .AZ "${ROOT}ROOT/" DIR - .AZ "${ROOT}BIN/SH" SHELL -PwdMgr.ROOT.Size .EQ *-PwdMgr.ROOT -*-------------------------------------- * Modified CHARGET/CHARGOT for ROM CALL * CHRGET .EQ $B1 - C8 *-------------------------------------- @@ -1093,7 +1085,7 @@ SYSSCREEN.TOP .AZ "A2osX 0.93 Console" MSG.Init3 .AS "A2osX[Stage3]:Init" .AZ "\r\n*** Press Ctrl-R for ROOT Mode ***\r\n" MSG.DEV .AZ "Device Manager..." -MSG.BLKDEV .AZ " Adding Device: /DEV/%s, Type: %s\r\n" +MSG.BLKDEV .AZ " Adding Device: /dev/%s, Type: %s\r\n" MSG.BLKDEV.TBL .DA MSG.BLKDEV.RAM .DA MSG.BLKDEV.DII .DA MSG.BLKDEV.USR @@ -1138,16 +1130,25 @@ MSG.Z80 .AZ "Checking Z80 CPU..." MSG.Z80.OK .AZ "Detected In Slot %d.\r\n" MSG.Z80.KO .AZ "Not Detected." *-------------------------------------- -DEV.CONSOLE .AZ "/DEV/CONSOLE" +DEV.CONSOLE .AZ "/dev/console" RAMx .AZ "/RAMx" I.ENV.BOOT .AZ "BOOT" I.ENV.ROOT .AZ "ROOT" -I.ENV.PATH .AZ "PATH=${BOOT}SBIN/:${BOOT}BIN/" -I.ENV.LIB .AZ "LIB=${BOOT}LIB/" -I.ENV.DRV .AZ "DRV=${BOOT}DRV/" +I.ENV.PATH .AZ "PATH=${BOOT}sbin/:${BOOT}bin/" +I.ENV.LIB .AZ "LIB=${BOOT}lib/" +I.ENV.DRV .AZ "DRV=${BOOT}drv/" CTRLR.SHELL .AZ "${BOOT}BIN/SH" -ETCPASSWD .AZ "${ROOT}ETC/PASSWD" -ETCINIT.CMDLINE .AZ "${ROOT}ETC/INIT" +ETCINIT.CMDLINE .AZ "${ROOT}etc/init" +ETCPASSWD .AZ "${ROOT}etc/passwd" +*-------------------------------------- +PwdMgr.ROOT .DA #S.SESSION.P.ROOT + .DA #0 UID + .DA #0 GID + .AZ "root" NAME + .AZ "Root User" GECOS + .AZ "${ROOT}root/" DIR + .AZ "${ROOT}bin/sh" SHELL +PwdMgr.ROOT.Size .EQ *-PwdMgr.ROOT *-------------------------------------- MLIOPEN00 .DA #3 .DA .1 @@ -1172,7 +1173,7 @@ FD.NULL .DA #S.FD.T.CDEV .DA DRV.NULL .DA 0 DCBPTR .DA 0 BUFPTR -FD.NULL.NAME .AZ "NULL" NAME +FD.NULL.NAME .AZ "null" NAME *-------------------------------------- FD.TTY .DA #S.FD.T.CDEV .DA #0 HANDLER @@ -1183,8 +1184,8 @@ FD.TTY .DA #S.FD.T.CDEV .BS 2 DCBPTR .BS 2 BUFPTR *-------------------------------------- -FD.CONSOLE.NAME .AZ "CONSOLE" -FD.TTY.NAME .AZ "TTY0" +FD.CONSOLE.NAME .AZ "console" +FD.TTY.NAME .AZ "tty0" *-------------------------------------- FD.BDEV .DA #S.FD.T.BDEV .DA #0 HANDLER @@ -1194,7 +1195,7 @@ FD.BDEV .DA #S.FD.T.BDEV .BS 2 DRVPTR .DA 0 DCBPTR .DA 0 BUFPTR -FD.BDEV.NAME .AZ "S1D1" +FD.BDEV.NAME .AZ "s1d1" *-------------------------------------- SmartPort.OFS .HS 010305 SmartPort.SIG .HS 200003 diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt index 73d641c5..cf9e6155 100644 --- a/SYS/KERNEL.S.IO.txt +++ b/SYS/KERNEL.S.IO.txt @@ -227,7 +227,7 @@ IO.CLOSE.NOD ldx #2 * sec rts *-------------------------------------- -IO.DEV.FIFO .AS "/DEV/FIFO" +IO.DEV.FIFO .AS "/dev/fifo" *-------------------------------------- MAN SAVE USR/SRC/SYS/KERNEL.S.IO diff --git a/SYS/KERNEL.S.UNISTD.txt b/SYS/KERNEL.S.UNISTD.txt index 90c9688c..e2b05584 100644 --- a/SYS/KERNEL.S.UNISTD.txt +++ b/SYS/KERNEL.S.UNISTD.txt @@ -34,6 +34,7 @@ K.Open jsr PFT.YAToMLIPATH UNISTD.Open ldx #5 /DEV/ cpx K.MLI.PATH bcs IO.OPEN.REG + .1 lda K.MLI.PATH,x cmp IO.DEV.FIFO-1,x bne IO.OPEN.REG diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt index 3b7099e4..32175c97 100644 --- a/SYS/KERNEL.S.txt +++ b/SYS/KERNEL.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF SYS/KERNEL + .TF sys/kernel .INB INC/MACROS.I .INB INC/A2OSX.I