From 9719023feb13d46e46e2fca9e5025ceb29ead641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Wed, 19 May 2021 08:31:33 +0000 Subject: [PATCH] Ensure that all changes of previous commit are constrained to rr runs --- run | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/run b/run index a15ba8da..e4ef04aa 100755 --- a/run +++ b/run @@ -818,8 +818,15 @@ Extra options to append at the end of the emulator command line. driveif = 'none' rrid = ',id=img-direct' rrid2 = ',id=img-direct2' - root = 'root=/dev/sda' + if self.env['is_arm']: + root = 'root=/dev/vda' + else: + root = 'root=/dev/sda' snapshot = ',snapshot' + if self.env['is_arm']: + hd_dev = 'virtio-blk-device' + else: + hd_dev = 'ide-hd' else: driveif = 'virtio' root = 'root=/dev/vda' @@ -847,10 +854,6 @@ Extra options to append at the end of the emulator command line. ), LF, ]) - hd_dev = 'ide-hd' - if self.env['is_arm']: - hd_dev = 'virtio-blk-device' - root = 'root=/dev/vda' if rr: extra_emulator_args.extend([ '-drive', 'driver=blkreplay,if=none,image=img-direct,id=img-blkreplay', LF,