diff options
6 files changed, 13 insertions, 8 deletions
diff --git a/installer/OpenSLX/OSExport/Distro/Suse.pm b/installer/OpenSLX/OSExport/Distro/Suse.pm index f3579bbb..4378224a 100644 --- a/installer/OpenSLX/OSExport/Distro/Suse.pm +++ b/installer/OpenSLX/OSExport/Distro/Suse.pm @@ -40,6 +40,7 @@ sub initDistroInfo - /var/tmp/* - /var/spool/* - /var/run/* + + /var/run/screen - /var/mail - /var/log/* - /var/lock/* diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm index 77e5a2af..566817b8 100644 --- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm @@ -40,6 +40,7 @@ sub initDistroInfo - /var/tmp/* - /var/spool/* - /var/run/* + + /var/run/screen - /var/log/* - /var/log/apt/* + /var/log/apt diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index f3fe05ab..c5d23a49 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -78,8 +78,9 @@ sub initialize - /var/lib/vmware - /var/lib/ntp/* - /var/run/* + + /var/run/screen - /var/log/* - + /var + + /var/log/apt - /usr/lib/vmware/modules/* + /usr - /tmp/* @@ -110,6 +111,7 @@ sub initialize - /etc/samba/secrets.tdb - /etc/resolv.conf.* - /etc/opt/openslx + + /etc/opt/openslx - /etc/exports* - /etc/X11/xorg.* - /etc/X11/XF86* diff --git a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm index 1a5907ea..a4c13483 100644 --- a/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm +++ b/os-plugins/plugins/bootsplash/OpenSLX/OSPlugin/bootsplash.pm @@ -86,10 +86,10 @@ sub suggestAdditionalKernelParams my @suggestedParams; - # add vga=0x317 unless explicit vga-mode is already set - if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) { - push @suggestedParams, 'vga=0x317'; - } +# # add vga=0x317 unless explicit vga-mode is already set +# if (!$makeInitRamFSEngine->haveKernelParam(qr{\bvga=})) { +# push @suggestedParams, 'vga=0x317'; +# } # add quiet, if not already set if (!$makeInitRamFSEngine->haveKernelParam('quiet')) { diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh index 24bdcba4..a54fde96 100644 --- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh +++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh @@ -1,6 +1,6 @@ # splashy depends on /proc/fb with VESA # only activate with kernel option quiet and no debuglevel -if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \ +if grep -q ".*" /proc/fb > /dev/null 2>&1 \ && grep -qie " quiet " -qie "^quiet " -qie " quiet$" /proc/cmdline \ > /dev/null 2>&1 \ && [ $DEBUGLEVEL -eq 0 ] \ @@ -15,3 +15,4 @@ if [ ${no_bootsplash} -eq 0 ]; then # add splashy.boot runlevel script export D_SPLASHY=splashy.boot fi + diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm index e6d9a819..a8c51c1c 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Base.pm @@ -49,8 +49,8 @@ sub getDefaultDesktopManager my $self = shift; # the default implementation prefers GDM over KDM over XDM - return $self->isGDMInstalled() ? 'gdm' - : $self->isKDMInstalled() ? 'kdm' + return $self->isGDMInstalled() ? 'kdm' + : $self->isKDMInstalled() ? 'gdm' : $self->isXDMInstalled() ? 'xdm' : undef; } |