diff --git a/TESTCPU b/TESTCPU index 8d3ffa04..080755d4 100755 --- a/TESTCPU +++ b/TESTCPU @@ -1,10 +1,9 @@ #!/bin/bash set -e -SOURCE=${SOURCE:=$HOME/go/src/github.com/u-root/u-root} +UROOT=${UROOT:=$HOME/go/src/github.com/u-root/u-root} KERNEL=${KERNEL:=$HOME/linuxboot/mainboards/intel/generic/kernel-noinitramfs} VMN=${VMN:=42} -KEY=${KEY:=~/.ssh/cpu_rsa.pub:key.pub} -UROOT=${UROOT:=~/go/src/github.com/u-root/u-root} +KEY=${KEY:=$HOME/.ssh/cpu_rsa.pub} echo NOTE: WE USED TO RUN CPUD AUTOMAGICALLY echo That turned out to be inconvenient for testing @@ -13,6 +12,11 @@ echo If you want to test cpud as the init, add this line echo to the u-root command, along with the other switches. echo -initcmd=/bbin/cpud \ +# error our early for simple things +ls ${KEY} +ls -d ${UROOT} +ls ${KERNEL} + # You will need to put your host key and private key somewhere. They will be placed in the proper place in the image. # # $* is positioned where it is so you can use extra switches like -h or add files via, e.g., -files whatever diff --git a/session/session_linux.go b/session/session_linux.go index 404f01df..f53a1c8c 100644 --- a/session/session_linux.go +++ b/session/session_linux.go @@ -111,7 +111,7 @@ func (s *Session) Namespace() error { // The debug= option is here so you can see how to temporarily set it if needed. // It generates copious output so use it sparingly. // A useful compromise value is 5. - opts := fmt.Sprintf("version=9p2000.L,trans=fd,rfdno=%d,wfdno=%d,uname=%v,debug=0,msize=%d", fd, fd, user, s.msize) + opts := fmt.Sprintf("version=9p2000.L,noxattr,trans=fd,rfdno=%d,wfdno=%d,uname=%v,debug=0,msize=%d", fd, fd, user, s.msize) if len(s.mopts) > 0 { opts += "," + s.mopts }