From e4aedfabe7d586a5633a8be2dcb253b4ac7afca8 Mon Sep 17 00:00:00 2001
From: root
Date: Mon, 17 Jan 2011 12:10:15 +0100
Subject: commit of quickfixes on 4.2

---
 src/os-plugins/plugins/kiosk/OpenSLX/OSPlugin/kiosk.pm          | 5 ++---
 src/os-plugins/plugins/kiosk/XX_kiosk.sh                        | 2 +-
 src/os-plugins/plugins/kiosk/files/profiles/plain/.bash_profile | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 src/os-plugins/plugins/kiosk/files/profiles/plain/.bash_profile

(limited to 'src/os-plugins/plugins/kiosk')

diff --git a/src/os-plugins/plugins/kiosk/OpenSLX/OSPlugin/kiosk.pm b/src/os-plugins/plugins/kiosk/OpenSLX/OSPlugin/kiosk.pm
index bfeeae0a..ca0b87f2 100644
--- a/src/os-plugins/plugins/kiosk/OpenSLX/OSPlugin/kiosk.pm
+++ b/src/os-plugins/plugins/kiosk/OpenSLX/OSPlugin/kiosk.pm
@@ -35,8 +35,6 @@ sub new
         name => 'kiosk',
     };
     
-    mkpath("$openslxConfig{'config-path'}/plugins/kiosk/profiles");
-    
     return bless $self, $class;
 }
 
@@ -98,7 +96,8 @@ sub installationPhase
 
 	copyFile("$filesDir/kgetty","$pluginRepoPath");
 	
-	system(qq{cp -r $filesDir/profiles/* $openslxConfig{'config-path'}/plugins/kiosk/profiles/});
+    system("mkdir -p /etc/openslx/kiosk/profiles/");
+	system(qq{cp -r $filesDir/profiles/* /etc/openslx/kiosk/profiles/});
 	
     my $scriptpath = "$pluginRepoPath/setup.kgetty";
 	my $script = $self->{distro}->getKgettySetupScript();
diff --git a/src/os-plugins/plugins/kiosk/XX_kiosk.sh b/src/os-plugins/plugins/kiosk/XX_kiosk.sh
index c7e275ad..55421785 100644
--- a/src/os-plugins/plugins/kiosk/XX_kiosk.sh
+++ b/src/os-plugins/plugins/kiosk/XX_kiosk.sh
@@ -23,7 +23,7 @@ if [ -e /initramfs/plugin-conf/kiosk.conf ]; then
     	[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'kiosk' os-plugin ...";
 		
 		
-		profile_path="/etc/opt/openslx/plugins/kiosk/profiles/"
+		profile_path="/etc/openslx/kiosk/profiles/"
 		
 		# avoid ldap conflicts - part I
 		# hide nsswitch.conf
diff --git a/src/os-plugins/plugins/kiosk/files/profiles/plain/.bash_profile b/src/os-plugins/plugins/kiosk/files/profiles/plain/.bash_profile
new file mode 100644
index 00000000..28694f85
--- /dev/null
+++ b/src/os-plugins/plugins/kiosk/files/profiles/plain/.bash_profile
@@ -0,0 +1,4 @@
+if [ "x$(tty)" == "x/dev/tty1" ]; then
+  startx
+  exit
+fi
-- 
cgit v1.2.3-55-g7522