From 5bf2753b66b10658d00eee47a453ba839956f8f9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 24 Feb 2014 19:05:15 +0100
Subject: Integrate prop nvidia drivers into system

If we detect nvidia.ko was loaded in stage31, download nvidia libs via
our slx-addon system. It is also ensured that kdm will not start before
the nvidia libs have been downloaded and integrated into the running system.
For that matter, it was ensured that slx addons are only downloaded when
setup-partitions finished running, and a proper /tmp dir is available.
---
 remote/modules/kdm/data/etc/systemd/system/kdm.service |  2 +-
 remote/modules/nvidia_libs/data/addon-init             | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100755 remote/modules/nvidia_libs/data/addon-init

(limited to 'remote/modules')

diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service
index 93bc2dd8..e07ae6fc 100644
--- a/remote/modules/kdm/data/etc/systemd/system/kdm.service
+++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=KDM Display Manager
 Conflicts=getty@tty7.service
-After=systemd-user-sessions.service getty@tty7.service
+After=systemd-user-sessions.service getty@tty7.service setup-slx-addon@nvidia_libs.service
 
 [Service]
 ExecStart=/usr/bin/kdm -nodaemon
diff --git a/remote/modules/nvidia_libs/data/addon-init b/remote/modules/nvidia_libs/data/addon-init
new file mode 100755
index 00000000..7e263976
--- /dev/null
+++ b/remote/modules/nvidia_libs/data/addon-init
@@ -0,0 +1,12 @@
+#!/bin/ash
+
+[ -e "/opt/openslx/etc/nvidia.whiteout" ] || exit 66
+
+while read line; do
+	rm -f -- "$line"
+done < "/opt/openslx/etc/nvidia.whiteout"
+
+ldconfig || ldconfig.real
+
+exit 0
+
-- 
cgit v1.2.3-55-g7522