From ab80a34ea45b060ce3a83c27ca995a300a442e91 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Sep 2008 09:51:44 +0000 Subject: [PATCH] * Quick workaround for tty-backgrounds not working on Linux 2.6.26: /proc/sys/kernel/fbcondecor is now suddenly named /proc/sys/fbcondecor. Might be a bug. svn path=/nixos/trunk/; revision=12784 --- upstart-jobs/tty-backgrounds.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/upstart-jobs/tty-backgrounds.nix b/upstart-jobs/tty-backgrounds.nix index 6e51208d6864..604085308709 100644 --- a/upstart-jobs/tty-backgrounds.nix +++ b/upstart-jobs/tty-backgrounds.nix @@ -28,7 +28,9 @@ rec { # Critical: tell the kernel where to find splash_helper. It calls # this program every time we switch between consoles. - echo ${splashutils}/${splashutils.helperName} > ${splashutils.helperProcFile} + helperProcFile=${splashutils.helperProcFile} + if test -e /proc/sys/fbcondecor; then helperProcFile=/proc/sys/fbcondecor; fi + echo ${splashutils}/${splashutils.helperName} > $helperProcFile # For each console... for tty in ${toString (map (x: x.tty) backgrounds)}; do