01/01: Remove leftover patches.

2015-05-09 Thread Cyril Roelandt
steap pushed a commit to branch master
in repository guix.

commit 8fda1b797063af19bda898e41dcf6a8369d8aed5
Author: Cyril Roelandt tipec...@gmail.com
Date:   Fri May 8 19:37:05 2015 +0200

Remove leftover patches.

* gnu/packages/patches/guix-test-networking.patch: Delete it.
* gnu/packages/patches/libtool-skip-tests.patch: Delete it.
* gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch: Delete it.
* gnu/packages/patches/udev-gir-libtool.patch: Delete it.
* gnu-system.am (dist_patch_DATA): Remove them as well.
---
 gnu-system.am  |4 --
 gnu/packages/patches/guix-test-networking.patch|   15 -
 gnu/packages/patches/libtool-skip-tests.patch  |   55 
 .../patches/python-sqlite-3.8.4-test-fix.patch |   15 -
 gnu/packages/patches/udev-gir-libtool.patch|   17 --
 5 files changed, 0 insertions(+), 106 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index d3e91ed..f5649f1 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -448,7 +448,6 @@ dist_patch_DATA =   
\
   gnu/packages/patches/guile-default-utf8.patch\
   gnu/packages/patches/guile-linux-syscalls.patch  \
   gnu/packages/patches/guile-relocatable.patch \
-  gnu/packages/patches/guix-test-networking.patch  \
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch   \
   gnu/packages/patches/hop-linker-flags.patch  \
@@ -466,7 +465,6 @@ dist_patch_DATA =   
\
   gnu/packages/patches/liboop-mips64-deplibs-fix.patch \
   gnu/packages/patches/libmad-mips-newgcc.patch\
   gnu/packages/patches/libtheora-config-guess.patch\
-  gnu/packages/patches/libtool-skip-tests.patch\
   gnu/packages/patches/libtool-skip-tests2.patch   \
   gnu/packages/patches/libssh-CVE-2014-0017.patch  \
   gnu/packages/patches/libvpx-fix-armhf-link.patch \
@@ -524,7 +522,6 @@ dist_patch_DATA =   
\
   gnu/packages/patches/pyqt-configure.patch\
   gnu/packages/patches/python-fix-tests.patch  \
   gnu/packages/patches/python-libffi-mips-n32-fix.patch\
-  gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch  \
   gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
@@ -550,7 +547,6 @@ dist_patch_DATA =   
\
   gnu/packages/patches/teckit-cstdio.patch \
   gnu/packages/patches/texi2html-document-encoding.patch   \
   gnu/packages/patches/texi2html-i18n.patch\
-  gnu/packages/patches/udev-gir-libtool.patch  \
   gnu/packages/patches/unzip-CVE-2014-8139.patch   \
   gnu/packages/patches/unzip-CVE-2014-8140.patch   \
   gnu/packages/patches/unzip-CVE-2014-8141.patch   \
diff --git a/gnu/packages/patches/guix-test-networking.patch 
b/gnu/packages/patches/guix-test-networking.patch
deleted file mode 100644
index a8d1f4f..000
--- a/gnu/packages/patches/guix-test-networking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Skip that test when the network is unreachable.
-
-diff --git a/tests/packages.scm b/tests/packages.scm
-index 04e3b0b..6ac215b 100644
 a/tests/packages.scm
-+++ b/tests/packages.scm
-@@ -139,6 +139,8 @@
- (and (direct-store-path? source)
-  (string-suffix? utils.scm source
- 
-+(unless (false-if-exception (getaddrinfo www.gnu.org 80 AI_NUMERICSERV))
-+  (test-skip 1))
- (test-equal package-source-derivation, snippet
-   OK
-   (let* ((file   (search-bootstrap-binary guile-2.0.9.tar.xz
diff --git a/gnu/packages/patches/libtool-skip-tests.patch 
b/gnu/packages/patches/libtool-skip-tests.patch
deleted file mode 100644
index 9191d40..000
--- a/gnu/packages/patches/libtool-skip-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Because our GCC 'lib' spec automatically adds '-rpath' for each '-L'
-and a couple more '-rpath, there are two test failures:
-one in demo.test, and one in destdir.at.  Disable these.
-
-Also skip the nopic test on ARM and MIPS systems.
-
 libtool-2.4.6/tests/demo.at.orig   2015-01-16 13:52:04.0 -0500
-+++ libtool-2.4.6/tests/demo.at2015-02-16 10:48:51.435851966 -0500
-@@ -510,7 +510,7 @@
- AT_SETUP([force non-PIC objects])
- 
- AT_CHECK([case $host in
--hppa*|x86_64*|s390*)
-+hppa*|x86_64*|s390*|arm*|mips*)
-   # These hosts cannot use non-PIC shared libs
-   exit 77 ;;
- *-solaris*|*-sunos*)
 libtool-2.4.6/tests/testsuite.orig 2015-02-15 11:15:25.0 -0500
-+++ 

branch master updated (dd51caa - 8fda1b7)

2015-05-09 Thread Cyril Roelandt
steap pushed a change to branch master
in repository guix.

  from  dd51caa   doc: Show both the bare-bones and the desktop 
configurations.
   new  8fda1b7   Remove leftover patches.

The 1 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 gnu-system.am  |4 --
 gnu/packages/patches/guix-test-networking.patch|   15 -
 gnu/packages/patches/libtool-skip-tests.patch  |   55 
 .../patches/python-sqlite-3.8.4-test-fix.patch |   15 -
 gnu/packages/patches/udev-gir-libtool.patch|   17 --
 5 files changed, 0 insertions(+), 106 deletions(-)
 delete mode 100644 gnu/packages/patches/guix-test-networking.patch
 delete mode 100644 gnu/packages/patches/libtool-skip-tests.patch
 delete mode 100644 gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch
 delete mode 100644 gnu/packages/patches/udev-gir-libtool.patch



05/06: install: Have several OS config templates under /etc/configuration.

2015-05-09 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit e1fbc32a0a1d027ec641ac0e249ad9aa1d5a8ffa
Author: Ludovic Courtès l...@gnu.org
Date:   Sat May 9 23:34:01 2015 +0200

install: Have several OS config templates under /etc/configuration.

* gnu/system/install.scm (configuration-template-service): Remove
  'local-template' and 'template'.  Add 'search' and 'templates'.
  [activate]: Copy all of TEMPLATES to /etc/configuration.
* doc/guix.texi (System Installation): Adjust file name accordingly.
---
 doc/guix.texi  |2 +-
 gnu/system/install.scm |   29 ++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index e2465ee..ea4a5c7 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3927,7 +3927,7 @@ It is better to store that file on the target root file 
system, say, as
 
 A minimal operating system configuration, with just the bare minimum and
 only a root account would look like this (on the installation system,
-this example is available as @file{/etc/configuration-template.scm}):
+this example is available as @file{/etc/configuration/bare-bones.scm}):
 
 @example
 @include os-config.texi
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index bba2df5..82793a6 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -32,6 +32,8 @@
   #:use-module (gnu packages grub)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages compression)
+  #:use-module (ice-9 match)
+  #:use-module (srfi srfi-26)
   #:export (self-contained-tarball
 installation-os))
 
@@ -172,12 +174,17 @@ the given target.)
   Return a dummy service whose purpose is to install an operating system
 configuration template file in the installation system.
 
-  (define local-template
-/etc/configuration-template.scm)
-  (define template
-(search-path %load-path gnu/system/examples/bare-bones.tmpl))
+  (define search
+(cut search-path %load-path ))
+  (define templates
+(map (match-lambda
+   ((file '- target)
+(list (local-file (search file))
+  (string-append /etc/configuration/ target
+ '((gnu/system/examples/bare-bones.tmpl - bare-bones.scm)
+   (gnu/system/examples/desktop.tmpl - desktop.scm
 
-  (mlet %store-monad ((template (interned-file template)))
+  (with-monad %store-monad
 (return (service
  (requirement '(root-file-system))
  (provision '(os-config-template))
@@ -186,8 +193,16 @@ configuration template file in the installation system.
  (start #~(const #t))
  (stop  #~(const #f))
  (activate
-  #~(unless (file-exists? #$local-template)
-  (copy-file #$template #$local-template)))
+  #~(begin
+  (use-modules (ice-9 match)
+   (guix build utils))
+
+  (mkdir-p /etc/configuration)
+  (for-each (match-lambda
+  ((file target)
+   (unless (file-exists? target)
+ (copy-file file target
+'#$templates)))
 
 (define %nscd-minimal-caches
   ;; Minimal in-memory caching policy for nscd.



03/06: services: dhcp-client: Better track dhclient's PID.

2015-05-09 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit c217cbd84d7aee7414945a6cf85e1d704fff6e32
Author: Ludovic Courtès l...@gnu.org
Date:   Sat May 9 22:28:03 2015 +0200

services: dhcp-client: Better track dhclient's PID.

* gnu/services/networking.scm (dhcp-client-service)[start]: Remove
  PID-FILE first.  When 'call-with-input-file' throws ENOENT, try
  again.
---
 gnu/services/networking.scm |   16 +++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index f9d262d..33ecf9c 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -165,6 +165,8 @@ Protocol (DHCP) client, on all the non-loopback network 
interfaces.
  (provision '(networking))
 
  (start #~(lambda _
+(false-if-exception (delete-file #$pid-file))
+
 ;; When invoked without any arguments, 'dhclient'
 ;; discovers all non-loopback interfaces *that are
 ;; up*.  However, the relevant interfaces are
@@ -178,7 +180,19 @@ Protocol (DHCP) client, on all the non-loopback network 
interfaces.
-pf #$pid-file
ifaces
   (and (zero? (cdr (waitpid pid)))
-   (call-with-input-file #$pid-file read)
+   (let loop ()
+ (catch 'system-error
+   (lambda ()
+ (call-with-input-file #$pid-file read))
+   (lambda args
+ ;; 'dhclient' returned before PID-FILE
+ ;; was created, so try again.
+ (let ((errno (system-error-errno args)))
+   (if (= ENOENT errno)
+   (begin
+ (sleep 1)
+ (loop))
+   (apply throw args))
  (stop #~(make-kill-destructor))
 
 (define %ntp-servers



06/06: doc: Show both the bare-bones and the desktop configurations.

2015-05-09 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit dd51caac55f052cecc61c7b8ab16654e3ace569f
Author: Ludovic Courtès l...@gnu.org
Date:   Sat May 9 23:51:46 2015 +0200

doc: Show both the bare-bones and the desktop configurations.

* doc/guix.texi (System Installation): Add xref to Using the
  Configuration System instead of including one here.
  (Using the Configuration System): Remove first example, and include
  os-config-bare-bones.texi instead.  Include os-config-desktop.texi as
  a second example.
* doc.am (OS_CONFIG_EXAMPLES_TEXI): New variable.
  (BUILT_SOURCES, EXTRA_DIST, MAINTAINERCLEANFILES): Use it.
  (doc/os-config.texi): Remove.
  (doc/os-config-%.texi): New target.
---
 .gitignore|2 ++
 doc.am|   12 
 doc/guix.texi |   55 +++
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index eaa7dbd..47cb395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,5 @@ GTAGS
 /emacs/guix-helper.scm
 /emacs/guix-init.el
 /emacs/guix-profiles.el
+/doc/os-config-bare-bones.texi
+/doc/os-config-desktop.texi
diff --git a/doc.am b/doc.am
index c517e0f..df85cfe 100644
--- a/doc.am
+++ b/doc.am
@@ -25,12 +25,16 @@ EXTRA_DIST +=   \
   doc/images/bootstrap-graph.eps   \
   doc/images/bootstrap-graph.pdf
 
+OS_CONFIG_EXAMPLES_TEXI =  \
+  doc/os-config-bare-bones.texi\
+  doc/os-config-desktop.texi
+
 # Bundle this file so that makeinfo finds it in out-of-source-tree builds.
-BUILT_SOURCES+= doc/os-config.texi
-EXTRA_DIST   += doc/os-config.texi
-MAINTAINERCLEANFILES  = doc/os-config.texi
+BUILT_SOURCES+= $(OS_CONFIG_EXAMPLES_TEXI)
+EXTRA_DIST   += $(OS_CONFIG_EXAMPLES_TEXI)
+MAINTAINERCLEANFILES  = $(OS_CONFIG_EXAMPLES_TEXI)
 
-doc/os-config.texi: gnu/system/examples/bare-bones.tmpl
+doc/os-config-%.texi: gnu/system/examples/%.tmpl
$(MKDIR_P) `dirname $@`
cp $ $@
 
diff --git a/doc/guix.texi b/doc/guix.texi
index ea4a5c7..33b1c2e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -3925,20 +3925,14 @@ that end, the installation system comes with two text 
editors: GNU nano
 It is better to store that file on the target root file system, say, as
 @file{/mnt/etc/config.scm}.
 
-A minimal operating system configuration, with just the bare minimum and
-only a root account would look like this (on the installation system,
-this example is available as @file{/etc/configuration/bare-bones.scm}):
+@xref{Using the Configuration System}, for examples of operating system
+configurations.  These examples are available under
+@file{/etc/configuration} in the installation image, so you can copy
+them and use them as a starting point for your own configuration.
 
-@example
-@include os-config.texi
-@end example
-
-@noindent
-For more information on @code{operating-system} declarations,
-@pxref{Using the Configuration System}.
-
-Once that is done, the new system must be initialized (remember that the
-target root file system is mounted under @file{/mnt}):
+Once you are done preparing the configuration file, the new system must
+be initialized (remember that the target root file system is mounted
+under @file{/mnt}):
 
 @example
 guix system init /mnt/etc/config.scm /mnt
@@ -4021,29 +4015,7 @@ kernel, initial RAM disk, and boot loader looks like 
this:
 
 @findex operating-system
 @lisp
-(use-modules (gnu)   ; for 'user-account', '%base-services', etc.
- (gnu packages emacs)  ; for 'emacs'
- (gnu services ssh))   ; for 'lsh-service'
-
-(operating-system
-  (host-name komputilo)
-  (timezone Europe/Paris)
-  (locale fr_FR.utf8)
-  (bootloader (grub-configuration
-(device /dev/sda)))
-  (file-systems (cons (file-system
-(device /dev/sda1) ; or partition label
-(mount-point /)
-(type ext3))
-  %base-file-systems))
-  (users (list (user-account
-(name alice)
-(group users)
-(comment Bob's sister)
-(home-directory /home/alice
-  (packages (cons emacs %base-packages))
-  (services (cons (lsh-service #:port  #:root-login? #t)
-  %base-services)))
+@include os-config-bare-bones.texi
 @end lisp
 
 This example should be self-describing.  Some of the fields defined
@@ -4076,6 +4048,17 @@ generated as needed (@pxref{Defining Services}).  
@xref{operating-system
 Reference}, for details about the available @code{operating-system}
 fields.
 
+The configuration for a typical ``desktop'' usage, with the X11 display
+server, a desktop environment, network management, an SSH server, and
+more, would look like this:
+
+@lisp
+@include os-config-desktop.texi
+@end lisp
+
+@xref{Desktop Services}, for the exact list 

02/06: doc: Rename OS config example.

2015-05-09 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 54d6223d2c240c0214c123e0b0aa977a01a3c209
Author: Ludovic Courtès l...@gnu.org
Date:   Sat May 9 16:41:38 2015 +0200

doc: Rename OS config example.

* gnu/system/os-config.tmpl: Rename to...
* gnu/system/examples/bare-bones.tmpl: ... this.
* Makefile.am (EXAMPLES): Adjust accordingly.
* doc.am (doc/os-config.texi): Likewise.
* gnu/system/install.scm (configuration-template-service)[template]:
  Likewise.
---
 Makefile.am|2 +-
 doc.am |4 ++--
 .../{os-config.tmpl = examples/bare-bones.tmpl}   |0
 gnu/system/install.scm |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4fc1fc2..b20421a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,7 +135,7 @@ KCONFIGS =  \
 
 # Templates, examples.
 EXAMPLES = \
-  gnu/system/os-config.tmpl
+  gnu/system/examples/bare-bones.tmpl
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go
 
diff --git a/doc.am b/doc.am
index 56ad114..c517e0f 100644
--- a/doc.am
+++ b/doc.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014 Ludovic Courtès l...@gnu.org
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès l...@gnu.org
 # Copyright © 2013 Andreas Enge andr...@enge.fr
 #
 # This file is part of GNU Guix.
@@ -30,7 +30,7 @@ BUILT_SOURCES+= doc/os-config.texi
 EXTRA_DIST   += doc/os-config.texi
 MAINTAINERCLEANFILES  = doc/os-config.texi
 
-doc/os-config.texi: gnu/system/os-config.tmpl
+doc/os-config.texi: gnu/system/examples/bare-bones.tmpl
$(MKDIR_P) `dirname $@`
cp $ $@
 
diff --git a/gnu/system/os-config.tmpl b/gnu/system/examples/bare-bones.tmpl
similarity index 100%
rename from gnu/system/os-config.tmpl
rename to gnu/system/examples/bare-bones.tmpl
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index d55f0a0..bba2df5 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -175,7 +175,7 @@ configuration template file in the installation system.
   (define local-template
 /etc/configuration-template.scm)
   (define template
-(search-path %load-path gnu/system/os-config.tmpl))
+(search-path %load-path gnu/system/examples/bare-bones.tmpl))
 
   (mlet %store-monad ((template (interned-file template)))
 (return (service



01/06: gnu: wicd: Add patch to fix template instantiation.

2015-05-09 Thread Ludovic Court�s
civodul pushed a commit to branch master
in repository guix.

commit 6f05630ba6848fa666f4ea57aab7f7ffbc15fc72
Author: Ludovic Courtès l...@gnu.org
Date:   Sat May 9 15:40:14 2015 +0200

gnu: wicd: Add patch to fix template instantiation.

* gnu/packages/patches/wicd-template-instantiation.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/wicd.scm (wicd)[source]: Use it.
---
 gnu-system.am  |1 +
 .../patches/wicd-template-instantiation.patch  |   29 
 gnu/packages/wicd.scm  |4 ++-
 3 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 77c7836..d3e91ed 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -562,6 +562,7 @@ dist_patch_DATA =   
\
   gnu/packages/patches/w3m-fix-compile.patch   \
   gnu/packages/patches/webkitgtk-2.4.8-gmutexlocker.patch  \
   gnu/packages/patches/weex-vacopy.patch   \
+  gnu/packages/patches/wicd-template-instantiation.patch   \
   gnu/packages/patches/wicd-urwid-1.3.patch\
   gnu/packages/patches/wmctrl-64-fix.patch \
   gnu/packages/patches/wpa-supplicant-CVE-2015-1863.patch  \
diff --git a/gnu/packages/patches/wicd-template-instantiation.patch 
b/gnu/packages/patches/wicd-template-instantiation.patch
new file mode 100644
index 000..16d8fa6
--- /dev/null
+++ b/gnu/packages/patches/wicd-template-instantiation.patch
@@ -0,0 +1,29 @@
+Wicd 1.7.3 fails to instantiate template lines that have several
+variable references.  For instance, the line:
+
+  wep_key$_KEY_INDEX=$_KEY
+
+which is found in in the 'wep-hex' template, expands to these two
+lines:
+
+  wep_key0=$_KEY
+  wep_key0=123456789ab
+
+This patch fixes that by only emitting the fully substituted line.
+
+Patch by Ludovic Courtès l...@gnu.org.
+
+--- a/wicd/misc.py 2012-11-17 00:07:08 +
 b/wicd/misc.py 2015-05-09 11:22:37 +
+@@ -321,11 +321,11 @@ def ParseEncryption(network):
+ rep_val = '0'
+ if rep_val:
+ line = line.replace($_%s % cur_val, 
str(rep_val))
+-config_file = ''.join([config_file, line])
+ else:
+ print Ignoring template line: '%s' % line
+ else:
+ print Weird parsing error occurred
++config_file = ''.join([config_file, line])
+ else:  # Just a regular entry.
+ config_file = ''.join([config_file, line])
diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm
index 1953a56..779ec84 100644
--- a/gnu/packages/wicd.scm
+++ b/gnu/packages/wicd.scm
@@ -44,7 +44,9 @@
/+download/wicd- version .tar.gz))
(sha256
 (base32 00c4rq753bhg64rv1v9yl834ssq7igyy7cz3swp287b5n5bqiqwi))
-   (patches (list (search-patch wicd-urwid-1.3.patch)
+   (patches (map search-patch
+ '(wicd-urwid-1.3.patch
+   wicd-template-instantiation.patch)
 (build-system python-build-system)
 (native-inputs `((gettext ,gnu-gettext)))
 (inputs `((dbus ,dbus)



branch master updated (15f0de0 - dd51caa)

2015-05-09 Thread Ludovic Court�s
civodul pushed a change to branch master
in repository guix.

  from  15f0de0   system: activate-ptrace-attach: Handle kernels without 
YAMA support.
   new  6f05630   gnu: wicd: Add patch to fix template instantiation.
   new  54d6223   doc: Rename OS config example.
   new  c217cbd   services: dhcp-client: Better track dhclient's PID.
   new  36ffaca   doc: Add desktop configuration example.
   new  e1fbc32   install: Have several OS config templates under 
/etc/configuration.
   new  dd51caa   doc: Show both the bare-bones and the desktop 
configurations.

The 6 revisions listed above as new are entirely new to this
repository and will be described in separate emails.  The revisions
listed as adds were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore |2 +
 Makefile.am|3 +-
 doc.am |   14 +++--
 doc/guix.texi  |   55 +++-
 gnu-system.am  |1 +
 .../patches/wicd-template-instantiation.patch  |   29 ++
 gnu/packages/wicd.scm  |4 +-
 gnu/services/networking.scm|   16 +-
 .../{os-config.tmpl = examples/bare-bones.tmpl}   |   23 
 gnu/system/examples/desktop.tmpl   |   42 +++
 gnu/system/install.scm |   29 ---
 11 files changed, 155 insertions(+), 63 deletions(-)
 create mode 100644 gnu/packages/patches/wicd-template-instantiation.patch
 rename gnu/system/{os-config.tmpl = examples/bare-bones.tmpl} (70%)
 create mode 100644 gnu/system/examples/desktop.tmpl



01/01: system: activate-ptrace-attach: Handle kernels without YAMA support.

2015-05-09 Thread Mark H. Weaver
mhw pushed a commit to branch master
in repository guix.

commit 15f0de0581987c539f86012bf524559e283f5942
Author: Mark H Weaver m...@netris.org
Date:   Sat May 9 12:57:36 2015 -0400

system: activate-ptrace-attach: Handle kernels without YAMA support.

* gnu/build/activation.scm (activate-ptrace-attach): Check for the existence
  of /proc/sys/kernel/yama/ptrace_scope before trying to write to it.
---
 gnu/build/activation.scm |8 +---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 8697d9d..352e736 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -369,9 +369,11 @@ found in Linux 3.4 onward that prevents users from 
attaching to their own
 processes--see Yama.txt in the Linux source tree for the rationale.  This
 sounds like an unacceptable restriction for little or no security
 improvement.
-  (call-with-output-file /proc/sys/kernel/yama/ptrace_scope
-(lambda (port)
-  (display 0 port
+  (let ((file /proc/sys/kernel/yama/ptrace_scope))
+(when (file-exists? file)
+  (call-with-output-file file
+(lambda (port)
+  (display 0 port))
 
 
 (define %current-system