Merge pull request #321 from glennswest/master

Add partition preservation

Cargo.toml

@@ -36,16 +36,15 @@ required-features = ["rdcore"]
 [profile.release]
 lto = true
 
-[target.'cfg(target_arch = "s390x")'.dependencies]
-gptman = { version = "^0.6", default-features = false }
-
 [dependencies]
 bincode = "^1.3"
 byte-unit = ">= 3.1.0, < 5.0.0"
 clap = "^2.33"
 cpio = "^0.2"
 error-chain = { version = "^0.12", default-features = false }
 flate2 = "^1.0"
+glob = "^0.3"
+gptman = { version = "^0.6", default-features = false }
 hex = "^0.4"
 libc = "^0.2"
 nix = ">= 0.17, < 0.19"
@@ -57,6 +56,7 @@ serde = { version = "^1.0", features = ["derive"] }
 serde_json = "^1.0"
 tempfile = "^3.1"
 url = "^2.1"
+uuid = { version = "^0.8", features = ["v4"] }
 walkdir = "^2.3"
 xz2 = "^0.1"
 

README.md

@@ -107,6 +107,13 @@ line.
   CoreOS image is being installed on.  Optional; defaults to `metal`.
   Normally this should be specified only if installing inside a virtual
   machine.
+* `coreos.inst.save_partlabel` - Comma-separated labels of partitions to
+  preserve during the install.  Glob-style wildcards are permitted.  The
+  specified partitions need not exist.  Optional.
+* `coreos.inst.save_partindex` - Comma-separated indexes of partitions to
+  preserve during the install.  Ranges (`m-n`) are permitted, and either `m`
+  or `n` can be omitted.  The specified partitions need not exist.
+  Optional.
 * `coreos.inst.insecure` - Permit the OS image to be unsigned.  Optional.
 * `coreos.inst.skip_reboot` - Don't reboot after installing.  Optional.
 

scripts/coreos-installer-service

@@ -89,6 +89,8 @@ fi
 copy_arg coreos.inst.image_url       --image-url
 copy_arg coreos.inst.platform_id     --platform
 copy_arg coreos.inst.stream          --stream
+copy_arg coreos.inst.save_partlabel  --save-partlabel
+copy_arg coreos.inst.save_partindex  --save-partindex
 
 # Insecure boolean
 if karg_bool coreos.inst.insecure; then