diff options
| author | root | 2011-01-17 12:10:15 +0100 |
|---|---|---|
| committer | root | 2011-01-17 12:10:15 +0100 |
| commit | e4aedfabe7d586a5633a8be2dcb253b4ac7afca8 (patch) | |
| tree | ac9a4ddbe756f612dc0a7d4b35e7f23a9afc0b8a /src/os-plugins/plugins/kiosk | |
| parent | remove /proc/bus/usb stuff.. (diff) | |
| download | core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.tar.gz core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.tar.xz core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.zip | |
commit of quickfixes on 4.2
Diffstat (limited to 'src/os-plugins/plugins/kiosk')
| -rw-r--r-- | src/os-plugins/plugins/kiosk/OpenSLX/OSPlugin/kiosk.pm | 5 | ||||
| -rw-r--r-- | src/os-plugins/plugins/kiosk/XX_kiosk.sh | 2 | ||||
| -rw-r--r-- | src/os-plugins/plugins/kiosk/files/profiles/plain/.bash_profile | 4 |
3 files changed, 7 insertions, 4 deletions
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 |