Merge pull request #333 from ancorgs/y2users_write

Yast::Users uses Y2Users for writing local configuration
yast · Oct 4, 2021 · 35af043 · 35af043
2 parents 4185d45 + 12b764d
commit 35af043
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 636 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -14,7 +14,8 @@ module_DATA = \
   modules/UsersPluginLDAPAll.pm \
   modules/UsersPluginLDAPPasswordPolicy.pm \
   modules/UsersPluginKerberos.pm \
-  modules/UsersPasswd.pm
+  modules/UsersPasswd.pm \
+  modules/Y2UsersLinux.rb
 
 module1dir = @moduledir@/YaPI
 module1_DATA = \
@@ -109,9 +110,7 @@ ylib_y2users_DATA = \
   lib/y2users/read_result.rb \
   lib/y2users/home.rb \
   lib/y2users/commit_config.rb \
-  lib/y2users/commit_config_collection.rb \
-  lib/y2users/users_module/reader.rb \
-  lib/y2users/users_module/commit_config_reader.rb
+  lib/y2users/commit_config_collection.rb
 
 ylib_y2users_clientsdir = @ylibdir@/y2users/clients
 ylib_y2users_clients_DATA = \
@@ -130,6 +129,11 @@ ylib_y2users_linux_DATA = \
   lib/y2users/linux/reader.rb \
   lib/y2users/linux/writer.rb
 
+ylib_y2users_users_moduledir = @ylibdir@/y2users/users_module
+ylib_y2users_users_module_DATA = \
+  lib/y2users/users_module/reader.rb \
+  lib/y2users/users_module/commit_config_reader.rb
+
 ylib_y2users_parsersdir = @ylibdir@/y2users/parsers
 ylib_y2users_parsers_DATA = \
   lib/y2users/parsers/group.rb \
@@ -170,6 +174,6 @@ scalable_DATA = \
   icons/hicolor/scalable/apps/yast-users.svg \
   icons/hicolor/scalable/apps/yast-users-system.svg
 
-EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(ylibdialog_DATA) $(ylib_DATA) $(ylib_users_DATA) $(ylib_y2users_DATA) $(ylib_y2users_clients_DATA) $(ylib_y2users_linux_DATA) $(ylib_y2users_parsers) $(ylib_y2users_autoinst_DATA) $(ylib_y2users_autoinst_profile_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA) $(ylibclient_DATA) $(scalable_DATA)
+EXTRA_DIST = $(module_DATA) $(module1_DATA) $(client_DATA) $(ynclude_DATA) $(ylibdialog_DATA) $(ylib_DATA) $(ylib_users_DATA) $(ylib_y2users_DATA) $(ylib_y2users_clients_DATA) $(ylib_y2users_linux_DATA) $(ylib_y2users_users_module_DATA) $(ylib_y2users_parsers) $(ylib_y2users_autoinst_DATA) $(ylib_y2users_autoinst_profile_DATA) $(scrconf_DATA) $(agent_SCRIPTS) $(schemafiles_DATA) $(desktop_DATA) $(ylibclient_DATA) $(scalable_DATA)
 
 include $(top_srcdir)/Makefile.am.common