diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-04-26 16:20:40 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-04-26 16:20:40 -0400 |
| commit | d6e771ee267778ab76685c3454b983697bc46ffe (patch) | |
| tree | 9df78bf53854b5f96a3eaadcf58d8fd6c5e78eeb /prefdm | |
| parent | c145e815bcfad7f35fb1b53cdea2d0f66c1fd4e2 (diff) | |
| download | initscripts-d6e771ee267778ab76685c3454b983697bc46ffe.tar initscripts-d6e771ee267778ab76685c3454b983697bc46ffe.tar.gz initscripts-d6e771ee267778ab76685c3454b983697bc46ffe.tar.bz2 initscripts-d6e771ee267778ab76685c3454b983697bc46ffe.tar.xz initscripts-d6e771ee267778ab76685c3454b983697bc46ffe.zip | |
Tweak how plymouth is quit in the gdm case. (<rstrode@redhat.com>)
Diffstat (limited to 'prefdm')
| -rwxr-xr-x | prefdm | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -6,31 +6,31 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin [ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n # Run preferred X display manager -quit_arg= preferred= +splash_quit_command="" if [ -f /etc/sysconfig/desktop ]; then . /etc/sysconfig/desktop if [ "$DISPLAYMANAGER" = GNOME ]; then preferred=/usr/sbin/gdm - quit_arg="--retain-splash" elif [ "$DISPLAYMANAGER" = KDE ]; then preferred=/usr/bin/kdm - quit_arg="--retain-splash" + + # KDM supports "old-style" transition + splash_quit_command="plymouth quit --retain-splash" elif [ "$DISPLAYMANAGER" = WDM ]; then preferred=/usr/bin/wdm + splash_quit_command="plymouth quit" elif [ "$DISPLAYMANAGER" = XDM ]; then preferred=/usr/bin/xdm + splash_quit_command="plymouth quit" elif [ -n "$DISPLAYMANAGER" ]; then preferred=$DISPLAYMANAGER - else - quit_arg="--retain-splash" + splash_quit_command="plymouth quit" fi -else - quit_arg="--retain-splash" fi # shut down boot splash -/usr/bin/plymouth quit $quit_arg +$splash_quit_command shopt -s execfail |