From 92ac22ae137656c316cc68dfe8e79470fbff1dd5 Mon Sep 17 00:00:00 2001
From: utam0k <k0ma@utam0k.jp>
Date: Thu, 5 Aug 2021 23:06:14 +0900
Subject: [PATCH] add handling when `mount_label` is not present.

---
 src/rootfs.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/rootfs.rs b/src/rootfs.rs
index 3c7774ad..06cee0bf 100644
--- a/src/rootfs.rs
+++ b/src/rootfs.rs
@@ -47,10 +47,7 @@ pub fn prepare_rootfs(spec: &Spec, rootfs: &Path, bind_devices: bool) -> Result<
 
     for m in spec.mounts.as_ref().context("no mounts in spec")?.iter() {
         let (flags, data) = parse_mount(m);
-        let ml = linux
-            .mount_label
-            .as_ref()
-            .context("no mount_label in spec")?;
+        let ml = linux.mount_label.as_ref();
         if m.typ.as_ref().context("no type in mount spec")? == "cgroup" {
             // skip
             log::warn!("A feature of cgroup is unimplemented.");
@@ -235,14 +232,18 @@ fn mount_to_container(
     rootfs: &Path,
     flags: MsFlags,
     data: &str,
-    label: &str,
+    label: Option<&String>,
 ) -> Result<()> {
     let typ = m.typ.as_ref().context("no type in mount spec")?;
-    let d = if !label.is_empty() && typ != "proc" && typ != "sysfs" {
-        if data.is_empty() {
-            format!("context=\"{}\"", label)
+    let d = if let Some(l) = label {
+        if typ != "proc" && typ != "sysfs" {
+            if data.is_empty() {
+                format!("context=\"{}\"", l)
+            } else {
+                format!("{},context=\"{}\"", data, l)
+            }
         } else {
-            format!("{},context=\"{}\"", data, label)
+            data.to_string()
         }
     } else {
         data.to_string()