From 1cc8103c511fecbd07514cce1e97fee84dfcab10 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sat, 27 Jun 2015 00:17:48 +0200 Subject: [PATCH] Current state --- apt/apt.conf.d/01autoremove | 26 -- apt/preferences.d/.keep_sys-apps_apt-0 | 0 apt/sources.list | 8 - apt/sources.list.d/.keep_sys-apps_apt-0 | 0 apt/trusted.gpg.d/.keep_sys-apps_apt-0 | 0 bash/bashrc.d/bash_completion.sh | 1 + config-archive/etc/default/grub | 30 +- config-archive/etc/default/grub.1 | 47 +++ config-archive/etc/default/grub.dist | 15 +- cron.daily/apt | 507 ----------------------- cups/printers.conf | 2 +- cups/subscriptions.conf | 12 +- default/grub | 15 +- gconf/gconf.xml.defaults/%gconf-tree.xml | 104 ++--- init.d/lxc | 14 +- logrotate.d/apt | 16 - lxdvdrip.conf | 34 +- portage/package.keywords | 4 + resolv.conf | 12 +- 19 files changed, 195 insertions(+), 652 deletions(-) delete mode 100644 apt/apt.conf.d/01autoremove delete mode 100644 apt/preferences.d/.keep_sys-apps_apt-0 delete mode 100644 apt/sources.list delete mode 100644 apt/sources.list.d/.keep_sys-apps_apt-0 delete mode 100644 apt/trusted.gpg.d/.keep_sys-apps_apt-0 create mode 100644 config-archive/etc/default/grub.1 delete mode 100644 cron.daily/apt delete mode 100644 logrotate.d/apt diff --git a/apt/apt.conf.d/01autoremove b/apt/apt.conf.d/01autoremove deleted file mode 100644 index c7ad51e6..00000000 --- a/apt/apt.conf.d/01autoremove +++ /dev/null @@ -1,26 +0,0 @@ -APT -{ - NeverAutoRemove - { - "^firmware-linux.*"; - "^linux-firmware$"; - "^linux-image.*"; - "^kfreebsd-image.*"; - "^linux-restricted-modules.*"; - "^linux-ubuntu-modules-.*"; - "^gnumach$"; - "^gnumach-image.*"; - }; - - Never-MarkAuto-Sections - { - "metapackages"; - "restricted/metapackages"; - "universe/metapackages"; - "multiverse/metapackages"; - "oldlibs"; - "restricted/oldlibs"; - "universe/oldlibs"; - "multiverse/oldlibs"; - }; -}; diff --git a/apt/preferences.d/.keep_sys-apps_apt-0 b/apt/preferences.d/.keep_sys-apps_apt-0 deleted file mode 100644 index e69de29b..00000000 diff --git a/apt/sources.list b/apt/sources.list deleted file mode 100644 index cdb45245..00000000 --- a/apt/sources.list +++ /dev/null @@ -1,8 +0,0 @@ -# See sources.list(5) manpage for more information -# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. -deb http://ftp.us.debian.org/debian wheezy main contrib non-free -deb http://security.debian.org wheezy/updates main contrib non-free - -# Uncomment if you want the apt-get source function to work -#deb-src http://ftp.us.debian.org/debian wheezy main contrib non-free -#deb-src http://security.debian.org wheezy/updates main contrib non-free diff --git a/apt/sources.list.d/.keep_sys-apps_apt-0 b/apt/sources.list.d/.keep_sys-apps_apt-0 deleted file mode 100644 index e69de29b..00000000 diff --git a/apt/trusted.gpg.d/.keep_sys-apps_apt-0 b/apt/trusted.gpg.d/.keep_sys-apps_apt-0 deleted file mode 100644 index e69de29b..00000000 diff --git a/bash/bashrc.d/bash_completion.sh b/bash/bashrc.d/bash_completion.sh index bb0fdb61..ae6756f9 100644 --- a/bash/bashrc.d/bash_completion.sh +++ b/bash/bashrc.d/bash_completion.sh @@ -8,6 +8,7 @@ if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" if shopt -q progcomp && [ -r /usr/share/bash-completion/bash_completion ]; then # Source completion code. + BASH_COMPLETION_COMPAT_DIR=/usr/share/bash-completion/completions . /usr/share/bash-completion/bash_completion fi fi diff --git a/config-archive/etc/default/grub b/config-archive/etc/default/grub index 321487b3..c4b11376 100644 --- a/config-archive/etc/default/grub +++ b/config-archive/etc/default/grub @@ -1,23 +1,34 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: # 'grub2-mkconfig -o /boot/grub/grub.cfg' # # See the grub info page for documentation on possible variables and -# their associated values. +# their associated values. GRUB_DISTRIBUTOR="Bruni (Gentoo)" +# Default menu entry GRUB_DEFAULT=0 -GRUB_HIDDEN_TIMEOUT=5 -GRUB_HIDDEN_TIMEOUT_QUIET=true + +# Boot the default entry this many seconds after the menu is displayed +#GRUB_TIMEOUT=5 GRUB_TIMEOUT=10 +#GRUB_TIMEOUT_STYLE=menu # Append parameters to the linux kernel command line -# GRUB_CMDLINE_LINUX="" +#GRUB_CMDLINE_LINUX="" +# +# Examples: +# +# Boot with network interface renaming disabled +# GRUB_CMDLINE_LINUX="net.ifnames=0" +# +# Boot with systemd instead of sysvinit (openrc) +# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd" # Append parameters to the linux kernel command line for non-recovery entries #GRUB_CMDLINE_LINUX_DEFAULT="" @@ -31,6 +42,13 @@ GRUB_TIMEOUT=10 #GRUB_GFXMODE=640x480 GRUB_GFXMODE=800x600 +# Set to 'text' to force the Linux kernel to boot in normal text +# mode, 'keep' to preserve the graphics mode set using +# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular +# graphics mode, or a sequence of these separated by commas or +# semicolons to try several modes in sequence. +#GRUB_GFXPAYLOAD_LINUX= + # Path to theme spec txt file. # The starfield is by default provided with use truetype. # NOTE: when enabling custom theme, ensure you have required font/etc. diff --git a/config-archive/etc/default/grub.1 b/config-archive/etc/default/grub.1 new file mode 100644 index 00000000..321487b3 --- /dev/null +++ b/config-archive/etc/default/grub.1 @@ -0,0 +1,47 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ +# +# To populate all changes in this file you need to regenerate your +# grub configuration file afterwards: +# 'grub2-mkconfig -o /boot/grub/grub.cfg' +# +# See the grub info page for documentation on possible variables and +# their associated values. + +GRUB_DISTRIBUTOR="Bruni (Gentoo)" + +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=5 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 + +# Append parameters to the linux kernel command line +# GRUB_CMDLINE_LINUX="" + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal. +# Note that you can use only modes which your graphic card supports via VBE. +# You can see them in real GRUB with the command `vbeinfo'. +#GRUB_GFXMODE=640x480 +GRUB_GFXMODE=800x600 + +# Path to theme spec txt file. +# The starfield is by default provided with use truetype. +# NOTE: when enabling custom theme, ensure you have required font/etc. +#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#GRUB_BACKGROUND="/boot/grub/mybackground.png" + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel +GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_RECOVERY=true diff --git a/config-archive/etc/default/grub.dist b/config-archive/etc/default/grub.dist index f3f7e476..8ff053fa 100644 --- a/config-archive/etc/default/grub.dist +++ b/config-archive/etc/default/grub.dist @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: @@ -61,3 +61,14 @@ GRUB_DISTRIBUTOR="Gentoo" # Uncomment to disable generation of recovery mode menu entries #GRUB_DISABLE_RECOVERY=true + +# Uncomment to disable generation of the submenu and put all choices on +# the top-level menu. +# Besides the visual affect of no sub menu, this makes navigation of the +# menu easier for a user who can't see the screen. +#GRUB_DISABLE_SUBMENU=y + +# Uncomment to play a tone when the main menu is displayed. +# This is useful, for example, to allow users who can't see the screen +# to know when they can make a choice on the menu. +#GRUB_INIT_TUNE="60 800 1" diff --git a/cron.daily/apt b/cron.daily/apt deleted file mode 100644 index 5c00f22d..00000000 --- a/cron.daily/apt +++ /dev/null @@ -1,507 +0,0 @@ -#!/bin/sh -#set -e -# -# This file understands the following apt configuration variables: -# Values here are the default. -# Create /etc/apt/apt.conf.d/02periodic file to set your preference. -# -# Dir "/"; -# - RootDir for all configuration files -# -# Dir::Cache "var/cache/apt/"; -# - Set apt package cache directory -# -# Dir::Cache::Archives "archives/"; -# - Set package archive directory -# -# APT::Periodic::Enable "1"; -# - Enable the update/upgrade script (0=disable) -# -# APT::Periodic::BackupArchiveInterval "0"; -# - Backup after n-days if archive contents changed.(0=disable) -# -# APT::Periodic::BackupLevel "3"; -# - Backup level.(0=disable), 1 is invalid. -# -# Dir::Cache::Backup "backup/"; -# - Set periodic package backup directory -# -# APT::Archives::MaxAge "0"; (old, deprecated) -# APT::Periodic::MaxAge "0"; (new) -# - Set maximum allowed age of a cache package file. If a cache -# package file is older it is deleted (0=disable) -# -# APT::Archives::MinAge "2"; (old, deprecated) -# APT::Periodic::MinAge "2"; (new) -# - Set minimum age of a package file. If a file is younger it -# will not be deleted (0=disable). Usefull to prevent races -# and to keep backups of the packages for emergency. -# -# APT::Archives::MaxSize "0"; (old, deprecated) -# APT::Periodic::MaxSize "0"; (new) -# - Set maximum size of the cache in MB (0=disable). If the cache -# is bigger, cached package files are deleted until the size -# requirement is met (the biggest packages will be deleted -# first). -# -# APT::Periodic::Update-Package-Lists "0"; -# - Do "apt-get update" automatically every n-days (0=disable) -# -# APT::Periodic::Download-Upgradeable-Packages "0"; -# - Do "apt-get upgrade --download-only" every n-days (0=disable) -# -# APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; -# - Use debdelta-upgrade to download updates if available (0=disable) -# -# APT::Periodic::Unattended-Upgrade "0"; -# - Run the "unattended-upgrade" security upgrade script -# every n-days (0=disabled) -# Requires the package "unattended-upgrades" and will write -# a log in /var/log/unattended-upgrades -# -# APT::Periodic::AutocleanInterval "0"; -# - Do "apt-get autoclean" every n-days (0=disable) -# -# APT::Periodic::Verbose "0"; -# - Send report mail to root -# 0: no report (or null string) -# 1: progress report (actually any string) -# 2: + command outputs (remove -qq, remove 2>/dev/null, add -d) -# 3: + trace on - -check_stamp() -{ - stamp="$1" - interval="$2" - - if [ $interval -eq 0 ]; then - debug_echo "check_stamp: interval=0" - # treat as no time has passed - return 1 - fi - - if [ ! -f $stamp ]; then - debug_echo "check_stamp: missing time stamp file: $stamp." - # treat as enough time has passed - return 0 - fi - - # compare midnight today to midnight the day the stamp was updated - stamp_file="$stamp" - stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) - if [ "$?" != "0" ]; then - # Due to some timezones returning 'invalid date' for midnight on - # certain dates (eg America/Sao_Paulo), if date returns with error - # remove the stamp file and return 0. See coreutils bug: - # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html - rm -f "$stamp_file" - return 0 - fi - - now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) - if [ "$?" != "0" ]; then - # As above, due to some timezones returning 'invalid date' for midnight - # on certain dates (eg America/Sao_Paulo), if date returns with error - # return 0. - return 0 - fi - - delta=$(($now-$stamp)) - - # intervall is in days, convert to sec. - interval=$(($interval*60*60*24)) - debug_echo "check_stamp: interval=$interval, now=$now, stamp=$stamp, delta=$delta (sec)" - - # remove timestamps a day (or more) in the future and force re-check - if [ $stamp -gt $(($now+86400)) ]; then - echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" - rm -f "$stamp_file" - return 0 - fi - - if [ $delta -ge $interval ]; then - return 0 - fi - - return 1 -} - -update_stamp() -{ - stamp="$1" - touch $stamp -} - -# we check here if autoclean was enough sizewise -check_size_constraints() -{ - MaxAge=0 - eval $(apt-config shell MaxAge APT::Archives::MaxAge) - eval $(apt-config shell MaxAge APT::Periodic::MaxAge) - - MinAge=2 - eval $(apt-config shell MinAge APT::Archives::MinAge) - eval $(apt-config shell MinAge APT::Periodic::MinAge) - - MaxSize=0 - eval $(apt-config shell MaxSize APT::Archives::MaxSize) - eval $(apt-config shell MaxSize APT::Periodic::MaxSize) - - Cache="/var/cache/apt/archives/" - eval $(apt-config shell Cache Dir::Cache::archives/d) - - # sanity check - if [ -z "$Cache" ]; then - echo "empty Dir::Cache::archives, exiting" - exit - fi - - # check age - if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then - debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" - find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f - elif [ ! $MaxAge -eq 0 ]; then - debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" - find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f - else - debug_echo "skip aging since MaxAge is 0" - fi - - # check size - if [ ! $MaxSize -eq 0 ]; then - # maxSize is in MB - MaxSize=$(($MaxSize*1024)) - - #get current time - now=$(date --date=$(date --iso-8601) +%s) - MinAge=$(($MinAge*24*60*60)) - - # reverse-sort by mtime - for file in $(ls -rt $Cache/*.deb 2>/dev/null); do - du=$(du -s $Cache) - size=${du%%/*} - # check if the cache is small enough - if [ $size -lt $MaxSize ]; then - debug_echo "end remove by archive size: size=$size < $MaxSize" - break - fi - - # check for MinAge of the file - if [ $MinAge -ne 0 ]; then - # check both ctime and mtime - mtime=$(stat -c %Y $file) - ctime=$(stat -c %Z $file) - if [ $mtime -gt $ctime ]; then - delta=$(($now-$mtime)) - else - delta=$(($now-$ctime)) - fi - if [ $delta -le $MinAge ]; then - debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec" - break - else - # delete oldest file - debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize" - rm -f $file - fi - fi - done - fi -} - -# deal with the Apt::Periodic::BackupArchiveInterval -do_cache_backup() -{ - BackupArchiveInterval="$1" - if [ $BackupArchiveInterval -eq 0 ]; then - return - fi - - # Set default values and normalize - CacheDir="/var/cache/apt" - eval $(apt-config shell CacheDir Dir::Cache/d) - CacheDir=${CacheDir%/} - if [ -z "$CacheDir" ]; then - debug_echo "practically empty Dir::Cache, exiting" - return 0 - fi - - Cache="${CacheDir}/archives/" - eval $(apt-config shell Cache Dir::Cache::Archives/d) - if [ -z "$Cache" ]; then - debug_echo "practically empty Dir::Cache::archives, exiting" - return 0 - fi - - BackupLevel=3 - eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) - if [ $BackupLevel -le 1 ]; then - BackupLevel=2 ; - fi - - Back="${CacheDir}/backup/" - eval $(apt-config shell Back Dir::Cache::Backup/d) - if [ -z "$Back" ]; then - echo "practically empty Dir::Cache::Backup, exiting" 1>&2 - return - fi - - CacheArchive="$(basename "${Cache}")" - test -n "${CacheArchive}" || CacheArchive="archives" - BackX="${Back}${CacheArchive}/" - for x in $(seq 0 1 $((${BackupLevel}-1))); do - eval "Back${x}=${Back}${x}/" - done - - # backup after n-days if archive contents changed. - # (This uses hardlink to save disk space) - BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp - if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then - if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then - mkdir -p $Back - rm -rf $Back$((${BackupLevel}-1)) - for y in $(seq $((${BackupLevel}-1)) -1 1); do - eval BackY=${Back}$y - eval BackZ=${Back}$(($y-1)) - if [ -e $BackZ ]; then - mv -f $BackZ $BackY ; - fi - done - cp -la $Cache $Back ; mv -f $BackX $Back0 - update_stamp $BACKUP_ARCHIVE_STAMP - debug_echo "backup with hardlinks. (success)" - else - debug_echo "skip backup since same content." - fi - else - debug_echo "skip backup since too new." - fi -} - -# sleep for a random interval of time (default 30min) -# (some code taken from cron-apt, thanks) -random_sleep() -{ - RandomSleep=1800 - eval $(apt-config shell RandomSleep APT::Periodic::RandomSleep) - if [ $RandomSleep -eq 0 ]; then - return - fi - if [ -z "$RANDOM" ] ; then - # A fix for shells that do not have this bash feature. - RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") - fi - TIME=$(($RANDOM % $RandomSleep)) - debug_echo "sleeping for $TIME seconds" - sleep $TIME -} - - -debug_echo() -{ - # Display message if $VERBOSE >= 1 - if [ "$VERBOSE" -ge 1 ]; then - echo $1 1>&2 - fi -} - -check_power(){ - # laptop check, on_ac_power returns: - # 0 (true) System is on main power - # 1 (false) System is not on main power - # 255 (false) Power status could not be determined - # Desktop systems always return 255 it seems - if which on_ac_power >/dev/null; then - on_ac_power - POWER=$? - if [ $POWER -eq 1 ]; then - debug_echo "exit: system NOT on main power" - return 1 - elif [ $POWER -ne 0 ]; then - debug_echo "power status ($POWER) undetermined, continuing" - fi - debug_echo "system is on main power." - fi - return 0 -} - -# ------------------------ main ---------------------------- - -if test -r /var/lib/apt/extended_states; then - # Backup the 7 last versions of APT's extended_states file - # shameless copy from dpkg cron - if cd /var/backups ; then - if ! cmp -s apt.extended_states.0 /var/lib/apt/extended_states; then - cp -p /var/lib/apt/extended_states apt.extended_states - savelog -c 7 apt.extended_states >/dev/null - fi - fi -fi - -# check apt-config exstance -if ! which apt-config >/dev/null ; then - exit 0 -fi - -# check if the user really wants to do something -AutoAptEnable=1 # default is yes -eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) - -if [ $AutoAptEnable -eq 0 ]; then - exit 0 -fi - -# Set VERBOSE mode from apt-config (or inherit from environment) -VERBOSE=0 -eval $(apt-config shell VERBOSE APT::Periodic::Verbose) -debug_echo "verbose level $VERBOSE" -if [ "$VERBOSE" -le 2 ]; then - # quiet for 0,1,2 - XSTDOUT=">/dev/null" - XSTDERR="2>/dev/null" - XAPTOPT="-qq" - XUUPOPT="" -else - XSTDOUT="" - XSTDERR="" - XAPTOPT="" - XUUPOPT="-d" -fi -if [ "$VERBOSE" -ge 3 ]; then - # trace output - set -x -fi - -check_power || exit 0 - -# check if we can lock the cache and if the cache is clean -if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then - debug_echo "error encountered in cron job with \"apt-get check\"." - exit 0 -fi - -# Global current time in seconds since 1970-01-01 00:00:00 UTC -now=$(date +%s) - -# Support old Archive for compatibility. -# Document only Periodic for all controling parameters of this script. - -UpdateInterval=0 -eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) - -DownloadUpgradeableInterval=0 -eval $(apt-config shell DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) - -UnattendedUpgradeInterval=0 -eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) - -AutocleanInterval=0 -eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) - -BackupArchiveInterval=0 -eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) - -Debdelta=1 -eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) - -# check if we actually have to do anything that requires locking the cache -if [ $UpdateInterval -eq 0 ] && - [ $DownloadUpgradeableInterval -eq 0 ] && - [ $UnattendedUpgradeInterval -eq 0 ] && - [ $BackupArchiveInterval -eq 0 ] && - [ $AutocleanInterval -eq 0 ]; then - - # check cache size - check_size_constraints - - exit 0 -fi - -# deal with BackupArchiveInterval -do_cache_backup $BackupArchiveInterval - -# sleep random amount of time to avoid hitting the -# mirrors at the same time -random_sleep -check_power || exit 0 - -# include default system language so that "apt-get update" will -# fetch the right translated package descriptions -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE LC_MESSAGES LC_ALL -fi - -# update package lists -UPDATED=0 -UPDATE_STAMP=/var/lib/apt/periodic/update-stamp -if check_stamp $UPDATE_STAMP $UpdateInterval; then - if eval apt-get $XAPTOPT -y update $XSTDERR; then - debug_echo "download updated metadata (success)." - if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then - if dbus-send --system / app.apt.dbus.updated boolean:true ; then - debug_echo "send dbus signal (success)" - else - debug_echo "send dbus signal (error)" - fi - else - debug_echo "dbus signal not send (command not available)" - fi - update_stamp $UPDATE_STAMP - UPDATED=1 - else - debug_echo "download updated metadata (error)" - fi -else - debug_echo "download updated metadata (not run)." -fi - -# download all upgradeable packages (if it is requested) -DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp -if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then - if [ $Debdelta -eq 1 ]; then - debdelta-upgrade >/dev/null 2>&1 || true - fi - if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then - update_stamp $DOWNLOAD_UPGRADEABLE_STAMP - debug_echo "download upgradable (success)" - else - debug_echo "download upgradable (error)" - fi -else - debug_echo "download upgradable (not run)" -fi - -# auto upgrade all upgradeable packages -UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then - if unattended-upgrade $XUUPOPT; then - update_stamp $UPGRADE_STAMP - debug_echo "unattended-upgrade (success)" - else - debug_echo "unattended-upgrade (error)" - fi -else - debug_echo "unattended-upgrade (not run)" -fi - -# autoclean package archive -AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp -if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then - if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then - debug_echo "autoclean (success)." - update_stamp $AUTOCLEAN_STAMP - else - debug_echo "autoclean (error)" - fi -else - debug_echo "autoclean (not run)" -fi - -# check cache size -check_size_constraints - -# -# vim: set sts=4 ai : -# - diff --git a/cups/printers.conf b/cups/printers.conf index 1608db06..5b11e4f2 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v2.0.2 -# Written by cupsd on 2015-06-07 20:19 +# Written by cupsd on 2015-06-26 23:45 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index d5551b12..bf53fb3c 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,11 @@ # Subscription configuration file for CUPS v2.0.2 -# Written by cupsd on 2015-06-08 20:19 -NextSubscriptionId 217 +# Written by cupsd on 2015-06-26 23:45 +NextSubscriptionId 219 + +Events printer-changed +Owner root +LeaseDuration 86400 +Interval 60 +ExpirationTime 1435441528 +NextEventId 1 + diff --git a/default/grub b/default/grub index c4b11376..f9801015 100644 --- a/default/grub +++ b/default/grub @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: @@ -63,3 +63,14 @@ GRUB_DISABLE_LINUX_UUID=true # Uncomment to disable generation of recovery mode menu entries #GRUB_DISABLE_RECOVERY=true + +# Uncomment to disable generation of the submenu and put all choices on +# the top-level menu. +# Besides the visual affect of no sub menu, this makes navigation of the +# menu easier for a user who can't see the screen. +#GRUB_DISABLE_SUBMENU=y + +# Uncomment to play a tone when the main menu is displayed. +# This is useful, for example, to allow users who can't see the screen +# to know when they can make a choice on the menu. +#GRUB_INIT_TUNE="60 800 1" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index e825f4b6..1d2f713f 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2114,35 +2114,35 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + @@ -16525,14 +16525,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The milliseconds to show property panel after focus-in or properties are changed. - + Sans 10 @@ -16540,41 +16540,41 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Custom font name for language panel - + Use custom font name for language panel - + Show input method name on language bar - + Show icon on system tray - + Orientation of lookup table. 0 = Horizontal, 1 = Vertical - + - + - + The behavior of property panel. 0 = Do not show, 1 = Auto hide, 2 = Always show @@ -16582,7 +16582,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -16593,7 +16593,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16609,32 +16609,32 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Prefixes of DConf keys to stop name conversion - + Enable input method by default when the application gets input focus - + Share the same input method among all applications - + Embed Preedit Text in Application Window - + Use system keyboard (XKB) layout - + Set popup delay milliseconds to show IME switcher window. @@ -16645,14 +16645,14 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Saved engines order in input method list - + @@ -16660,21 +16660,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The shortcut keys for switching to the previous input method - + The shortcut keys for switching to the previous input method - +
  • @@ -16684,7 +16684,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for switching to the next input method in the list - +
  • @@ -16694,21 +16694,21 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for switching to the next input method in the list - + The shortcut keys for turning input method off - + The shortcut keys for turning input method on - +
  • @@ -16718,7 +16718,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The shortcut keys for turning input method on or off - +
  • diff --git a/init.d/lxc b/init.d/lxc index b2a1ee2f..e1ae34be 100755 --- a/init.d/lxc +++ b/init.d/lxc @@ -1,15 +1,17 @@ #!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.1 2014/10/18 17:00:37 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/files/lxc.initd.3,v 1.3 2015/06/13 11:54:25 hwoarang Exp $ CONTAINER=${SVCNAME#*.} +LXC_PATH=`lxc-config lxc.lxcpath` + lxc_get_configfile() { - if [ -f "/etc/lxc/${CONTAINER}.conf" ]; then - echo "/etc/lxc/${CONTAINER}.conf" - elif [ -f "/etc/lxc/${CONTAINER}/config" ]; then - echo "/etc/lxc/${CONTAINER}/config" + if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then + echo "${LXC_PATH}/${CONTAINER}.conf" + elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then + echo "${LXC_PATH}/${CONTAINER}/config" else eerror "Unable to find a suitable configuration file." eerror "If you set up the container in a non-standard" diff --git a/logrotate.d/apt b/logrotate.d/apt deleted file mode 100644 index 9a6e5d15..00000000 --- a/logrotate.d/apt +++ /dev/null @@ -1,16 +0,0 @@ -/var/log/apt/term.log { - rotate 12 - monthly - compress - missingok - notifempty -} - -/var/log/apt/history.log { - rotate 12 - monthly - compress - missingok - notifempty -} - diff --git a/lxdvdrip.conf b/lxdvdrip.conf index b2aba785..c9837a0e 100644 --- a/lxdvdrip.conf +++ b/lxdvdrip.conf @@ -3,7 +3,7 @@ # All Parameters must be like "paramter=value" without blanks. # version of Config File -version=1.76 +version=1.77 # Selection of the ripping Title, look with "lsdvd". # With "titel=0" lxdvdrip selects automatically the longest Title. @@ -54,7 +54,7 @@ dvdleser=/dev/sr0 # Device for DVD-Burner. # growisofs: normally "/dev/sr0". -# cdrecord: normally "0,0,0", test with "cdrecord -scanbus". +# wodim: normally "0,0,0", test with "wodim -scanbus". # On the Commandline: "-db=". dvdbrenner=/dev/sr0 @@ -71,9 +71,9 @@ filmverzeichnis=/tmp/film-dvd file=0 # Burning Program. -# "1": growisofs, "2": cdrecord, "3": cdrecord on the fly, -# "4": create ISO-Image "/tmp/dvdrip.img" with mkisofs. -# "5": create ISO-Image with Name "Volume-ID.img" (=Name of DVD) with mkisofs. +# "1": growisofs, "2": wodim, "3": wodim on the fly, +# "4": create ISO-Image "/tmp/dvdrip.img" with genisoimage. +# "5": create ISO-Image with Name "Volume-ID.img" (=Name of DVD) with genisoimage. # "0": no Burning. # On the Commandline: "-bp=". brennprogramm=1 @@ -148,7 +148,7 @@ playsound=1 # On the Commandline: "-free=" free=1 -# Burning Speed for growisofs and cdrecord. +# Burning Speed for growisofs and wodim. # speed=0: Start without "-speed=" speed=4 @@ -157,16 +157,16 @@ speed=4 # For a Description see "man growisofs". dvdcompat=1 -# Extra-Parameter(s) for mkisofs. +# Extra-Parameter(s) for genisoimage. # Parameter must be marked with apostrophes "xxx", i. E.: -# mkisofs_param="-input-charset iso8859-1" -# Parameter would be set by calling mkisofs or growisofs. -mkisofs_param="" +# genisoimage_param="-input-charset iso8859-1" +# Parameter would be set by calling genisoimage or growisofs. +genisoimage_param="" -# Extra-Parameter(s) for cdrecord/growisofs. +# Extra-Parameter(s) for wodim/growisofs. # Parameter must be marked with apostrophes "xxx", i. E.: # burn_param="-tao" -# Parameter would be set by calling cdrecord or growisofs. +# Parameter would be set by calling wodim or growisofs. burn_param="" # Eject DVD after Ripping @@ -181,9 +181,9 @@ rw-format=1 # Optional the full Path could be set, i. E. # "play_cell_name=/usr/local/bin/play_cell". dvdauthor_name=dvdauthor -buffer_name=buffer_lxdvdrip +#buffer_name=buffer #buffer_name=bfr -#buffer_name=mbuffer +buffer_name=mbuffer_lxdvdrip tccat_name=tccat tcextract_name=tcextract requant_name=requant_lxdvdrip @@ -195,8 +195,8 @@ spumux_name=spumux spuunmux_name=spuunmux dvdbackup_name=dvdbackup_lxdvdrip # Alternative: dvdbackup_name=vobcopy -mkisofs_name=mkisofs -cdrecord_name=cdrecord +genisoimage_name=genisoimage +wodim_name=wodim growisofs_name=growisofs dvd+rw-format=dvd+rw-format dvdunauthor_name=dvdunauthor @@ -212,7 +212,7 @@ lxdvdrip_wav_name=/usr/local/share/lxdvdrip.wav # Nice-Level for Programgroups # nice_rip for ripping (tccat, mplayer, spuunmux, vamps_play_cell) -# nice_burn for burning (growisofs, cdrecord) +# nice_burn for burning (growisofs, wodim) # Possible values from "-20" (high) to "19" (low), "off" without nice nice_rip=off nice_burn=off diff --git a/portage/package.keywords b/portage/package.keywords index 0f4ff3e9..8582995a 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -15,6 +15,7 @@ ~app-editors/pluma-1.8.0 ~app-emulation/docker-1.4.1 +~app-emulation/docker-1.6.1 ~app-emulation/emul-linux-x86-baselibs-20120520 ~app-emulation/emul-linux-x86-db-20120520 ~app-emulation/emul-linux-x86-gtklibs-20120520 @@ -106,6 +107,7 @@ dev-python/pb-logging ~dev-python/pylint-0.28.0 ~dev-python/PyQt4-4.11.3 ~dev-python/python-debian-0.1.21_p2 +~dev-python/python-debian-0.1.27 ~dev-python/pythonmagick-0.9.10 ~dev-python/reportlab-2.6 ~dev-python/setuptools-0.8 @@ -121,6 +123,7 @@ dev-python/pb-logging ~dev-python/virtualenvwrapper-3.7 ~dev-python/virtualenvwrapper-4.1.1 ~dev-python/virtualenvwrapper-4.3 +~dev-python/virtualenvwrapper-4.5.1 #~dev-qt/qt3support-4.8.6 #~dev-qt/qtdbus-4.8.6 @@ -241,6 +244,7 @@ mail-client/thunderbird # ~media-video/cheese-3.6.2 ~media-video/lxdvdrip-1.76 +~media-video/lxdvdrip-1.77 ~media-video/m2vrequantizer-0.0.2_pre20060306 #~media-video/mplayer-1.2_pre20141011 ~media-video/mplayer-1.2_pre20150214 diff --git a/resolv.conf b/resolv.conf index 7a104c01..8a53d6bf 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,7 +1,5 @@ -# Hand made by Frank Brehm -domain home.brehm-online.com -#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local -search home.brehm-online.com brehm-online.com uhu-banane.de pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net -#nameserver 10.12.11.1 -nameserver 192.168.178.30 -nameserver 192.168.178.89 +# Generated by net-scripts for interface eth0 +domain brehm-online.com +search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de +nameserver 10.12.11.254 +#nameserver 127.0.0.1 -- 2.39.5