Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2019-03-06 19:03:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users" Wed Mar 6 19:03:33 2019 rev:219 rq:682153 version:4.1.10 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2019-02-28 21:48:38.961390684 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-users.new.28833/yast2-users.changes 2019-03-06 19:03:39.493071256 +0100 @@ -1,0 +2,7 @@ +Thu Feb 28 14:30:45 CET 2019 - [email protected] + +- Removed "btrfs_subvolume" from user default values (bsc#1125779) +- Added AutoYaST support for home Btrfs subvolumes. +- 4.1.10 + +------------------------------------------------------------------- Old: ---- yast2-users-4.1.9.tar.bz2 New: ---- yast2-users-4.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.qUXYWX/_old 2019-03-06 19:03:39.993071136 +0100 +++ /var/tmp/diff_new_pack.qUXYWX/_new 2019-03-06 19:03:39.997071135 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 4.1.9 +Version: 4.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-4.1.9.tar.bz2 -> yast2-users-4.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/package/yast2-users.changes new/yast2-users-4.1.10/package/yast2-users.changes --- old/yast2-users-4.1.9/package/yast2-users.changes 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/package/yast2-users.changes 2019-03-06 14:09:47.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 28 14:30:45 CET 2019 - [email protected] + +- Removed "btrfs_subvolume" from user default values (bsc#1125779) +- Added AutoYaST support for home Btrfs subvolumes. +- 4.1.10 + +------------------------------------------------------------------- Wed Feb 27 14:32:46 UTC 2019 - [email protected] - Delete remaining dead code for encrypted homes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/package/yast2-users.spec new/yast2-users-4.1.10/package/yast2-users.spec --- old/yast2-users-4.1.9/package/yast2-users.spec 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/package/yast2-users.spec 2019-03-06 14:09:47.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 4.1.9 +Version: 4.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/src/include/users/dialogs.rb new/yast2-users-4.1.10/src/include/users/dialogs.rb --- old/yast2-users-4.1.9/src/include/users/dialogs.rb 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/src/include/users/dialogs.rb 2019-03-06 14:09:47.000000000 +0100 @@ -19,7 +19,7 @@ # current contact information at www.novell.com. # ------------------------------------------------------------------------------ -# File: include/users/wizards.ycp +# File: include/users/dialogs.rb # Package: Configuration of users and groups # Summary: Wizards definitions # Authors: Johannes Buchhold <[email protected]>, @@ -58,6 +58,7 @@ Yast.import "UsersRoutines" Yast.import "UsersSimple" Yast.import "Wizard" + Yast.import "Mode" Yast.include include_target, "users/helps.rb" Yast.include include_target, "users/routines.rb" @@ -390,6 +391,11 @@ create_home = Ops.get_boolean(user, "create_home", true) chown_home = Ops.get_boolean(user, "chown_home", true) no_skel = Ops.get_boolean(user, "no_skeleton", false) + if user["btrfs_subvolume"] && user["btrfs_subvolume"].is_a?(::String) + # Users.GetCurrentUser Perl module can also return "1" for a boolean + user["btrfs_subvolume"] = user["btrfs_subvolume"] == "1" + end + btrfs_subvolume = Ops.get_boolean(user, "btrfs_subvolume", false) do_not_edit = user_type == "nis" @@ -1507,7 +1513,7 @@ check_btrfs_path = !UI.QueryWidget(Id(:move_home), :Value) # Check if is a valid path when creating a Btfs subvolume - if btrfs_subvolume && check_btrfs_path && !valid_btrfs_path?(new_home) + if perform_btrfs_validations? && !valid_btrfs_path?(new_home) Report.Error( # TRANSLATORS: the error message when user try to create a Btrfs subvolume in a not # valid location @@ -1751,12 +1757,16 @@ UI.ReplaceWidget(:tabContents, get_details_term.call) Wizard.SetHelpText(EditUserDetailsDialogHelp(user_type, what)) - UI.ChangeWidget(Id(:btrfs_subvolume), :Enabled, btrfs_available?) - + UI.ChangeWidget(Id(:btrfs_subvolume), :Enabled, Mode.config || btrfs_available?) if what == "edit_user" - UI.ChangeWidget(Id(:btrfs_subvolume), :Enabled, false) - # Show the value for the current home directory/subvolume - UI.ChangeWidget(Id(:btrfs_subvolume), :Value, btrfs_subvolume?(org_home)) + if user["org_user"] && !Mode.config + # User has already been created in the installed system. So btrfs_subvolume cannot be changed + UI.ChangeWidget(Id(:btrfs_subvolume), :Enabled, false) + # Show the value for the current home directory/subvolume + UI.ChangeWidget(Id(:btrfs_subvolume), :Value, btrfs_subvolume?(org_home)) + else + UI.ChangeWidget(Id(:btrfs_subvolume), :Value, user["btrfs_subvolume"]) + end end if do_not_edit @@ -1917,6 +1927,18 @@ fstype == "btrfs" end + # Determine if is necessary to check the home path as a valid Btrfs location + # + # @return [false] if running in AutoYaST configuration mode + # @return [false] if the home directory is being moved + # @return [Boolean] true when the btrfs_subvolume option is present and selected; false otherwise + def perform_btrfs_validations? + return false if Mode.config + return false if UI.QueryWidget(Id(:move_home), :Value) + + UI.QueryWidget(Id(:btrfs_subvolume), :Value) + end + # Whether there is a Btrfs filesystem present # # @return [Boolean] true if a Btrfs filesystem is found; false otherwise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/src/include/users/helps.rb new/yast2-users-4.1.10/src/include/users/helps.rb --- old/yast2-users-4.1.9/src/include/users/helps.rb 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/src/include/users/helps.rb 2019-03-06 14:09:47.000000000 +0100 @@ -434,7 +434,7 @@ "check <b>Empty Home</b>. Otherwise, the new home directory\n" \ "is created from the default skeleton (%1).</p>\n" ), - Users.GetLoginDefaults.fetch("skel", "") + (Users.GetLoginDefaults ? Users.GetLoginDefaults.fetch("skel", "") : "/home") ) btrfs_option_label = _("Create as Btrfs Subvolume") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/src/modules/Users.pm new/yast2-users-4.1.10/src/modules/Users.pm --- old/yast2-users-4.1.9/src/modules/Users.pm 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/src/modules/Users.pm 2019-03-06 14:09:47.000000000 +0100 @@ -117,7 +117,6 @@ "expire" => "", "shell" => "", "skel" => "", - "btrfs_subvolume" => 0, "groups" => "", "umask" => "022" ); @@ -4455,31 +4454,30 @@ } foreach my $username (keys %{$modified_users{$type}}) { - my %user = %{$modified_users{$type}{$username}}; - my $home = $user{"homeDirectory"} || ""; - my $use_btrfs_subvolume = $user{"btrfs_subvolume"} || 0; - my $uid = $user{"uidNumber"} || 0; - my $command = ""; - my $user_mod = $user{"modified"} || "no"; - my $gid = $user{"gidNumber"}; - my $create_home = $user{"create_home"}; - my $chown_home = $user{"chown_home"}; - $chown_home = 1 if (!defined $chown_home); - my $skel = $useradd_defaults{"skel"}; + my %user = %{$modified_users{$type}{$username}}; + my $home = $user{"homeDirectory"} || ""; + my $use_btrfs_subvolume = $user{"btrfs_subvolume"} || 0; + my $uid = $user{"uidNumber"} || 0; + my $command = ""; + my $user_mod = $user{"modified"} || "no"; + my $gid = $user{"gidNumber"}; + my $create_home = $user{"create_home"}; + my $chown_home = $user{"chown_home"}; + $chown_home = 1 if (!defined $chown_home); + my $skel = $useradd_defaults{"skel"}; if ($user_mod eq "imported" || $user_mod eq "added") { - y2usernote ("User '$username' created"); - if ($user_mod eq "imported" && FileUtils->Exists ($home)) { + if ($user_mod eq "imported" && FileUtils->GetSize ($home) > 0) { + # Directory already exists AND is not empty y2milestone ("home directory $home of user $username already exists"); next; } if (bool ($user{"no_skeleton"})) { $skel = ""; } - if ((bool ($create_home) || $user_mod eq "imported") - && !%{SCR->Read (".target.stat", $home)}) + if (bool ($create_home) || $user_mod eq "imported") { UsersRoutines->CreateHome ($skel, $home, $use_btrfs_subvolume); } @@ -5822,6 +5820,12 @@ $pass = $self->CryptPassword ($pass, $type); $encrypted = YaST::YCP::Boolean (1); } + + # "home_btrfs_subvolume" it the tag in the AY configuration + # file and is more user friendly. Internally we are using + # "btrfs_subvolume". + my $btrfs_subvolume = $user->{"home_btrfs_subvolume"}; + my $home = $self->GetDefaultHome($type).$username; if ($uid == 0) { @@ -5871,13 +5875,14 @@ $gid = $existing{"gidNumber"}; } %ret = ( - "userPassword" => $finalpw, - "grouplist" => \%grouplist, - "uid" => $username, - "encrypted" => $encrypted, - "cn" => $cn, - "uidNumber" => $existing{"uidNumber"}, - "loginShell" => $user->{"shell"} || $user->{"loginShell"} || $existing{"loginShell"} || $self->GetDefaultShell ($type), + "userPassword" => $finalpw, + "grouplist" => \%grouplist, + "uid" => $username, + "encrypted" => $encrypted, + "btrfs_subvolume" => $btrfs_subvolume, + "cn" => $cn, + "uidNumber" => $existing{"uidNumber"}, + "loginShell" => $user->{"shell"} || $user->{"loginShell"} || $existing{"loginShell"} || $self->GetDefaultShell ($type), "gidNumber" => $gid, "homeDirectory" => $user->{"homeDirectory"} || $user->{"home"} || $existing{"homeDirectory"} || $home, @@ -5892,18 +5897,19 @@ if (!%ret) { %ret = ( - "uid" => $username, - "encrypted" => $encrypted, - "userPassword" => $pass, - "cn" => $cn, - "uidNumber" => $uid, - "gidNumber" => $gid, - "loginShell" => $user->{"shell"} || $user->{"loginShell"} || $self->GetDefaultShell ($type), - - "grouplist" => \%grouplist, - "homeDirectory" => $user->{"homeDirectory"} || $user->{"home"} || $home, - "type" => $type, - "modified" => "imported" + "uid" => $username, + "encrypted" => $encrypted, + "btrfs_subvolume" => $btrfs_subvolume, + "userPassword" => $pass, + "cn" => $cn, + "uidNumber" => $uid, + "gidNumber" => $gid, + "loginShell" => $user->{"shell"} || $user->{"loginShell"} || $self->GetDefaultShell ($type), + + "grouplist" => \%grouplist, + "homeDirectory" => $user->{"homeDirectory"} || $user->{"home"} || $home, + "type" => $type, + "modified" => "imported" ); } my %translated = ( @@ -6411,6 +6417,7 @@ # remove the keys, whose values were not changed my %exported_user = %{$user}; + # export all when username was changed! if (%org_user && $user->{"uid"} eq $org_user{"uid"} && ($user->{"modified"} || "") ne "imported") { @@ -6453,6 +6460,13 @@ if ($user->{"homeDirectory"} && $user->{"authorized_keys"}) { $ret{"authorized_keys"} = $user->{"authorized_keys"}; } + my $btrfs_subvolume = bool ($exported_user{"btrfs_subvolume"}); + if (defined $btrfs_subvolume) { + # "home_btrfs_subvolume" it the tag in the AY configuration + # file and is more user friendly. Internally we are using + # "btrfs_subvolume". + $ret{"home_btrfs_subvolume"} = YaST::YCP::Boolean ($btrfs_subvolume); + } return \%ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/src/modules/UsersRoutines.pm new/yast2-users-4.1.10/src/modules/UsersRoutines.pm --- old/yast2-users-4.1.9/src/modules/UsersRoutines.pm 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/src/modules/UsersRoutines.pm 2019-03-06 14:09:47.000000000 +0100 @@ -29,6 +29,9 @@ use File::Basename; use YaST::YCP qw(:LOGGING); +use YaPI; + +textdomain("users"); our %TYPEINFO; @@ -82,32 +85,51 @@ SCR->Execute( ".target.mkdir", $home_path ); } - my %stat = %{ SCR->Read( ".target.stat", $home ) }; - if (%stat) { + if (FileUtils->GetSize ($home) > 0) { + # Home directory exists AND has files if ( $home ne "/var/lib/nobody" ) { y2error("$home directory already exists: no mkdir"); } return 0; } - # Create the home as btrfs subvolume - if ($use_btrfs) { - my $cmd = "btrfs subvolume create $home"; - my %cmd_out = %{ SCR->Execute( ".target.bash_output", $cmd ) }; - my $stderr = $cmd_out{"stderr"} || ""; - if ($stderr) - { - y2error("Error creating '$home' as btrfs subvolume: $stderr"); + if (!FileUtils->Exists ($home) > 0) { + # Create the home as btrfs subvolume + if ($use_btrfs) { + # checking Btrfs location of parent path + $home=~m/^.+\//; + my $path=$&; + my $cmd = "/usr/bin/stat -f --format '%T' $path"; + my %cmd_out = %{ SCR->Execute( ".target.bash_output", $cmd ) }; + my $stdout = $cmd_out{"stdout"} || ""; + chomp $stdout; + + if ($stdout ne "btrfs") { + # TRANSLATORS: %s is a directory name + my $error = sprintf( + __(" Cannot create home directory %s. Parent directory is not a Btrfs volume."), + $home); + Report->Error ($error); + return 0 + } + + $cmd = "$btrfs subvolume create $home"; + %cmd_out = %{ SCR->Execute( ".target.bash_output", $cmd ) }; + my $stderr = $cmd_out{"stderr"} || ""; + if ($stderr) + { + y2error("Error creating '$home' as btrfs subvolume: $stderr"); - return 0; + return 0; + } } - } - # or as a plain directory - else { - if ( !SCR->Execute( ".target.mkdir", $home ) ) { - y2error("Error creating '$home'"); + # or as a plain directory + else { + if ( !SCR->Execute( ".target.mkdir", $home ) ) { + y2error("Error creating '$home'"); - return 0; + return 0; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/AddGroup.out new/yast2-users-4.1.10/testsuite/tests/AddGroup.out --- old/yast2-users-4.1.9/testsuite/tests/AddGroup.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/AddGroup.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,5 +1,4 @@ Dump ========================================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/AddUser.out new/yast2-users-4.1.10/testsuite/tests/AddUser.out --- old/yast2-users-4.1.9/testsuite/tests/AddUser.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/AddUser.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,5 +1,4 @@ Dump ========================================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/BuildAdditional.out new/yast2-users-4.1.10/testsuite/tests/BuildAdditional.out --- old/yast2-users-4.1.9/testsuite/tests/BuildAdditional.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/BuildAdditional.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,5 +1,4 @@ Dump ========================================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/DeleteUser.out new/yast2-users-4.1.10/testsuite/tests/DeleteUser.out --- old/yast2-users-4.1.9/testsuite/tests/DeleteUser.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/DeleteUser.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,4 +1,3 @@ -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/EditUser.out new/yast2-users-4.1.10/testsuite/tests/EditUser.out --- old/yast2-users-4.1.9/testsuite/tests/EditUser.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/EditUser.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,5 +1,4 @@ Dump ========================================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/EditUsersGroups.out new/yast2-users-4.1.10/testsuite/tests/EditUsersGroups.out --- old/yast2-users-4.1.9/testsuite/tests/EditUsersGroups.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/EditUsersGroups.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,4 +1,3 @@ -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/Import.out new/yast2-users-4.1.10/testsuite/tests/Import.out --- old/yast2-users-4.1.9/testsuite/tests/Import.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/Import.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump local user names: Dump [] -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -16,4 +15,4 @@ Dump ["ggg", "hh", "ii"] Return nil Dump ---- user 'ggg': -Dump $["authorized_keys":[], "chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/ggg", "loginShell":"", "modified":"added", "org_homeDirectory":"/home/ggg", "org_uid":"ggg", "org_uidNumber":"1000", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"ggg", "uidNumber":"1000", "userPassword":"crypted_password", "what":"add_user"] +Dump $["authorized_keys":[], "btrfs_subvolume":false, "chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/ggg", "loginShell":"", "modified":"added", "org_homeDirectory":"/home/ggg", "org_uid":"ggg", "org_uidNumber":"1000", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"ggg", "uidNumber":"1000", "userPassword":"crypted_password", "what":"add_user"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/ImportExportUser.out new/yast2-users-4.1.10/testsuite/tests/ImportExportUser.out --- old/yast2-users-4.1.9/testsuite/tests/ImportExportUser.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/ImportExportUser.out 2019-03-06 14:09:47.000000000 +0100 @@ -2,6 +2,6 @@ Dump importing: Dump $["encrypted":true, "forename":"aa", "gid":500, "grouplist":"audio", "home":"/home/aaa", "password_settings":$["inact":-1, "max":99999, "min":0, "warn":7], "shell":"/bin/bash", "surname":"A", "uid":500, "user_password":"5OkhN2nLxMfEY", "username":"aaa"] Dump ==== processing ImportUser... ============================ -Return $["authorized_keys":[], "cn":"aa A", "encrypted":true, "gidNumber":"500", "grouplist":$["audio":"1"], "homeDirectory":"/home/aaa", "loginShell":"/bin/bash", "modified":"imported", "shadowInactive":"-1", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"aaa", "uidNumber":"500", "userPassword":"5OkhN2nLxMfEY"] +Return $["authorized_keys":[], "btrfs_subvolume":nil, "cn":"aa A", "encrypted":true, "gidNumber":"500", "grouplist":$["audio":"1"], "homeDirectory":"/home/aaa", "loginShell":"/bin/bash", "modified":"imported", "shadowInactive":"-1", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"aaa", "uidNumber":"500", "userPassword":"5OkhN2nLxMfEY"] Dump ==== processing ExportUser... ============================ -Return $["authorized_keys":[], "encrypted":true, "fullname":"aa A", "gid":"500", "home":"/home/aaa", "password_settings":$["inact":"-1", "max":"99999", "min":"0", "warn":"7"], "shell":"/bin/bash", "uid":"500", "user_password":"5OkhN2nLxMfEY", "username":"aaa"] +Return $["authorized_keys":[], "encrypted":true, "fullname":"aa A", "gid":"500", "home":"/home/aaa", "home_btrfs_subvolume":false, "password_settings":$["inact":"-1", "max":"99999", "min":"0", "warn":"7"], "shell":"/bin/bash", "uid":"500", "user_password":"5OkhN2nLxMfEY", "username":"aaa"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/Read.out new/yast2-users-4.1.10/testsuite/tests/Read.out --- old/yast2-users-4.1.9/testsuite/tests/Read.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/Read.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,5 +1,4 @@ Dump ========================================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 0 Read .etc.default.useradd."groups" 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/SelectUser.out new/yast2-users-4.1.10/testsuite/tests/SelectUser.out --- old/yast2-users-4.1.9/testsuite/tests/SelectUser.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/SelectUser.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,5 +1,4 @@ Dump ========================================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupAdd.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupAdd.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupAdd.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupAdd.out 2019-03-06 14:09:47.000000000 +0100 @@ -2,7 +2,6 @@ Return nil Return nil Dump ============ add new group 'gg': ========================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -24,7 +23,6 @@ Return Dump ============ add new group 'gg' - done ==================== Dump ============ add new group 'gg2' with first userlist as list == -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -46,7 +44,6 @@ Return Dump ============ add new group 'gg2' - done ==================== Dump ============ add new group 'gg3' with first userlist as map == -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -68,7 +65,6 @@ Return Dump ============ add new group 'gg3' - done ==================== Dump ============ add new group 'gg4' with non existent user == -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" @@ -85,7 +81,6 @@ Return User hh2 does not exist. Dump ============ add new group 'gg4' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" nil Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupDelete.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupDelete.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupDelete.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupDelete.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ delete non-existent group: ================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupGet.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupGet.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupGet.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupGet.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ get group 'us': ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupMemberAdd.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupMemberAdd.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupMemberAdd.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupMemberAdd.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ================ (add user) ======================= -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupMemberDelete.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupMemberDelete.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupMemberDelete.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupMemberDelete.out 2019-03-06 14:09:47.000000000 +0100 @@ -3,7 +3,6 @@ Return No user was specified. Dump ================ done ============================ Dump ================ (bad user) ====================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupModify.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupModify.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupModify.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupModify.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ edit non-existing group 'gg': ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupsGet.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupsGet.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupsGet.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupsGet.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ get local groups ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIGroupsGetByUser.out new/yast2-users-4.1.10/testsuite/tests/YaPIGroupsGetByUser.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIGroupsGetByUser.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIGroupsGetByUser.out 2019-03-06 14:09:47.000000000 +0100 @@ -3,7 +3,6 @@ Return $[] Dump ============ get done ============================ Dump ============ get groups (wrong user) =================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserAdd.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserAdd.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserAdd.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserAdd.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ add new user 'jj': ========================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserDelete.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserDelete.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserDelete.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserDelete.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ delete non-existent user: ================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserDisable.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserDisable.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserDisable.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserDisable.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,7 +1,6 @@ Dump ========================================================== Return nil Dump ============ disable LDAP user 'jj': ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserEnable.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserEnable.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserEnable.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserEnable.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ enable local user 'hh': ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserFeatureAdd.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserFeatureAdd.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserFeatureAdd.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserFeatureAdd.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ edit user 'hh': ================================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserGet.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserGet.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserGet.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserGet.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ get local user 'hh': ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUserModify.out new/yast2-users-4.1.10/testsuite/tests/YaPIUserModify.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUserModify.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUserModify.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ edit non-existing user 'jj': ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.1.9/testsuite/tests/YaPIUsersGet.out new/yast2-users-4.1.10/testsuite/tests/YaPIUsersGet.out --- old/yast2-users-4.1.9/testsuite/tests/YaPIUsersGet.out 2019-02-28 09:56:24.000000000 +0100 +++ new/yast2-users-4.1.10/testsuite/tests/YaPIUsersGet.out 2019-03-06 14:09:47.000000000 +0100 @@ -1,6 +1,5 @@ Dump ========================================================== Dump ============ get local users ===================== -Read .etc.default.useradd."btrfs_subvolume" 0 Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 Read .etc.default.useradd."groups" "audio,video"
