diff --git a/cpp/s2pdump/s2pdump_core.cpp b/cpp/s2pdump/s2pdump_core.cpp index 9fa1a0af..06ab5568 100644 --- a/cpp/s2pdump/s2pdump_core.cpp +++ b/cpp/s2pdump/s2pdump_core.cpp @@ -439,7 +439,7 @@ bool S2pDump::DisplayInquiry(bool check_type) << target_lun << "\n" << flush; } else { - cout << "Checking device corresponding to Linux SG 3 driver device file '" << device_file << "'\n" << flush; + cout << "Checking device corresponding to Linux SG driver device file '" << device_file << "'\n" << flush; } if (auto board_executor = dynamic_pointer_cast(s2pdump_executor); board_executor) { diff --git a/cpp/s2pformat/s2pformat_core.cpp b/cpp/s2pformat/s2pformat_core.cpp index 52c93d91..b5a3be89 100644 --- a/cpp/s2pformat/s2pformat_core.cpp +++ b/cpp/s2pformat/s2pformat_core.cpp @@ -116,7 +116,7 @@ int S2pFormat::Run(span args) return EXIT_SUCCESS; } - cout << "Are you sure? Formatting will erase all data and may take long (N/y)\n"; + cout << "Are you sure? Formatting will erase all data and may take long. (N/y)\n"; string input; getline(cin, input); @@ -210,7 +210,7 @@ int S2pFormat::SelectFormat(span descriptors) const auto &descriptor = descriptors[n - 1]; - cout << "Format the drive with " << descriptor.blocks << " sectors, " << descriptor.length + cout << "Format with " << descriptor.blocks << " sectors, " << descriptor.length << " bytes per sector? (N/y)\n"; getline(cin, input); diff --git a/cpp/shared/sg_util.cpp b/cpp/shared/sg_util.cpp index 30982871..a5f204a2 100644 --- a/cpp/shared/sg_util.cpp +++ b/cpp/shared/sg_util.cpp @@ -31,7 +31,7 @@ int sg_util::OpenDevice(const string &device) if (int v; ioctl(fd, SG_GET_VERSION_NUM, &v) < 0 || v < 30000) { close (fd); throw IoException( - fmt::format("'{0}' is not supported by the Linux SG 3 driver: {1}", device, strerror(errno))); + fmt::format("'{0}' is not supported by the Linux SG driver: {1}", device, strerror(errno))); } return fd; diff --git a/doc/s2pdump.1 b/doc/s2pdump.1 index 4e854509..8449c542 100644 --- a/doc/s2pdump.1 +++ b/doc/s2pdump.1 @@ -24,7 +24,7 @@ s2pdump \- SCSI/SASI hard drive/tape drive dump/restore tool .SH DESCRIPTION .B s2pdump has two modes of operation: dump and restore. These can be used with storage devices like hard drives, magneto optical drives or tape drives. Dump mode can also be used with read-only media such as CD/DVD drives. -When using devices managed by the Linux SG 3 driver, s2pdump can be used on any Linux system, not just on a Pi. +When using devices managed by the Linux SG driver, s2pdump can be used on any Linux system, not just on a Pi. When operating in dump mode, s2pdump will copy all data from a remote drive to an image on the local filesystem. Optionally it generates a .properties file for the web UI. This file can be used to more closely emulate the source drive. When used with a tape drive, the data are dumped in a SIMH-compatible format.