From: Filip Schauer <f.schauer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup] fix #5946: disks: wipe: ensure GPT header backup is wiped
Date: Wed, 4 Dec 2024 11:33:31 +0100 [thread overview]
Message-ID: <20241204103331.69226-1-f.schauer@proxmox.com> (raw)
When wiping a block device with a GUID partition table, the header
backup might get left behind at the end of the disk. This commit also
wipes the last 4096 bytes of the disk, making sure that a GPT header
backup is erased, even from disks with 4k sector sizes.
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
src/tools/disks/mod.rs | 47 +++++++++++++++++++++++++-----------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/tools/disks/mod.rs b/src/tools/disks/mod.rs
index 61aceccd..26e14603 100644
--- a/src/tools/disks/mod.rs
+++ b/src/tools/disks/mod.rs
@@ -1176,29 +1176,38 @@ pub fn wipe_blockdev(disk: &Disk) -> Result<(), Error> {
let wipefs_output = proxmox_sys::command::run_command(wipefs_command, None)?;
info!("wipefs output: {wipefs_output}");
- let size = disk.size().map(|size| size / 1024 / 1024)?;
- let count = size.min(200);
-
- let mut dd_command = std::process::Command::new("dd");
- let mut of_path = OsString::from("of=");
- of_path.push(disk_path);
- let mut count_str = OsString::from("count=");
- count_str.push(count.to_string());
- let args = [
- "if=/dev/zero".into(),
- of_path,
- "bs=1M".into(),
- "conv=fdatasync".into(),
- count_str,
- ];
- dd_command.args(args);
-
- let dd_output = proxmox_sys::command::run_command(dd_command, None)?;
- info!("dd output: {dd_output}");
+ let dd_zero = |seek: Option<&str>, bs: &str, count: &str| -> Result<(), Error> {
+ let mut dd_command = std::process::Command::new("dd");
+ let mut of_path = OsString::from("of=");
+ of_path.push(disk_path);
+ dd_command
+ .arg("if=/dev/zero")
+ .arg(of_path)
+ .arg(format!("bs={bs}"))
+ .arg("conv=fdatasync")
+ .arg(format!("count={count}"));
+
+ if let Some(seek) = seek {
+ dd_command.arg(format!("seek={seek}"));
+ }
+
+ let dd_output = proxmox_sys::command::run_command(dd_command, None)?;
+ info!("dd output: {dd_output}");
+
+ Ok(())
+ };
+
+ let size = disk.size()?;
+ let count = (size / 1024 / 1024).min(200).to_string();
+ dd_zero(None, "1M", &count)?;
if is_partition {
// set the partition type to 0x83 'Linux filesystem'
change_parttype(disk, "8300")?;
+ } else {
+ // Wipe the end of the disk to remove a potential GPT header backup
+ let seek = (size / 512 - 8).to_string();
+ dd_zero(Some(&seek), "512", "8")?;
}
Ok(())
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
reply other threads:[~2024-12-04 10:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241204103331.69226-1-f.schauer@proxmox.com \
--to=f.schauer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox