Zmiana polityki wobec narzędzia immudex-padlock.

diff --git a/tools/sbin/immudex-padlock b/tools/bin/immudex-padlock
similarity index 83%
rename from tools/sbin/immudex-padlock
rename to tools/bin/immudex-padlock
index 3e718bd28571968310b0f346eeb50b31a6eaebbb..9047771f6e96554fd2f34aae956d988c30ee4a67 100755 (executable)
--- a/tools/sbin/immudex-padlock
+++ b/tools/bin/immudex-padlock
@@ -3,8 +3,8 @@
 launcher="/home/${USER}/.config/xfce4/panel/launcher-14/16844255236.desktop";
 
 function main_unlock() {
-  /usr/local/sbin/immudex-crypt open $1;
-  index=$(basename $(/usr/local/bin/immudex-crypt list | grep "$1" | head -1 | awk '{printf $2}' | grep -o '[0-9]'));
+  sudo /usr/local/sbin/immudex-crypt open $1;
+  index=$(basename $(sudo /usr/local/sbin/immudex-crypt list | grep "$1" | head -1 | awk '{printf $2}' | grep -o '[0-9]'));
   #sudo mkdir -p /media/${USER}/$devName;
   #sudo mount /dev/mapper/$devName /media/${USER}/$devName;
   
@@ -39,20 +39,20 @@ function lock() {
 
   if [ "$mapperDeviceList" ]; then
          for dmDevice in $mapperDeviceList; do
-                 if cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
+                 if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then
                          mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}');
                          if [ "$mountPoint" ]; then
                                  if $(sudo lsof $mountPoint > /dev/null 2>&1); then
                                          notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are opened file or running proceses." --icon=dialog-error;
                                  else
-                                         umount $mountPoint;
+                                         sudo umount $mountPoint;
             if [ $? -ne 0 ]; then
               notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are other filesystem is mounted in." --icon=dialog-error;
             fi
-                                         cryptsetup close /dev/mapper/${dmDevice};
+                                         sudo cryptsetup close /dev/mapper/${dmDevice};
                                  fi
                          else
-          cryptsetup close /dev/mapper/${dmDevice};
+          sudo cryptsetup close /dev/mapper/${dmDevice};
                          fi
                  fi
          done

diff --git a/versions/base.sh b/versions/base.sh
index dc5f19359e4e31408789970d0bcb3f3bb5440993..92ee9cc1756933731e2f6ab8a8929d1bdc3efdc9 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -74,6 +74,7 @@ cp -vv ~/immudex/tools/bin/immudex-import-sshkeys /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-meteo /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-morketsmerke /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-motd2 /usr/local/bin;
+cp -vv ~/immudex/tools/sbin/immudex-padlock /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-secured-firefox /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-shoutcasts /usr/local/bin;
@@ -88,7 +89,6 @@ cp -vv ~/immudex/tools/sbin/immudex-create-media /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-crypt /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-hostname /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-install /usr/local/sbin;
-cp -vv ~/immudex/tools/sbin/immudex-padlock /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-upgrade /usr/local/sbin;
 chown root:root /usr/local/sbin/*;
 chmod 544 /usr/local/sbin/*;