!139 fix add group failed issue

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2023-03-01 08:43:14 +00:00 committed by Gitee
commit 125785daa5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,27 @@
From a7e979d343f35dda8aaf0fc864d4e7b2189ed1ab Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Wed, 1 Mar 2023 15:03:01 +0800
Subject: [PATCH] fix add group failed issue
---
group-manager-server/group_manager_server.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/group-manager-server/group_manager_server.cpp b/group-manager-server/group_manager_server.cpp
index 974ef68..f8051b6 100644
--- a/group-manager-server/group_manager_server.cpp
+++ b/group-manager-server/group_manager_server.cpp
@@ -100,8 +100,8 @@ bool group_manager_server::add(QString groupName, QString groupId)
QString groupadd = "/usr/sbin/groupadd";
QString addgroup = "/usr/sbin/addgroup";
QString command;
- QFile groupaddFile("/usr/sbin/addgroup");
- QFile addgroupFile("/usr/sbin/groupadd");
+ QFile groupaddFile("/usr/sbin/groupadd");
+ QFile addgroupFile("/usr/sbin/addgroup");
QProcess p(0);
QStringList args;
--
2.33.0

View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: ukui-control-center
Version: 3.1.2
Release: 9
Release: 10
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
@ -13,6 +13,7 @@ Patch05: 0005-Fix-the-problem-of-displaying-none-in-the-interface-version
Patch07: 0007-modify-icon-theme-not-display.patch
Patch08: ukui-control-center-3.0.4-fix-invalid-automatic-login.patch
Patch10: 0010-Fix-the-problem-of-scrambled-shortcut-keys.patch
Patch11: 0011-fix-add-group-failed-issue.patch
BuildRequires: qt5-qtsvg-devel
BuildRequires: gsettings-qt-devel
@ -95,6 +96,8 @@ mkdir -p %{buildroot}/etc/xdg/autostart/
set -e
glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
systemctl enable ukui-group-manager.service
systemctl start ukui-group-manager.service
chown root:root /usr/bin/checkUserPwd
chmod u+s /usr/bin/checkUserPwd
@ -106,6 +109,8 @@ gsettings set org.ukui.power-manager sleep-computer-ac 0 &> /dev/null ||:
%postun
sed -i "/auth sufficient pam_succeed_if.so user ingroup nopasswdlogin/d" /etc/pam.d/lightdm
systemctl disable ukui-group-manager.service
systemctl stop ukui-group-manager.service
%clean
rm -rf $RPM_BUILD_ROOT
@ -134,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Mar 01 2023 tanyulong <tanyulong@kylinos.cn> - 3.1.2-10
- fix add group failed issue
* Tue Feb 7 2023 douyan <douyan@kylinos.cn> - 3.1.2-9
- change power default setting