Only in mol-working: .config.cmd Only in mol-working/config: configure Only in mol-working/config/kconfig: zconf-l.c Only in mol-working/config/kconfig: zconf-y.c Only in mol-working/config/kconfig: zconf-y.h Only in mol-working: libimport Only in mol-working/mollib: VERSION diff -aur --exclude=SCCS --exclude=BitKeeper mol-bk/mollib/config/molrc.post mol-working/mollib/config/molrc.post --- mol-bk/mollib/config/molrc.post Sun Oct 17 18:28:50 2004 +++ mol-working/mollib/config/molrc.post Thu Oct 7 10:25:01 2004 @@ -17,10 +17,10 @@ session: 0 boot_type: newworld -logfile: /var/log/mol.${session}.log +logfile: ${var}/log/mol.${session}.log ifeq ${arch} linux { - lockfile: /var/lock/mol-${session} + lockfile: ${var}/lock/mol-${session} } else { lockfile: ${var}/lock-${session} } @@ -89,7 +89,7 @@ oftree: oftrees/oftree.nw drv_postfix: "nw" - of_image: ${dbin}/openbios + of_image: ${dbin}/of ifdef ${newworld_rom} { @pseudofile: "nwrom" ${newworld_rom} Only in mol-working/mollib/config: molrc.post.orig Only in mol-working/mollib: drivers Only in mol-working/mollib: graphics Only in mol-working/mollib: images Only in mol-working/mollib: nvram Only in mol-working/mollib: startboing Only in mol-working: obj-osx diff -aur --exclude=SCCS --exclude=BitKeeper mol-bk/scripts/startmol mol-working/scripts/startmol --- mol-bk/scripts/startmol Sun Oct 17 18:28:51 2004 +++ mol-working/scripts/startmol Thu Oct 7 10:32:00 2004 @@ -7,8 +7,8 @@ MOL_OPTS="xX0123456789ea" -# --elf and --kernel are special cases -MOL_LONGOPTS="session alt vt ram test datadir libdir keyconfig res loadonly exact" +# --bindir, --elf and --kernel are special cases +MOL_LONGOPTS="session alt vt ram test datadir libdir etcdir vardir keyconfig res loadonly exact" MOL_LONGOPTS="$MOL_LONGOPTS linux oldworld newworld macos osx config detach" MOL_LONGOPTS="$MOL_LONGOPTS cdboot" MOL_LONGOPTS="$MOL_LONGOPTS zapnvram noautoboot" @@ -79,11 +79,14 @@ d|--debug) _DEBUG=1 ;; --elf*) _ELFFILE=${x/--elf=/} ;; --kernel*) _LINUXKERNEL=${x/--kernel=/} ;; + --bindir*) BIN_PATH=${x/--bindir=/} ;; *) echo -e "Unknown option '$x'\n" ; _HELP=1; break; ;; esac done +echo "BIN_PATH=$BIN_PATH" + [ "$_HELP" == 1 ] && { echo -ne "Usage: startmol [OPTIONS]"\ "\nStarts Mac-on-Linux (MOL)\n"\ @@ -119,6 +122,9 @@ " --detach detach TTY\n"\ " --datadir=dir set the MOL data directory\n"\ " --libdir=dir set the MOL library directory\n"\ + " --etcdir=dir set the MOL etc directory.\n"\ + " --vardir=dir set the MOL var directory.\N"\ + " --bindir=dir set the MOL bin directory.\n"\ " --zapnvram clear NVRAM\n"\ " --noautoboot enter Open Firmware (if OF is used)\n"\ "\nFor more information, please visit .\n" @@ -167,6 +173,11 @@ DATA_DIR="`getres -d`" || exit 1 VAR_DIR="`getres -v`" || exit 1 BIN_DIR=$LIB_DIR/bin + +echo "BIN_DIR=$BIN_DIR" +echo "DATA_DIR=$DATA_DIR" +echo "VAR_DIR=$VAR_DIR" +echo "LIB_DIR=$LIB_DIR" ORGDIR=`pwd` cd $DATA_DIR || exit 1 diff -aur --exclude=SCCS --exclude=BitKeeper mol-bk/src/drivers/net/mac_enet.c mol-working/src/drivers/net/mac_enet.c --- mol-bk/src/drivers/net/mac_enet.c Sun Oct 17 18:28:51 2004 +++ mol-working/src/drivers/net/mac_enet.c Sun Oct 3 17:42:00 2004 @@ -465,6 +465,8 @@ mac_enet_init( void ) { int i; + + return 0; /* ted -- get rid of net driver for now. */ numifs = 0; memset( (char*)enetif, 0, sizeof(enetif) ); diff -aur --exclude=SCCS --exclude=BitKeeper mol-bk/src/kmod/Darwin/alloc.c mol-working/src/kmod/Darwin/alloc.c --- mol-bk/src/kmod/Darwin/alloc.c Sun Oct 17 18:28:51 2004 +++ mol-working/src/kmod/Darwin/alloc.c Wed Sep 29 22:46:54 2004 @@ -178,6 +178,7 @@ if( !phys ) { printk("tophys_mol: VA %08lX translates to 0!\n", (ulong)p ); } + phys = phys << 12; /* Hand-patch by ted based on Samuel email. */ phys += phys ? (ulong)(p-trunc_page(p)) : 0; return phys; } diff -aur --exclude=SCCS --exclude=BitKeeper mol-bk/src/main/cmdline_opts.h mol-working/src/main/cmdline_opts.h --- mol-bk/src/main/cmdline_opts.h Sun Oct 17 18:28:51 2004 +++ mol-working/src/main/cmdline_opts.h Thu Oct 7 10:29:17 2004 @@ -29,9 +29,10 @@ enum{ optRamSize=1000, optVTNum, optSessNum, optTest, optKeyConfig, - optElfImage, optDataDir, optLibDir, optAddRes, optKernel, - optLinux, optOldworld, optNewworld, optConfig, optLoadOnly, - optDetachTTY, optCDBoot, optAltConfig, optZapNVRAM, optNoAutoBoot + optElfImage, optDataDir, optLibDir, optEtcDir, optVarDir, + optAddRes, optKernel, optLinux, optOldworld, optNewworld, + optConfig, optLoadOnly, optDetachTTY, optCDBoot, optAltConfig, + optZapNVRAM, optNoAutoBoot }; static struct option opt[] = { @@ -54,6 +55,8 @@ {"datadir", 1, 0, optDataDir }, {"libdir", 1, 0, optLibDir }, + {"etcdir", 1, 0, optEtcDir }, + {"vardir", 1, 0, optVarDir }, {"test", 0, 0, optTest }, {"keyconfig", 0, 0, optKeyConfig }, @@ -99,8 +102,10 @@ {optOldworld, 0, kParseRes, "boot_type: oldworld" }, {optNewworld, 0, kParseRes, "boot_type: newworld" }, {'X', 0, kParseRes, "boot_type: osx" }, - {optDataDir, 1, kStringRes, "data" }, - {optLibDir, 1, kStringRes, "lib" }, + {optDataDir, 0, kStringRes, "data" }, /* ted -- data, lib, etc used to be root_only, but i changed */ + {optLibDir, 0, kStringRes, "lib" }, + {optEtcDir, 0, kStringRes, "etc" }, + {optVarDir, 0, kStringRes, "var" }, {optElfImage, 1, kParseRes, "boot_type: elf" }, {optElfImage, 1, kStringRes, "elf_image" }, {optKernel, 1, kStringRes, "kernel" }, diff -aur --exclude=SCCS --exclude=BitKeeper mol-bk/src/main/main.c mol-working/src/main/main.c --- mol-bk/src/main/main.c Sun Oct 17 18:28:51 2004 +++ mol-working/src/main/main.c Thu Oct 7 10:06:53 2004 @@ -296,11 +296,12 @@ printm("Starting MOL session %d\n", g_session_id ); authenticate(); - +#if 0 if( seteuid(0) ) { fprintf( stderr,"Mac-on-Linux must be setuid root!\n"); exit(1); } +#endif load_mods(); /*