Browse Source

fixed changelog, added missing > in COPYRIGHT and removed automount-popup

master
Angelescu Ovidiu 8 years ago
parent
commit
7ff51cd279
3 changed files with 9 additions and 115 deletions
  1. 8
    2
      debian/changelog
  2. 1
    1
      debian/copyright
  3. 0
    112
      scripts/automount-popup

+ 8
- 2
debian/changelog View File

@@ -1,11 +1,17 @@
-- Sebastian Görgen <zeppo@siduction.net> Sat, 08 Sept 2012 00:48:45 +0200
cli-installer (0.3.3) UNRELEASED; urgency=low

* Added closing bracket ">" in COPYRIGHT for zeppo's e-mail
* Fixed changelog
* Removed automount-popup since it's used only in kde and xfce

-- Ovidiu Angelescu <convbsd@siduction.net> Sat, 08 Sept 2012 08:09:45 +0300

cli-installer (0.3.2) unstable; urgency=low

* Merge cliinstaller and fll-installer-common
* Move on to siduction

-- Stefan Lippers-Hollmann <s.l-h@gmx.de> Thu, 20 Jan 2011 03:23:45 +0100
-- Sebastian Görgen <zeppo@siduction.net> Sat, 08 Sept 2012 00:48:45 +0200

cliinstaller (0.3.1) unstable; urgency=low


+ 1
- 1
debian/copyright View File

@@ -3,7 +3,7 @@ Upstream-Name: cliinstaller
Source: <http://svn.berlios.de/svnroot/repos/fullstory/cliinstaller/trunk/>

Files: *
Copyright: 2012 Sebastian Görgen <zeppo@siduction.net
Copyright: 2012 Sebastian Görgen <zeppo@siduction.net>
2010-2012 Stefan Lippers-Hollmann <s.l-h@gmx.de>
2009-2010 Nikolas Poniros <edhunter@sidux.com>


+ 0
- 112
scripts/automount-popup View File

@@ -1,112 +0,0 @@
#!/bin/bash
#
# (C) 2008-2010 Joaquim Boura <x-un-i@berlios.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this package; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
#
# On Debian GNU/Linux systems, the text of the GPL license can be
# found in /usr/share/common-licenses/GPL.
#
#--------------------------------------------------------------------------


source /etc/default/distro


user_home=$(getent passwd ${FLL_LIVE_USER} | cut -d : -f6)
# kde
user_kde_config_dir="/home/${FLL_LIVE_USER}/.kde/share/config"
user_kde_medianotifierrc="${user_kde_config_dir}/medianotifierrc"
# xfce
user_xfce_volmanrc="${user_home}/.config/Thunar/volmanrc"
# gnome ??

#--------------------------------------------------------
# disable all swaps
function disable_all_swaps()
{
local TempFile=`mktemp -p /tmp/ .XXXXXXXXXX`

swapon -s | awk '/^\/dev/{print $1}' > $TempFile
if [ -s "$TempFile" ]; then
while read part ; do
swapoff $part
done < $TempFile
fi
test -e ${TempFile} && rm -f ${TempFile}
}

#--------------------------------------------------------
# disable automount in xfce or medianotifier popup in KDE
function disable()
{
if [ ! -d "${user_kde_config_dir}" ]; then
if [ -e "${user_xfce_volmanrc}" ]; then
sed -i -e 's/AutomountDrives=TRUE/AutomountDrives=FALSE/' \
-e 's/AutomountMedia=TRUE/AutomountMedia=FALSE/' \
-e 's/Autobrowse=TRUE/Autobrowse=FALSE/' \
"${user_xfce_volmanrc}"
fi
else
cat <<EOF > "${user_kde_medianotifierrc}"
[Auto Actions]
media/cdwriter_unmounted=#NothinAction
media/hdd_unmounted=#NothinAction
media/removable_unmounted=#NothinAction
EOF
fi

disable_all_swaps
}

#---------------------------------------------------------
# reenable automount in xfce or medianotifier popup in KDE
function reenable()
{
udevadm trigger --subsystem-match=block
udevadm settle --timeout=30
if [ ! -d "${user_kde_config_dir}" ]; then
if [ -e "${user_xfce_volmanrc}" ]; then
sed -i -e 's/AutomountDrives=FALSE/AutomountDrives=TRUE/' \
-e 's/AutomountMedia=FALSE/AutomountMedia=TRUE/' \
-e 's/Autobrowse=FALSE/Autobrowse=TRUE/' \
"${user_xfce_volmanrc}"
fi
else
rm -f "${user_kde_medianotifierrc}"
fi
/etc/init.d/fll-fstab start
# also reactivate swap devices
swapon -a
}


# called with one parameter enable or disable

if [ $# -ne 1 ] ; then
echo "usage: $0 enable|disable"
else
if [ "$1" = "enable" ]; then
reenable
elif [ "$1" = "disable" ]; then
disable
else
echo "usage: $0 enable|disable"
exit 1
fi
fi

exit 0

Loading…
Cancel
Save