File cinnamon-wheel-and-sbin-path.patch of Package cinnamon

Overview Repositories Revisions Requests Users Attributes Meta

File cinnamon-wheel-and-sbin-path.patch of Package cinnamon (Revision 3a103b9d5151ce836101d16999d3ab5c)

Currently displaying revision 3a103b9d5151ce836101d16999d3ab5c , Show latest

--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
@@ -36,12 +36,12 @@ def getGraphicsInfos():
     count = 0
     envpath = os.environ["PATH"]
     os.environ["PATH"] = envpath + ":/usr/local/sbin:/usr/sbin:/sbin"
-    for card in getProcessOut(("lspci")):
+    for card in getProcessOut(("/sbin/lspci")):
         if not "VGA" in card:
             continue
         cardId = card.split()[0]
         cardName = None
-        for line in getProcessOut(("lspci", "-v", "-s", cardId)):
+        for line in getProcessOut(("/sbin/lspci", "-v", "-s", cardId)):
             if line.startswith(cardId):
                 cardName = (line.split(":")[2].split("(rev")[0].strip())
 
--- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -153,12 +153,11 @@ class EditableEntry (Gtk.Notebook):
 
 class PasswordDialog(Gtk.Dialog):
 
-    def __init__ (self, user, password_mask, group_mask, parent = None):
+    def __init__ (self, user, password_mask, parent = None):
         super(PasswordDialog, self).__init__(None, parent)
 
         self.user = user
         self.password_mask = password_mask
-        self.group_mask = group_mask
 
         self.set_modal(True)
         self.set_skip_taskbar_hint(True)
@@ -224,14 +223,7 @@ class PasswordDialog(Gtk.Dialog):
     def change_password(self):
         newpass = self.new_password.get_text()
         self.user.set_password(newpass, "")
-        mask = self.group_mask.get_text()
-        if "nopasswdlogin" in mask:
-            subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
-            mask = mask.split(", ")
-            mask.remove("nopasswdlogin")
-            mask = ", ".join(mask)
-            self.group_mask.set_text(mask)
-            self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+        self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
         self.destroy()
 
     def set_passwords_visibility(self):
@@ -570,7 +562,7 @@ class Module:
         model, treeiter = self.users_treeview.get_selection().get_selected()
         if treeiter != None:
             user = model[treeiter][INDEX_USER_OBJECT]
-            dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window)
+            dialog = PasswordDialog(user, self.password_mask, self.window)
             response = dialog.run()
 
     def _on_groups_button_clicked(self, widget):
@@ -581,7 +573,7 @@ class Module:
             response = dialog.run()
             if response == Gtk.ResponseType.OK:
                 groups = dialog.get_selected_groups()
-                subprocess.call(["usermod", user.get_user_name(), "-G", ",".join(groups)])
+                subprocess.call(["/usr/sbin/usermod", user.get_user_name(), "-G", ",".join(groups)])
                 groups.sort()
                 self.groups_label.set_text(", ".join(groups))
             dialog.destroy()
@@ -839,11 +831,11 @@ class Module:
             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
             description = "<b>%s</b>\n%s" % (fullname, username)
             piter = self.users.append(None, [new_user, pixbuf, description])
-            # Add the user to his/her own group and sudo if Administrator was selected
+            # Add the user to his/her own group and wheel if Administrator was selected
             if dialog.account_type_combo.get_active() == 1:
-                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
+                subprocess.call(["/usr/sbin/usermod", username, "-G", "%s,wheel" % username])
             else:
-                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
+                subprocess.call(["/usr/sbin/usermod", username, "-G", "%s" % username])
             self.load_groups()
         dialog.destroy()
 
@@ -888,7 +880,7 @@ class Module:
             d.set_default_response(Gtk.ResponseType.NO)
             r = d.run()
             if r == Gtk.ResponseType.YES:
-                subprocess.call(["groupdel", group])
+                subprocess.call(["/usr/sbin/groupdel", group])
                 self.load_groups()
             d.destroy()
 
@@ -896,7 +888,7 @@ class Module:
         dialog = GroupDialog(_("Group Name"), "", self.window)
         response = dialog.run()
         if response == Gtk.ResponseType.OK:
-            subprocess.call(["groupadd", dialog.entry.get_text().lower()])
+            subprocess.call(["/usr/sbin/groupadd", dialog.entry.get_text().lower()])
             self.load_groups()
         dialog.destroy()
 
@@ -907,7 +899,7 @@ class Module:
             dialog = GroupDialog(_("Group Name"), group, self.window)
             response = dialog.run()
             if response == Gtk.ResponseType.OK:
-                subprocess.call(["groupmod", group, "-n", dialog.entry.get_text().lower()])
+                subprocess.call(["/usr/sbin/groupmod", group, "-n", dialog.entry.get_text().lower()])
                 self.load_groups()
             dialog.destroy()

Places

File cinnamon-wheel-and-sbin-path.patch of Package cinnamon (Revision 3a103b9d5151ce836101d16999d3ab5c)

Places