Merge commit '8d6a4d70'

318e7bb8 · Jeremy Soller · 7e9f15e5 · 8d6a4d70 · 318e7bb8 · 6c1d98ce
Commit 318e7bb8 authored May 10, 2017 by Jeremy Soller
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

.gitmodules .gitmodules +3 -0

redoxfs redoxfs +1 -0

src/install.rs src/install.rs +3 -1

No files found.
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "redoxfs"]
+	path = redoxfs
+	url = https://github.com/redox-os/redoxfs.git
--- a/redoxfs @ 6c1d98ce
+++ b/redoxfs @ 6c1d98ce
+Subproject commit 6c1d98cea83e2bb02b940959e6b07625ec12656f
--- a/src/install.rs
+++ b/src/install.rs
@@ -190,7 +190,9 @@ pub fn install(config: Config, cookbook: Option<&str>) -> Result<(), String> {

        passwd.push_str(&format!("{};{};{};{};{};{};{}\n", username, password, uid, gid, name, home, shell));
    }
-    file!("etc/passwd", passwd.as_bytes());
+    if ! passwd.is_empty() {
+        file!("etc/passwd", passwd.as_bytes());
+    }

    Ok(())
 }