diff options
| author | Michael Janczyk | 2010-08-11 21:02:33 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-08-11 21:02:33 +0200 |
| commit | ae01058d952979fcfc1d36693db5be02af0147f7 (patch) | |
| tree | 0ae9bb5e7a0b3b4aea8e46a9d1753ecf37467c61 /os-plugins/plugins | |
| parent | Cleaned up module loading for graphic adaptors (needed for newer Ubuntu (diff) | |
| download | core-ae01058d952979fcfc1d36693db5be02af0147f7.tar.gz core-ae01058d952979fcfc1d36693db5be02af0147f7.tar.xz core-ae01058d952979fcfc1d36693db5be02af0147f7.zip | |
changed splashy plugin. vga make no sense any more, kdm is now default manager
Diffstat (limited to 'os-plugins/plugins')
3 files changed, 8 insertions, 7 deletions
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; } |