change genInitMem.sh to check for sufficient directory privileges rather than invoke sudo

This commit is contained in:
bbracker 2022-03-05 18:04:00 -08:00
parent 891ec82d81
commit 4eb46785fc

View File

@ -20,24 +20,18 @@ Would you like to proceed? (y/n) " -n 1 -r
echo echo
if [[ $REPLY =~ ^[Yy]$ ]] if [[ $REPLY =~ ^[Yy]$ ]]
then then
# Create Output Directory if [ ! -d "$tvDir" ]; then
echo "Elevating permissions to create memory files" echo "Error: linux testvector directory $tvDir not found!">&2
sudo mkdir -p $tvDir echo "Please create it.">&2
sudo chown cad $tvDir exit 1
sudo touch $rawRamFile fi
sudo touch $ramFile test -w $RISCV/linux-testvectors
sudo touch $rawBootmemFile if [ ! $? -eq 0 ]; then
sudo touch $bootmemFile echo "Error: insuffcient write privileges for linux testvector directory $tvDir !">&2
sudo touch $rawUntrimmedBootmemFile echo "Please chmod it.">&2
sudo touch $untrimmedBootmemFile exit 1
sudo chmod a+rw $rawRamFile fi
sudo chmod a+rw $ramFile
sudo chmod a+rw $rawBootmemFile
sudo chmod a+rw $bootmemFile
sudo chmod a+rw $rawUntrimmedBootmemFile
sudo chmod a+rw $untrimmedBootmemFile
# QEMU Simulation
echo "Launching QEMU in replay mode!" echo "Launching QEMU in replay mode!"
(qemu-system-riscv64 \ (qemu-system-riscv64 \
-M virt -dtb $RISCV/buildroot/output/images/wally-virt.dtb \ -M virt -dtb $RISCV/buildroot/output/images/wally-virt.dtb \
@ -67,18 +61,6 @@ then
./fixBinMem "$rawBootmemFile" "$bootmemFile" ./fixBinMem "$rawBootmemFile" "$bootmemFile"
./fixBinMem "$rawUntrimmedBootmemFile" "$untrimmedBootmemFile" ./fixBinMem "$rawUntrimmedBootmemFile" "$untrimmedBootmemFile"
# Cleanup echo "genInitMem.sh completed!"
echo "Elevating permissions to restrict write access to memory files" echo "You may consider restricting write access to $tvDir now."
sudo chown cad $rawRamFile
sudo chown cad $ramFile
sudo chown cad $rawBootmemFile
sudo chown cad $bootmemFile
sudo chown cad $rawUntrimmedBootmemFile
sudo chown cad $untrimmedBootmemFile
sudo chmod o-w $rawRamFile
sudo chmod o-w $ramFile
sudo chmod o-w $rawBootmemFile
sudo chmod o-w $bootmemFile
sudo chmod o-w $rawUntrimmedBootmemFile
sudo chmod o-w $untrimmedBootmemFile
fi fi