From: frank Date: Tue, 6 Mar 2012 09:10:33 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=908a6dfccaf794aaf89a42bfbd67fa1287986616;p=config%2Fuhu1%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 5e2d6b6..40b757b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -28,7 +28,6 @@ maybe chmod 0600 './.pwd.lock' maybe chmod 0644 './DIR_COLORS' maybe chmod 0644 './GeoIP.conf' maybe chmod 0755 './ImageMagick' -maybe chmod 0644 './ImageMagick/._cfg0000_delegates.xml' maybe chmod 0644 './ImageMagick/coder.xml' maybe chmod 0644 './ImageMagick/colors.xml' maybe chmod 0644 './ImageMagick/delegates.xml' @@ -190,6 +189,7 @@ maybe chmod 0700 './config-archive' maybe chmod 0755 './config-archive/etc' maybe chmod 0755 './config-archive/etc/ImageMagick' maybe chmod 0644 './config-archive/etc/ImageMagick/delegates.xml' +maybe chmod 0644 './config-archive/etc/ImageMagick/delegates.xml.1' maybe chmod 0644 './config-archive/etc/ImageMagick/delegates.xml.dist' maybe chmod 0644 './config-archive/etc/ImageMagick/policy.xml' maybe chmod 0644 './config-archive/etc/ImageMagick/policy.xml.dist' diff --git a/ImageMagick/._cfg0000_delegates.xml b/ImageMagick/._cfg0000_delegates.xml deleted file mode 100644 index b186532..0000000 --- a/ImageMagick/._cfg0000_delegates.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ImageMagick/delegates.xml b/ImageMagick/delegates.xml index 1fefa70..b186532 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick/delegates.xml @@ -68,8 +68,8 @@ - - + + @@ -85,18 +85,18 @@ - - + + - - + + - - + + - + diff --git a/config-archive/etc/ImageMagick/delegates.xml b/config-archive/etc/ImageMagick/delegates.xml index f671293..1fefa70 100644 --- a/config-archive/etc/ImageMagick/delegates.xml +++ b/config-archive/etc/ImageMagick/delegates.xml @@ -68,8 +68,8 @@ - - + + @@ -80,31 +80,31 @@ - + - + - - - + + + - - + + - - + + - + - + - + diff --git a/config-archive/etc/ImageMagick/delegates.xml.1 b/config-archive/etc/ImageMagick/delegates.xml.1 new file mode 100644 index 0000000..f671293 --- /dev/null +++ b/config-archive/etc/ImageMagick/delegates.xml.1 @@ -0,0 +1,112 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/delegates.xml.dist b/config-archive/etc/ImageMagick/delegates.xml.dist index 1fefa70..b186532 100644 --- a/config-archive/etc/ImageMagick/delegates.xml.dist +++ b/config-archive/etc/ImageMagick/delegates.xml.dist @@ -68,8 +68,8 @@ - - + + @@ -85,18 +85,18 @@ - - + + - - + + - - + + - + diff --git a/resolv.conf b/resolv.conf index a0a3c9d..a98248c 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,3 @@ -search uhu-banane.de brehm-online.com brehm-online.eu brehm-berlin.de -nameserver 127.0.0.1 -nameserver 8.8.8.8 -nameserver 8.8.4.4 +# Generated by dhcpcd +# /etc/resolv.conf.head can replace this line +# /etc/resolv.conf.tail can replace this line diff --git a/shadow b/shadow index f4b5253..ce31fee 100644 --- a/shadow +++ b/shadow @@ -38,4 +38,4 @@ postgres:!:15369:::::: stunnel:!:15370:::::: mschiller:$6$64IlI9od$igGAWeZYMKMsz.BOW80al8PljRqt1wKHmHA.VuEZOmWsndJW9j3NQhAdL/AnVCybEKS6JhnksGO8pGa4Fzwah1:15394:0:99999:7::: mbalser:$6$HKgz20Bg$q8HuLpCwwRCqRFAGPxvSnGpVdhKbkO/zGvpQB757vun3brj9JJTRkzheOez4BauXezCGuvIHxPdPpVGXmAbBg0:15394:0:99999:7::: -lweiler:$6$w6LGTUBn$enL2uLXfnXJPCz5YZkzqq9FGty5dpUtGOREfsBb.t7FReJpGyWA8DYrEnixF7mucA5WsNyvUtzcVoRJSmp7y4.:15396:0:99999:7::: +lweiler:$6$1vlJ/aoE$yMy0JgKY5rbPvs707UFge6cFU53EzIWfWDVk83rnFg4pxdOs5Vv/U752D0B9/8MG.BQpimMqXtw/Bqfz3O1xz/:15405:0:99999:7:::