aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2014-10-16 13:53:01 +0200
committerAngelo Naselli <anaselli@linux.it>2014-10-16 13:53:01 +0200
commit0d421e9d20fbf0b48ab922b0472b8890d7b35d63 (patch)
treea2edab5b3ab8f6228f16688a63ddee6683d20ad1
parente59223e7737d9d85fdbb155ad30c2172f81e9774 (diff)
downloadmanatools-0d421e9d20fbf0b48ab922b0472b8890d7b35d63.tar
manatools-0d421e9d20fbf0b48ab922b0472b8890d7b35d63.tar.gz
manatools-0d421e9d20fbf0b48ab922b0472b8890d7b35d63.tar.bz2
manatools-0d421e9d20fbf0b48ab922b0472b8890d7b35d63.tar.xz
manatools-0d421e9d20fbf0b48ab922b0472b8890d7b35d63.zip
addded mandm needed files
-rw-r--r--MANIFEST3
-rw-r--r--README.md3
-rw-r--r--extras/desktop/manadm.desktop9
-rw-r--r--extras/polkit/org.mageia.manadm.policy51
-rwxr-xr-xscripts/mana17
-rw-r--r--share/images/manadm.pngbin0 -> 3128 bytes
6 files changed, 78 insertions, 5 deletions
diff --git a/MANIFEST b/MANIFEST
index 3b63c716..07593284 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -5,6 +5,7 @@ extras/conf/categories.conf.d/manaservice.conf
extras/conf/categories.conf.d/manauser.conf
extras/conf/settings.conf
extras/desktop/manaclock.desktop
+extras/desktop/manadm.desktop
extras/desktop/manahost.desktop
extras/desktop/manalog.desktop
extras/desktop/manaproxy.desktop
@@ -13,6 +14,7 @@ extras/desktop/manauser.desktop
extras/desktop/manauserlog.desktop
extras/desktop/mpan.desktop
extras/polkit/org.mageia.manaclock.policy
+extras/polkit/org.mageia.manadm.policy
extras/polkit/org.mageia.manahost.policy
extras/polkit/org.mageia.manalog.policy
extras/polkit/org.mageia.manaproxy.policy
@@ -91,6 +93,7 @@ share/images/Down_32x32.png
share/images/logo_mageia.png
share/images/mageia.png
share/images/manaclock.png
+share/images/manadm.png
share/images/manahost.png
share/images/manalog.png
share/images/manaproxy.png
diff --git a/README.md b/README.md
index acc6d184..27c85def 100644
--- a/README.md
+++ b/README.md
@@ -99,8 +99,9 @@ Creative Commons Attribution-No Derivative Works 3.0 Unported
http://creativecommons.org/licenses/by-nd/3.0/
NOTE 1:
-To avoid file name duplication we renamed icon from drakxtools,
+To avoid file name duplication we renamed icons from drakxtools,
rpmdrake and userdrake, to fit new naming convention:
+drakedm-mdk -> manadm
time-mdk -> manaclock
drakhosts -> manahost
logdrake-mdk -> manalog
diff --git a/extras/desktop/manadm.desktop b/extras/desktop/manadm.desktop
new file mode 100644
index 00000000..7e37fd01
--- /dev/null
+++ b/extras/desktop/manadm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=manadm
+Comment=AdminPanel login manager configuration
+Exec=mana dm
+Icon=/usr/share/icons/manadm.png
+Type=Application
+StartupNotify=true
+Categories=System;X-MandrivaLinux-CrossDesktop;
+
diff --git a/extras/polkit/org.mageia.manadm.policy b/extras/polkit/org.mageia.manadm.policy
new file mode 100644
index 00000000..af2831de
--- /dev/null
+++ b/extras/polkit/org.mageia.manadm.policy
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+ <vendor>Mageia</vendor>
+ <vendor_url>http://www.mageia.org/</vendor_url>
+
+ <action id="org.mageia.manadm.pkexec.run">
+ <description>Run Mageia Login Manager Configuration</description>
+ <description xml:lang="ca">Executa la configuració de gestió de l'inici de sessió</description>
+ <description xml:lang="el">Εκτέλεση της Διαμόρφωσης του Διαχειριστή Σύνδεσης Mageia</description>
+ <description xml:lang="es">Configurar al administrador de acceso</description>
+ <description xml:lang="et">Mageia sisselogimishalduri seadistamise käivitamine</description>
+ <description xml:lang="fr">Configurer le gestionnaire de connexion Mageia</description>
+ <description xml:lang="id">Jalankan Konfigurasi Pengelola Login Mageia</description>
+ <description xml:lang="nl">Start Mageia's Login-beheerderconfiguratie</description>
+ <description xml:lang="pl">Menadżer Logowania</description>
+ <description xml:lang="pt_BR">Execultar Configuração do Gerenciador de Login Mageia</description>
+ <description xml:lang="ro">Lansează configurarea gestionarului de autentificare pentru Mageia</description>
+ <description xml:lang="ru">Запуск настройки управления входом</description>
+ <description xml:lang="sl">Zagon nastavitev upravitelja prijav Mageje</description>
+ <description xml:lang="tr">Mageia Giriş Yöneticisi Yapılandırma Çalıştır</description>
+ <description xml:lang="uk">Запуск засобу керування входом до Mageia</description>
+ <description xml:lang="zh_TW">執行 Mageia 登入管理員設定</description>
+ <message>Authentication is required to run Mageia Login Manager Configuration</message>
+ <message xml:lang="el">Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης του Διαχειριστή Σύνδεσης Mageia</message>
+ <message xml:lang="es">Se requiere autenticación para configurar al administrador de acceso</message>
+ <message xml:lang="et">Mageia sisselogimishalduri seadistamine nõuab autentimist</message>
+ <message xml:lang="fr">Une authentification est nécessaire pour configurer le gestionnaire de connexion Mageia</message>
+ <message xml:lang="id">Otentikasi diperlukan untuk menjalankan Konfigurasi Pengelola Login Mageia</message>
+ <message xml:lang="nl">Authenticatie is nodig om Mageia's Login-beheerderconfiguratie te starten</message>
+ <message xml:lang="pl">Menadżer Logowania - wymagane uwierzytelnianie</message>
+ <message xml:lang="pt_BR">A autenticação é necessária para executar a Configuração do Gerenciador de Login Mageia</message>
+ <message xml:lang="ro">Autentificare necesară pentru lansarea aplicației Mageia de configurat gestionarul de autentificare</message>
+ <message xml:lang="ru">Необходима аутентификация для запуска настройки управления входом</message>
+ <message xml:lang="sl">Za zagon nastavitev upravitelja prijav Mageje je potrebno overjanje</message>
+ <message xml:lang="tr">Mageia Giriş Yöneticisi Yapılandırması çalıştırmak için kimlik doğrulaması gerekli</message>
+ <message xml:lang="uk">Щоб запустити засіб керування входом до Mageia, слід пройти розпізнавання</message>
+ <message xml:lang="zh_TW">執行 Mageia 登入管理員設定需要認證</message>
+ <icon_name>drakconf</icon_name>
+ <defaults>
+ <allow_any>no</allow_any>
+ <allow_inactive>no</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/manadm</annotate>
+ <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+</policyconfig>
diff --git a/scripts/mana b/scripts/mana
index 2910025b..265cab97 100755
--- a/scripts/mana
+++ b/scripts/mana
@@ -38,6 +38,10 @@ my %modules = (
exec => '/usr/bin/manaservice',
descr => "manaservice: service manager",
},
+ dm => {
+ exec => '/usr/bin/manadm',
+ descr => "manadm: login manager configuration",
+ },
clock => {
exec => '/usr/bin/manaclock',
descr => "manaclock: date/time manager",
@@ -68,10 +72,15 @@ die "Command ". $cmd . " not found!\n" if !defined($modules{$cmd});
my $mod = $modules{$cmd}->{exec};
shift(@ARGV);
-if(is_root_capability_required()) {
- system("/usr/bin/pkexec", $mod, @ARGV);
-} else {
- system($mod, @ARGV);
+eval {
+ if(is_root_capability_required()) {
+ system("/usr/bin/pkexec", $mod, @ARGV);
+ } else {
+ system($mod, @ARGV);
+ }
+};
+if ( $@ ) {
+ print "ERROR: " . $@ ."\n";
}
#=============================================================
diff --git a/share/images/manadm.png b/share/images/manadm.png
new file mode 100644
index 00000000..d296dc4e
--- /dev/null
+++ b/share/images/manadm.png
Binary files differ