mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysprep: user-account: remove the correct home

Browse Source 
Query using augeas for the home directory of an user, instead of
hardcoding /home/<username>.
This commit is contained in:
Pino Toscano
2014-09-03 11:13:54 +02:00
parent ee5470d083
commit e52742e6d3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sysprep/sysprep_operation_user_account.ml
View File

@@ -84,6 +84,14 @@ let user_account_perform ~verbose ~quiet g root side_effects =
String.sub userpath (i+1) (String.length userpath -i-1) in
if uid >= uid_min && uid <= uid_max
&& check_remove_user username then (
(* Get the home before removing the passwd entry. *)
let home_dir =
try Some (g#aug_get (userpath ^ "/home"))
with _ ->
if verbose then
warning ~prog (f_"Cannot get the home directory for %s")
username;
None in
g#aug_rm userpath;
(* XXX Augeas doesn't yet have a lens for /etc/shadow, so the
* next line currently does nothing, but should start to
@@ -91,7 +99,9 @@ let user_account_perform ~verbose ~quiet g root side_effects =
*)
g#aug_rm (sprintf "/files/etc/shadow/%s" username);
g#aug_rm (sprintf "/files/etc/group/%s" username);
g#rm_rf ("/home/" ^ username)
match home_dir with
| None -> ()
| Some dir -> g#rm_rf dir
)
) users;
g#aug_save ();