From 19659d26c2bec431b4e538dfeed2dc4282405417 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Nov 2006 23:26:37 +0000
Subject: [PATCH] * Allow the tty-backgrounds service to be stopped, and remove
 the   themes from all consoles when we do so.

svn path=/nixu/trunk/; revision=7140
---
 test/splash-themes.nix                | 15 ++++++++++-----
 test/upstart-jobs/tty-backgrounds.nix | 12 +++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/test/splash-themes.nix b/test/splash-themes.nix
index cbc725dda1c..72ab07bcae5 100644
--- a/test/splash-themes.nix
+++ b/test/splash-themes.nix
@@ -14,11 +14,16 @@ rec {
     md5 = "da49f04988ab04b7e0de117b0d25061a";
   };
 
-  themePativo = fetchurl {
+  themePativo = fetchurl { # Yeah!
     url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2;
     md5 = "9e13beaaadf88d43a5293e7ab757d569";
   };
 
+  themeGNU = fetchurl {
+    url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2;
+    md5 = "61969309d23c631e57b0a311102ef034";
+  };
+
 
   # The themes to use for each tty.  For each tty except the first
   # entry in the list, you can omit `theme' to get the same theme as
@@ -32,13 +37,13 @@ rec {
     { tty = 2;
     }
     { tty = 3;
-      theme = themeFrozenBubble;
+      theme = themeGNU;
     }
     { tty = 4;
-      theme = themePativo;
+      theme = themeGNU;
     }
-    { tty = 6;
-      theme = themeFrozenBubble;
+    { tty = 5;
+      theme = themePativo;
     }
   ];
   
diff --git a/test/upstart-jobs/tty-backgrounds.nix b/test/upstart-jobs/tty-backgrounds.nix
index fd8eabea6a6..3282a879279 100644
--- a/test/upstart-jobs/tty-backgrounds.nix
+++ b/test/upstart-jobs/tty-backgrounds.nix
@@ -20,7 +20,7 @@ rec {
   job = "
 start on hardware-scan
 
-script
+start script
 
     rm -f /etc/splash
     ln -s ${themesUnpacked} /etc/splash
@@ -39,6 +39,16 @@ script
     done
 
 end script
+
+respawn sleep 10000 # !!! Hack
+
+stop script
+    # Disable the theme on each console.
+    for tty in ${toString (map (x: x.tty) backgrounds)}; do
+        ${splashutils}/bin/splash_util --tty $tty -c off || true
+    done
+end script
+
   ";
   
 }