pintos-script-support-for-usb.patch, with conflicts fixed