diff --git a/install b/install index a254c30..8536c51 100755 --- a/install +++ b/install @@ -152,12 +152,13 @@ echo "CRAYCHKPNTFILE=/tmp/.blah" >> /sysinfo echo "SYS_SERIALNO=$SERIALNO" >> /sysinfo echo "SYS_SWSIP=$HOST_IP" >> /sysinfo echo "SYS_CRAYIP=$SIM_IP" >> /sysinfo +#echo "SYS_CRAYHOST=cray" >> /sysinfo echo "SYS_ROUTERIP=$ROUTER_IP" >> /sysinfo echo "SYS_ROUTERHOST=router" >> /sysinfo echo "SYS_IFNAME=en0" >> /sysinfo echo "SYS_ROOT_FS=root" >> /sysinfo -echo "SYS_USR_FS=root" >> /sysinfo -echo "SYS_SRC_FS=root" >> /sysinfo +echo "SYS_USR_FS=usr" >> /sysinfo +echo "SYS_SRC_FS=src" >> /sysinfo echo "# Parallel nmakes to run: let's keep things simple and single-threaded" >> /sysinfo echo "SYS_NPROC=1" >> /sysinfo echo "SYS_CPUS=16" >> /sysinfo @@ -194,8 +195,8 @@ echo "rcp /CONFIGURATION $LOCAL_LOGIN@$SWSHOST:$SIM_LOC/param" rcp /CONFIGURATION $LOCAL_LOGIN@$SWSHOST:$SIM_LOC/param || install_errorexit "Can't send /CONFIGURATION to host" echo "done ..." -FILESYSTEMS=root -MOUNTPOINTS=$SYS_MNT +FILESYSTEMS=root:usr:src +MOUNTPOINTS=$SYS_MNT:$SYS_MNT/usr:$SYS_MNT/usr/src PACKAGES=UNICOS_Executables @@ -276,7 +277,7 @@ cat < /rcoptions.patch < RC_MKUTMP='ASK' --- > RC_MKTMP='YES' -> RC_MKUTMP='NO' +> RC_MKUTMP='YES' 74c74 < RC_TCP='ASK' --- @@ -289,15 +290,18 @@ cat < /rcoptions.patch > RC_NFS='YES' > RC_YP='NO' > RC_TAPE='NO' -126,128c126,128 -< USRDEV='usr' -< SRCDEV='src' -< USRTMPDEV='usr_tmp' ---- -> USRDEV='' -> SRCDEV='' -> USRTMPDEV='' EOT +# Unfortunately the CRAY-provided install scripts assume these to be real devices. +# So let's not try to outsmart them and leave them as-is and provide simulated +# hard drives for each +#126,128c126,128 +#< USRDEV='usr' +#< SRCDEV='src' +#< USRTMPDEV='usr_tmp' +#--- +#> USRDEV='' +#> SRCDEV='' +#> USRTMPDEV='' #131c131 #< TMPDEV='tmp' #--- diff --git a/unicos.cfg b/unicos.cfg index d025b6f..d22c347 100644 --- a/unicos.cfg +++ b/unicos.cfg @@ -131,10 +131,31 @@ IopClusters { ImageFileName root.img DeviceType DD_U } - tmp { + usr { PysicalDeviceId 025 IopNumber 0 Unit 0 + ImageFileName usr.img + DeviceType DD_U + } + src { + PysicalDeviceId 026 + IopNumber 0 + Unit 0 + ImageFileName src.img + DeviceType DD_U + } + usr_tmp { + PysicalDeviceId 027 + IopNumber 0 + Unit 0 + ImageFileName usr_tmp.img + DeviceType DD_U + } + tmp { + PysicalDeviceId 030 + IopNumber 0 + Unit 0 ImageFileName tmp.img DeviceType DD_U } diff --git a/unicos.param b/unicos.param index 9ded526..9b83616 100644 --- a/unicos.param +++ b/unicos.param @@ -13,8 +13,8 @@ mainframe { } unicos { - 50 NBUF; - 50 NPBUF; + 512 NBUF; + 512 NPBUF; /* 98280 LDCHCORE;*/ 10 LDCHCORE; 500 NLDCH; @@ -98,10 +98,10 @@ filesystem { pdd root { minor 7; sector 0; - length 1048576 sectors; + length 262144 sectors; } } - disk "tmp" { + disk "usr" { type DD_U; iopath { cluster 0; @@ -109,8 +109,50 @@ filesystem { channel 025; } unit 0; + pdd usr { + minor 9; + sector 0; + length 1048576 sectors; + } + } + disk "src" { + type DD_U; + iopath { + cluster 0; + eiop 0; + channel 026; + } + unit 0; + pdd src { + minor 10; + sector 0; + length 262144 sectors; + } + } + disk "usr_tmp" { + type DD_U; + iopath { + cluster 0; + eiop 0; + channel 027; + } + unit 0; + pdd usr_tmp { + minor 11; + sector 0; + length 131072 sectors; + } + } + disk "tmp" { + type DD_U; + iopath { + cluster 0; + eiop 0; + channel 030; + } + unit 0; pdd tmp { - minor 8; + minor 12; sector 0; length 131072 sectors; } @@ -135,8 +177,20 @@ filesystem { minor 62; pdd root; } - ldd tmp { + ldd usr { minor 63; + pdd usr; + } + ldd src { + minor 64; + pdd src; + } + ldd usr_tmp { + minor 65; + pdd usr_tmp; + } + ldd tmp { + minor 66; pdd tmp; } /* rootdev is ldd ram;*/ diff --git a/unicos_ramfs.cfg b/unicos_ramfs.cfg index 4874ec3..30c1b53 100644 --- a/unicos_ramfs.cfg +++ b/unicos_ramfs.cfg @@ -85,7 +85,7 @@ IopClusters { KernelPreamble 0x40 ParameterFileName unicos_ramfs.param RamFsFileName ram_fs -; RunLevel 5 +; RunLevel 2 I2C { Channel 16 @@ -131,11 +131,32 @@ IopClusters { ImageFileName root.img DeviceType DD_U } - temp { + usr { PysicalDeviceId 025 IopNumber 0 Unit 0 - ImageFileName temp.img + ImageFileName usr.img + DeviceType DD_U + } + src { + PysicalDeviceId 026 + IopNumber 0 + Unit 0 + ImageFileName src.img + DeviceType DD_U + } + usr_tmp { + PysicalDeviceId 027 + IopNumber 0 + Unit 0 + ImageFileName usr_tmp.img + DeviceType DD_U + } + tmp { + PysicalDeviceId 030 + IopNumber 0 + Unit 0 + ImageFileName tmp.img DeviceType DD_U } } diff --git a/unicos_ramfs.param b/unicos_ramfs.param index 8ad53d7..579aaf2 100644 --- a/unicos_ramfs.param +++ b/unicos_ramfs.param @@ -13,8 +13,8 @@ mainframe { } unicos { - 50 NBUF; - 50 NPBUF; + 512 NBUF; + 512 NPBUF; /* 98280 LDCHCORE;*/ 10 LDCHCORE; 500 NLDCH; @@ -98,10 +98,10 @@ filesystem { pdd root { minor 7; sector 0; - length 1048576 sectors; + length 262144 sectors; } } - disk "tmp" { + disk "usr" { type DD_U; iopath { cluster 0; @@ -109,8 +109,50 @@ filesystem { channel 025; } unit 0; + pdd usr { + minor 9; + sector 0; + length 1048576 sectors; + } + } + disk "src" { + type DD_U; + iopath { + cluster 0; + eiop 0; + channel 026; + } + unit 0; + pdd src { + minor 10; + sector 0; + length 262144 sectors; + } + } + disk "usr_tmp" { + type DD_U; + iopath { + cluster 0; + eiop 0; + channel 027; + } + unit 0; + pdd usr_tmp { + minor 11; + sector 0; + length 131072 sectors; + } + } + disk "tmp" { + type DD_U; + iopath { + cluster 0; + eiop 0; + channel 030; + } + unit 0; pdd tmp { - minor 8; + minor 12; sector 0; length 131072 sectors; } @@ -135,8 +177,20 @@ filesystem { minor 62; pdd root; } - ldd tmp { + ldd usr { minor 63; + pdd usr; + } + ldd src { + minor 64; + pdd src; + } + ldd usr_tmp { + minor 65; + pdd usr_tmp; + } + ldd tmp { + minor 66; pdd tmp; } rootdev is ldd ram;