]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Fri, 17 May 2013 14:13:42 +0000 (16:13 +0200)
committerFrank Brehm <frank@brehm-online.com>
Fri, 17 May 2013 14:13:42 +0000 (16:13 +0200)
conf.d/dmcrypt [new file with mode: 0644]
csh.env
dbus-1/system.d/org.freedesktop.UDisks2.conf [new file with mode: 0644]
dbus-1/system.d/org.gnome.CPUFreqSelector.conf [new file with mode: 0644]
env.d/05portage [deleted file]
env.d/99polkit-kde [new file with mode: 0644]
gconf/schemas/cpufreq-applet.schemas [new file with mode: 0644]
init.d/dmcrypt [new file with mode: 0755]
portage/package.keywords
profile.env
qt4/.keep_dev-qt_qtcore-4 [new file with mode: 0644]

diff --git a/conf.d/dmcrypt b/conf.d/dmcrypt
new file mode 100644 (file)
index 0000000..35a1fd2
--- /dev/null
@@ -0,0 +1,98 @@
+# /etc/conf.d/dmcrypt
+
+# For people who run dmcrypt on top of some other layer (like raid),
+# use rc_need to specify that requirement.  See the runscript(8) man
+# page for more information.
+
+#--------------------
+# Instructions
+#--------------------
+
+# Note regarding the syntax of this file.  This file is *almost* bash,
+# but each line is evaluated separately.  Separate swaps/targets can be
+# specified.  The init-script which reads this file assumes that a
+# swap= or target= line starts a new section, similar to lilo or grub
+# configuration.
+
+# Note when using gpg keys and /usr on a separate partition, you will
+# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
+# and ensure that gpg has been compiled statically.
+# See http://bugs.gentoo.org/90482 for more information.
+
+# Note that the init-script which reads this file detects whether your
+# partition is LUKS or not. No mkfs is run unless you specify a makefs
+# option.
+
+# Global options:
+#----------------
+
+# Max number of checks to perform (1 per second)
+#dmcrypt_max_timeout=120
+
+# Arguments:
+#-----------
+# target=<name>                      == Mapping name for partition.
+# swap=<name>                        == Mapping name for swap partition.
+# source='<dev>'                     == Real device for partition.
+# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
+# remdev='<dev>'                     == Device that will be assigned to removable media.
+# gpg_options='<opts>'               == Default are --quiet --decrypt
+# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
+# loop_file='<file>'                 == Loopback file.
+# pre_mount='cmds'                   == commands to execute before mounting partition.
+# post_mount='cmds'                  == commands to execute after mounting partition.
+#-----------
+# Supported Modes
+# gpg                                  == decrypt and pipe key into cryptsetup.
+#                                              Note: new-line character must not be part of key.
+#                                              Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
+
+#--------------------
+# dm-crypt examples
+#--------------------
+
+## swap
+# Swap partitions. These should come first so that no keys make their
+# way into unencrypted swap.
+# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
+# If no makefs is given then mkswap will be assumed
+#swap=crypt-swap
+#source='/dev/hda2'
+
+## /home with passphrase
+#target=crypt-home
+#source='/dev/hda5'
+
+## /home with regular keyfile
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+
+## /home with gpg protected key
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+
+## /home with regular keyfile on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+#remdev='/dev/sda1'
+
+##/home with gpg protected key on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+#remdev='/dev/sda1'
+
+##/tmp with regular keyfile
+#target=crypt-tmp
+#source='/dev/hda6'
+#key='/full/path/to/tmpkey'
+#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
+#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
+
+## Loopback file example
+#mount='crypt-loop-home'
+#source='/dev/loop0'
+#loop_file='/mnt/crypt/home'
diff --git a/csh.env b/csh.env
index 768250f016b71f0741edfb89b38ab7f3ef000c89..f9c40513692e01c73629fe9210937ce1b5deaddf 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -36,7 +36,6 @@ setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversi
 setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/opt/bin/skype'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.2/html/library'
 setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.2/html/library'
-setenv PYTHONPATH '/usr/lib/portage/pym'
 setenv QT_GRAPHICSSYSTEM 'raster'
 setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
 setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin'
diff --git a/dbus-1/system.d/org.freedesktop.UDisks2.conf b/dbus-1/system.d/org.freedesktop.UDisks2.conf
new file mode 100644 (file)
index 0000000..7e176d3
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="org.freedesktop.UDisks2"/>
+  </policy>
+
+  <!-- Anyone can send messages to the owner of org.freedesktop.UDisks2 -->
+  <policy context="default">
+    <allow send_destination="org.freedesktop.UDisks2"/>
+  </policy>
+</busconfig>
diff --git a/dbus-1/system.d/org.gnome.CPUFreqSelector.conf b/dbus-1/system.d/org.gnome.CPUFreqSelector.conf
new file mode 100644 (file)
index 0000000..331b6bc
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE busconfig PUBLIC
+         "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="org.gnome.CPUFreqSelector"/>
+    <allow send_interface="org.gnome.CPUFreqSelector"/>
+  </policy>
+
+  <policy context="default">
+    <allow send_interface="org.gnome.CPUFreqSelector"/>
+  </policy>
+
+</busconfig>
+         
diff --git a/env.d/05portage b/env.d/05portage
deleted file mode 100644 (file)
index e55d2d8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH="/usr/lib/portage/pym"
diff --git a/env.d/99polkit-kde b/env.d/99polkit-kde
new file mode 100644 (file)
index 0000000..d6646ad
--- /dev/null
@@ -0,0 +1 @@
+CONFIG_PROTECT="/usr/share/polkit-1/actions"
diff --git a/gconf/schemas/cpufreq-applet.schemas b/gconf/schemas/cpufreq-applet.schemas
new file mode 100644 (file)
index 0000000..cfd152b
--- /dev/null
@@ -0,0 +1,102 @@
+<gconfschemafile>
+<schemalist>
+
+<schema>
+       <key>/schemas/apps/cpufreq-applet/prefs/cpu</key>
+       <owner>cpufreq-applet</owner>
+       <type>int</type>
+       <default>0</default>
+       <locale name="C">
+               <short>CPU to Monitor</short>
+               <long>Set the CPU to monitor. In a single processor system you don't have to change it.</long>
+       </locale>
+
+       <locale name="de">
+               <short>Zu überwachender Prozessor</short>
+               <long>Den zu überwachenden Prozessor festlegen. In einem Ein-Prozessorsystem kann dieser Wert nicht geändert werden.</long>
+       </locale>
+
+       <locale name="en_GB">
+               <short>CPU to Monitor</short>
+               <long>Set the CPU to monitor. In a single processor system you don&apos;t have to change it.</long>
+       </locale>
+
+       <locale name="ru">
+               <short>Отслеживаемый процессор</short>
+               <long>Устанавливает отслеживаемый процессор. На однопроцессорной системе изменять не надо.</long>
+       </locale>
+
+       <locale name="vi">
+               <short>CPU cần theo dõi</short>
+               <long>Lập CPU cần theo dõi. Trong hệ thống chỉ có một bộ xử lý thì không cần thay đổi điều này.</long>
+       </locale>
+</schema>
+<schema>
+       <key>/schemas/apps/cpufreq-applet/prefs/show_mode</key>
+       <owner>cpufreq-applet</owner>
+       <type>int</type>
+       <default>2</default>
+       <locale name="C">
+               <short>Mode to show cpu usage</short>
+               <long>A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode.</long>
+       </locale>
+
+       <locale name="de">
+               <short>Modus zur Anzeige der Prozessorlast</short>
+               <long>Der Wert 0 bedeutet, dass das Applet im Grafikmodus (nur Bilder), der Wert 1 dass das Applet im Textmodus (ohne Grafiken) und der Wert 2 dass das Applet im Grafik- und Textmodus angezeigt wird.</long>
+       </locale>
+
+       <locale name="en_GB">
+               <short>Mode to show cpu usage</short>
+               <long>A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode.</long>
+       </locale>
+
+       <locale name="ru">
+               <short>Режим показа использования ЦП</short>
+               <long>0 - показывать апплет в графическом режиме (только изображение), 1 - текстовый режим (не показывать изображение), 2 - показывать и текст, и изображение.</long>
+       </locale>
+
+       <locale name="vi">
+               <short>Chế độ cần hiển thị cách dùng CPU</short>
+               <long>Giá trị:
+ • 0 — hiển thi tiểu dụng trong chế độ đồ họa (chỉ ảnh bằng điểm)
+ • 1 — hiển thị tiểu dung trong chế độ chữ (không hiển thị ảnh bằng điểm)
+ • 2 — hiển thị tiểu dụng trong cả hai chế độ đồ họa và chữ đều.</long>
+       </locale>
+</schema>
+<schema>
+       <key>/schemas/apps/cpufreq-applet/prefs/show_text_mode</key>
+       <owner>cpufreq-applet</owner>
+       <type>int</type>
+       <default>1</default>
+       <locale name="C">
+               <short>The type of text to display (if the text is enabled).</short>
+               <long>A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency.</long>
+       </locale>
+
+       <locale name="de">
+               <short>Die Art des anzuzeigenden Textes (falls der Text aktiviert ist).</short>
+               <long>Der Wert 0 bedeutet, dass der Prozessortakt angezeigt wird, der Wert 1 dass der Takt und die Einheiten angezeigt und der Wert 2 dass ein Prozentwert anstatt des Taktes angezeigt wird.</long>
+       </locale>
+
+       <locale name="en_GB">
+               <short>The type of text to display (if the text is enabled).</short>
+               <long>A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency.</long>
+       </locale>
+
+       <locale name="ru">
+               <short>Тип отображаемого текста (если текст разрешён).</short>
+               <long>0 - показывать частоту ЦП, 1 - частоту и единицы, 2 - проценты вместо частоты.</long>
+       </locale>
+
+       <locale name="vi">
+               <short>Kiểu chữ cần hiển thị (nếu chữ được bật).</short>
+               <long>Giá trị:
+ • 0 — hiển thị tần số CPU
+ • 1 — hiển thị tần số và đơn vi đều
+ • 2 — hiển thị phần trăm thay thế tần số.</long>
+       </locale>
+</schema>
+
+</schemalist>
+</gconfschemafile>
diff --git a/init.d/dmcrypt b/init.d/dmcrypt
new file mode 100755 (executable)
index 0000000..130036b
--- /dev/null
@@ -0,0 +1,346 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $
+
+depend() {
+       before checkfs fsck
+}
+
+# We support multiple dmcrypt instances based on $SVCNAME
+execute_hook="dm_crypt_execute_dmcrypt"
+# XXX: Should we drop this ?
+# execute_hook="dm_crypt_execute_localmount"
+conf_file="/etc/conf.d/${SVCNAME}"
+
+# Get splash helpers if available.
+if [ -e /sbin/splash-functions.sh ] ; then
+       . /sbin/splash-functions.sh
+fi
+
+# Setup mappings for an individual target/swap
+# Note: This relies on variables localized in the main body below.
+dm_crypt_execute_dmcrypt() {
+       local dev ret mode foo
+
+       if [ -n "${target}" ] ; then
+               # let user set options, otherwise leave empty
+               : ${options:=' '}
+       elif [ -n "${swap}" ] ; then
+               if cryptsetup isLuks ${source} 2>/dev/null ; then
+                       ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
+                       return
+               fi
+               target=${swap}
+               # swap contents do not need to be preserved between boots, luks not required.
+               # suspend2 users should have initramfs's init handling their swap partition either way.
+               : ${options:='-c aes -h sha1 -d /dev/urandom'}
+               : ${pre_mount:='mkswap ${dev}'}
+       else
+               return
+       fi
+       if [ -z "${source}" ] && [ ! -e "${source}" ] ; then
+               ewarn "source \"${source}\" for ${target} missing, skipping..."
+               return
+       fi
+
+       if [ -n "${loop_file}" ] ; then
+               dev="/dev/mapper/${target}"
+               ebegin "  Setting up loop device ${source}"
+               losetup ${source} ${loop_file}
+       fi
+
+       # cryptsetup:
+       # luksOpen <device> <name>      # <device> is $source
+       # create   <name>   <device>    # <name>   is $target
+       local arg1="create" arg2="${target}" arg3="${source}" luks=0
+
+       cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; }
+
+       # Older versions reported:
+       #       ${target} is active:
+       # Newer versions report:
+       #       ${target} is active[ and is in use.]
+       if cryptsetup status ${target} | egrep -q ' is active' ; then
+               einfo "dm-crypt mapping ${target} is already configured"
+               return
+       fi
+       splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
+
+       # Handle keys
+       if [ -n "${key}" ] ; then
+               read_abort() {
+                       # some colors
+                       local ans savetty resettty
+                       [ -z "${NORMAL}" ] && eval $(eval_ecolors)
+                       einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
+                       shift
+                       # This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
+                       # we end up having to implement our own crap with stty/etc...
+                       savetty=$(stty -g)
+                       resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
+                       trap 'eval "${resettty}"' EXIT HUP INT TERM
+                       stty -icanon
+                       [ "${1}" = -t ] && stty min 0 time "$(( $2 * 10 ))"
+                       ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
+                       eval "${resettty}"
+                       if [ -z "${ans}" ] ; then
+                               printf '\r'
+                       else
+                               echo
+                       fi
+                       case ${ans} in
+                               [yY]) return 0;;
+                               *) return 1;;
+                       esac
+               }
+
+               # Notes: sed not used to avoid case where /usr partition is encrypted.
+               mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
+               key=${key/:*/}
+               case "${mode}" in
+               gpg|reg)
+                       # handle key on removable device
+                       if [ -n "${remdev}" ] ; then
+                               # temp directory to mount removable device
+                               local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
+                               if [ ! -d "${mntrem}" ] ; then
+                                       if ! mkdir -p "${mntrem}" ; then
+                                               ewarn "${source} will not be decrypted ..."
+                                               einfo "Reason: Unable to create temporary mount point '${mntrem}'"
+                                               return
+                                       fi
+                               fi
+                               i=0
+                               einfo "Please insert removable device for ${target}"
+                               while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
+                                       foo=""
+                                       if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
+                                               # keyfile exists?
+                                               if [ ! -e "${mntrem}${key}" ] ; then
+                                                       umount -n "${mntrem}"
+                                                       rmdir "${mntrem}"
+                                                       einfo "Cannot find ${key} on removable media."
+                                                       read_abort "Abort" ${read_timeout:--t 1} && return
+                                               else
+                                                       key="${mntrem}${key}"
+                                                       break
+                                               fi
+                                       else
+                                               [ -e "${remdev}" ] \
+                                                       && foo="mount failed" \
+                                                       || foo="mount source not found"
+                                       fi
+                                       : $((i += 1))
+                                       read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
+                               done
+                       else    # keyfile ! on removable device
+                               if [ ! -e "${key}" ] ; then
+                                       ewarn "${source} will not be decrypted ..."
+                                       einfo "Reason: keyfile ${key} does not exist."
+                                       return
+                               fi
+                       fi
+                       ;;
+               *)
+                       ewarn "${source} will not be decrypted ..."
+                       einfo "Reason: mode ${mode} is invalid."
+                       return
+                       ;;
+               esac
+       else
+               mode=none
+       fi
+       ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
+       if [ "${mode}" = "gpg" ] ; then
+               : ${gpg_options:='-q -d'}
+               # gpg available ?
+               if type -p gpg >/dev/null ; then
+                       for i in 0 1 2 ; do
+                               # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
+                               # save stdin stdout stderr "values"
+                               gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
+                               ret=$?
+                               [ ${ret} -eq 0 ] && break
+                       done
+                       eend ${ret} "failure running cryptsetup"
+               else
+                       ewarn "${source} will not be decrypted ..."
+                       einfo "Reason: cannot find gpg application."
+                       einfo "You have to install app-crypt/gnupg first."
+                       einfo "If you have /usr on its own partition, try copying gpg to /bin ."
+               fi
+       else
+               if [ "${mode}" = "reg" ] ; then
+                       cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
+                       ret=$?
+                       eend ${ret} "failure running cryptsetup"
+               else
+                       cryptsetup ${options} ${arg1} ${arg2} ${arg3}
+                       ret=$?
+                       eend ${ret} "failure running cryptsetup"
+               fi
+       fi
+       if [ -d "${mntrem}" ] ; then
+               umount -n ${mntrem} 2>/dev/null >/dev/null
+               rmdir ${mntrem} 2>/dev/null >/dev/null
+       fi
+       splash svc_input_end ${SVCNAME} >/dev/null 2>&1
+
+       if [ ${ret} -ne 0 ] ; then
+               cryptfs_status=1
+       else
+               if [ -n "${pre_mount}" ] ; then
+                       dev="/dev/mapper/${target}"
+                       ebegin "    pre_mount: ${pre_mount}"
+                       eval "${pre_mount}" > /dev/null
+                       ewend $? || cryptfs_status=1
+               fi
+       fi
+}
+
+# Run any post_mount commands for an individual mount
+#
+# Note: This relies on variables localized in the main body below.
+dm_crypt_execute_localmount() {
+       local mount_point
+
+       [ -z "${target}" ] && [ -z "${post_mount}" ] && return
+
+       if ! cryptsetup status ${target} | egrep -q '\<active:' ; then
+               ewarn "Skipping unmapped target ${target}"
+               cryptfs_status=1
+               return
+       fi
+
+       mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
+       if [ -z "${mount_point}" ] ; then
+               ewarn "Failed to find mount point for ${target}, skipping"
+               cryptfs_status=1
+       fi
+
+       if [ -n "${post_mount}" ] ; then
+               ebegin "Running post_mount commands for target ${target}"
+               eval "${post_mount}" >/dev/null
+               eend $? || cryptfs_status=1
+       fi
+}
+
+# Lookup optional bootparams
+get_bootparam_val() {
+       # We're given something like:
+       #    foo=bar=cow
+       # Return the "bar=cow" part.
+       case $1 in
+       *\=*)
+               local key=$(echo "$1" | cut -f1 -d=)
+               echo "$1" | cut -c $(( ${#key} + 2 ))
+               ;;
+       esac
+}
+
+start() {
+       local header=true cryptfs_status=0
+       local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
+
+       local x
+       for x in $(cat /proc/cmdline) ; do
+               case "${x}" in
+               key_timeout\=*)
+                       local KEY_TIMEOUT=$(get_bootparam_val "${x}")
+                       if [ ${KEY_TIMEOUT} -gt 0 ] ; then
+                               read_timeout="-t ${KEY_TIMEOUT}"
+                       fi
+               ;;
+               esac
+       done
+
+       while read -u 3 targetline ; do
+               case ${targetline} in
+               # skip comments and blank lines
+               ""|"#"*) continue ;;
+               # skip service-specific openrc configs #377927
+               rc_*) continue ;;
+               esac
+
+               ${header} && ebegin "Setting up dm-crypt mappings"
+               header=false
+
+               # check for the start of a new target/swap
+               case ${targetline} in
+               target=*|swap=*)
+                       # If we have a target queued up, then execute it
+                       ${execute_hook}
+
+                       # Prepare for the next target/swap by resetting variables
+                       unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
+                       ;;
+
+               gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
+                       if [ -z "${target}${swap}" ] ; then
+                               ewarn "Ignoring setting outside target/swap section: ${targetline}"
+                               continue
+                       fi
+                       ;;
+
+               dmcrypt_max_timeout=*)
+                       # ignore global options
+                       continue
+                       ;;
+
+               *)
+                       ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
+                       ;;
+               esac
+
+               # Queue this setting for the next call to dm_crypt_execute_xxx
+               eval "${targetline}"
+       done 3< ${conf_file}
+
+       # If we have a target queued up, then execute it
+       ${execute_hook}
+
+       ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
+}
+
+stop() {
+       local line header
+
+       # Break down all mappings
+       header=true
+       egrep "^(target|swap)=" ${conf_file} | \
+       while read line ; do
+               ${header} && einfo "Removing dm-crypt mappings"
+               header=false
+
+               target= swap=
+               eval ${line}
+
+               [ -n "${swap}" ] && target=${swap}
+               if [ -z "${target}" ] ; then
+                       ewarn "invalid line in ${conf_file}: ${line}"
+                       continue
+               fi
+
+               ebegin "  ${target}"
+               cryptsetup remove ${target}
+               eend $?
+       done
+
+       # Break down loop devices
+       header=true
+       grep '^source=./dev/loop' ${conf_file} | \
+       while read line ; do
+               ${header} && einfo "Detaching dm-crypt loop devices"
+               header=false
+
+               source=
+               eval ${line}
+
+               ebegin "  ${source}"
+               losetup -d "${source}"
+               eend $?
+       done
+
+       return 0
+}
index a65fdbc379a8089c2f9b66e01b495c8b5db874e1..87b055ef418f2d75c68662f0ae1a3b9019319327 100644 (file)
@@ -46,6 +46,7 @@ app-emulation/virtualbox-modules
 dev-python/fbrehm-libs
 ~dev-python/iniparse-0.4
 # ~dev-python/isodate-0.4.9
+~dev-python/pylint-0.27.0
 ~dev-python/stevedore-0.8
 ~dev-python/virtualenv-clone-0.2.4
 ~dev-python/virtualenvwrapper-3.6
index c8610aa3abeca7ab8fa96305cc210452a27b7147..e4749bd3839538eb9a5edbc5bd7317e19d2c6f01 100644 (file)
@@ -36,7 +36,6 @@ export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversi
 export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/opt/bin/skype'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.2/html/library'
 export PYTHONDOCS_3_2='/usr/share/doc/python-docs-3.2.2/html/library'
-export PYTHONPATH='/usr/lib/portage/pym'
 export QT_GRAPHICSSYSTEM='raster'
 export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins'
 export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.6.3:/usr/lib64/subversion/bin'
diff --git a/qt4/.keep_dev-qt_qtcore-4 b/qt4/.keep_dev-qt_qtcore-4
new file mode 100644 (file)
index 0000000..e69de29