summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initramfs/OpenSLX/MakeInitRamFS/Engine.pm2
-rw-r--r--os-plugins/plugins/theme/XX_theme.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/initramfs/OpenSLX/MakeInitRamFS/Engine.pm b/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
index 9a20a882..8749eb68 100644
--- a/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
+++ b/initramfs/OpenSLX/MakeInitRamFS/Engine.pm
@@ -361,7 +361,7 @@ sub _copyBusybox
insmod id ip kill killall ln ls lsmod mdev mkdir mknod mkswap
modprobe mount mv nice ping printf ps rdate rm rmmod sed sleep
sort swapoff swapon switch_root tar test tftp time touch tr
- udhcpc umount uptime usleep vconfig vi wget zcat zcip
+ udhcpc umount uptime usleep vconfig vi vncpasswd wget zcat zcip
);
foreach my $applet (@busyboxApplets) {
$self->addCMD("ln -sf /bin/busybox $self->{'build-path'}/bin/$applet");
diff --git a/os-plugins/plugins/theme/XX_theme.sh b/os-plugins/plugins/theme/XX_theme.sh
index 5acadab4..097397bf 100644
--- a/os-plugins/plugins/theme/XX_theme.sh
+++ b/os-plugins/plugins/theme/XX_theme.sh
@@ -15,7 +15,9 @@ if [ -e /initramfs/plugin-conf/theme.conf ]; then
if [ -d /usr/share/themes/displaymanager ]; then
cp -a /usr/share/themes/displaymanager \
/mnt/var/lib/openslx/themes
- sed -i "s,UseTheme=false,UseTheme=true," /mnt/${D_KDMRCPATH}/kdmrc
+ if [ -f /mnt/${D_KDMRCPATH}/kdmrc ]; then
+ sed -i "s,UseTheme=false,UseTheme=true," /mnt/${D_KDMRCPATH}/kdmrc
+ fi
if [ -f /mnt/etc/gdm/gdm.conf ]; then
sed -i "s,^\(GraphicalThemeDir=.*\)$,#\1 \nGraphicalThemeDir=/var/lib/openslx/themes/displaymanager," /mnt/etc/gdm/gdm.conf
sed -i "s,^\(GraphicalTheme=.*\)$,#\1 \nGraphicalTheme=gdm," /mnt/etc/gdm/gdm.conf