From fdd8036ba32ad88e83a61191cc4597ae060355d2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 14:46:42 +0200
Subject: Adding live-initramfs 1.99.2-1.

---
 scripts/live-bottom/38disable_restricted_manager | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts/live-bottom/38disable_restricted_manager')

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2f2db35..2a6f1ca 100755
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -1,9 +1,8 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Disabling restricted-manager..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {
@@ -18,10 +17,14 @@ prereqs)
        ;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+if [ -n "${NORESTRICTEDMANAGER}" ]
+then
+	exit 0
+fi
 
-rm -f /root/etc/xdg/autostart/restricted-manager.desktop
+log_begin_msg "Disabling restricted-manager..."
 
+rm -f /root/etc/xdg/autostart/restricted-manager.desktop
 rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
 
 log_end_msg
-- 
cgit v1.2.3