wip

rust/src/sysusers.rs

@@ -511,11 +511,12 @@ fn rewrite_sysuser_file(sysusers_dir: &openat::Dir,
                 },
             }
         }
-
+        f.write(b"\n")?;
     }
 
     f.flush()?;
     sysusers_dir.local_rename(&tmpf_path, fname)?;
+    eprintln!("processed {:?}", fname);
 
     Ok(())
 }
@@ -528,6 +529,7 @@ fn rewrite_sysusers_with_overrides(sysusers_dir: &openat::Dir,
     }
     let mut required_user_overrides = getkeys(user_overrides);
     let mut required_group_overrides = getkeys(group_overrides);
+    eprintln!("using {} {} overrides", required_user_overrides.len(), required_group_overrides.len());
 
     for child in sysusers_dir.list_dir(".")? {
         if let Some(ref name) = child?.file_name().to_str() {
@@ -615,7 +617,7 @@ pub fn postprocess(rootfs: &openat::Dir, tf: &Treefile) -> Fallible<()> {
     let empty_overrides = HashMap::new();
     let user_overrides = tf.parsed.sysusers_users.as_ref().unwrap_or(&empty_overrides);
     let group_overrides = tf.parsed.sysusers_groups.as_ref().unwrap_or(&empty_overrides);
-    if !user_overrides.is_empty() || group_overrides.is_empty() {
+    if !user_overrides.is_empty() || !group_overrides.is_empty() {
         rewrite_sysusers_with_overrides(&sysusers_dir, user_overrides, group_overrides)?;
     }