diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rw-r--r-- | perl-install/install_gtk.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 1 | ||||
| -rwxr-xr-x | perl-install/live_install | 79 |
4 files changed, 61 insertions, 27 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 84278102c..0627d354b 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -19,6 +19,11 @@ * Xconfigurator.pm: added option "sw_cursor" for S3 Trio3D. fixed 3D hw acceleration for i815 (VideoRam). prefer XF3 for all NeoMagic cards. + * install_gtk.pm: re-enabled themes on live upgrade but without + modifying background image. + * install_steps_gtk.pm: fixed missing help. + * live_install: lot of fixes to enable DrakX font, keep upgraded + system clean (libperl.so which allows graphical login). * pkgs.pm: added function allowedToUpgrade to filter kernel package. diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 019f5fa8a..b5f03e7a8 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -43,7 +43,6 @@ sub default_theme { #------------------------------------------------------------------------------ sub install_theme { my ($o, $theme) = @_; - $::live and return; $o->{theme} = $theme || $o->{theme}; @@ -65,7 +64,7 @@ widget "*Steps*" style "small-font" )); } - gtkset_background(@background1);# unless $::testing; + gtkset_background(@background1) unless $::live; #- || testing; create_logo_window($o); create_help_window($o); diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 1b0e1ae56..31d1acc28 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -557,7 +557,6 @@ _("There was an error installing packages:"), $1, _("Go on anyway?") ], 1) and r sub set_help { my ($o, @l) = @_; - $::live and return 1; $o->{current_help} = formatAlaTeX(join "\n", map { _ deref($help::steps{$_}) } @l); gtktext_insert($o->{help_window_text}, $o->{current_help}); 1; diff --git a/perl-install/live_install b/perl-install/live_install index 8ac72bb34..113cf5660 100755 --- a/perl-install/live_install +++ b/perl-install/live_install @@ -1,15 +1,22 @@ #!/bin/sh -dir=`pwd`/../../.. +if [ -x ./Mandrake/mdkinst/usr/bin/perl-install/live_install2 ]; then + dir=`pwd`/Mandrake/mdkinst +elif [ -x ../../../../../Mandrake/mdkinst/usr/bin/perl-install/live_install2 ]; then + dir=`pwd`/../../.. +else + echo >&2 "unable to get a working live system to start, check your working directory" + exit 2 +fi /bin/rm -rf /tmp/rhimage -mkdir -m 0700 /tmp/rhimage || exit 1 +/bin/mkdir -m 0700 /tmp/rhimage || exit 1 /bin/rm -rf /tmp/drakx -mkdir -m 0700 /tmp/drakx || exit 2 +/bin/mkdir -m 0700 /tmp/drakx || exit 2 for i in Mandrake RPMS misc boot images do - ln -sf "$dir/../../$i" "/tmp/rhimage/$i" + /bin/ln -sf "$dir/../../$i" "/tmp/rhimage/$i" done /bin/cp -a "$dir/../../Mandrake/mdkinst" "/tmp/drakx" @@ -18,47 +25,71 @@ if [ -x "/tmp/drakx/mdkinst/usr/bin/perl-install/live_install2" ]; then perlcoredir=/usr/lib/perl5/5.6.0/i386-linux/CORE cd /tmp/drakx/mdkinst/usr/bin/perl-install if [ -x $perlcoredir/libperl.so ]; then - mv $perlcoredir/libperl.so /tmp/drakx/mdkinst + /bin/mv $perlcoredir/libperl.so /tmp/drakx/mdkinst fi - mkdir -p $perlcoredir - ln -sf /tmp/drakx/mdkinst/$perlcoredir/libperl.so $perlcoredir/libperl.so + /bin/mkdir -p $perlcoredir + /bin/cp -a /tmp/drakx/mdkinst/$perlcoredir/libperl.so $perlcoredir/libperl.so if [ -x /usr/bin/packdrake ]; then - mv /usr/bin/packdrake /tmp/drakx/mdkinst + /bin/mv /usr/bin/packdrake /tmp/drakx/mdkinst fi - ln -sf /tmp/drakx/mdkinst/usr/bin/packdrake /usr/bin/packdrake + /bin/cp -a /tmp/drakx/mdkinst/usr/bin/packdrake /usr/bin/packdrake for i in MonitorsDB CardsNames Cards+ do if [ -e /usr/X11R6/lib/X11/$i ]; then - mv /usr/X11R6/lib/X11/$i /tmp/drakx/mdkinst + /bin/mv /usr/X11R6/lib/X11/$i /tmp/drakx/mdkinst fi - ln -sf /tmp/drakx/mdkinst/usr/X11R6/lib/X11/$i /usr/X11R6/lib/X11/$i + /bin/cp -a /tmp/drakx/mdkinst/usr/X11R6/lib/X11/$i /usr/X11R6/lib/X11/$i done + # get correct fonts for DrakX. + if [ -n "$DISPLAY" ]; then + xset +fp /tmp/drakx/mdkinst/usr/X11R6/lib/X11/fonts/ + xset fp rehash + fi + # start DrakX ../../../lib/ld-linux.so.2 ../perl ./live_install2 - for i in MonitorsDB CardsNames Cards+ + # restore all fonts dir from 7.2 in case something gets wrong. + for i in misc PEX Speedo Type1 mdk 75dpi 100dpi cyrillic do - rm -f /usr/X11R6/lib/X11/$i - if [ -e /tmp/drakx/mdkinst/$i ]; then - mv /tmp/drakx/mdkinst/$i /usr/X11R6/lin/X11/$i + if [ -d /usr/X11R6/lib/X11/fonts/$i ]; then + if [ ! -e /usr/X11R6/lib/X11/fonts/$i/fonts.dir ]; then + cd /usr/X11R6/lib/X11/fonts/$i + mkfontdir + if [ -n "$DISPLAY" ]; then + xset fp rehash + fi + cd - + fi fi done - rm -f /usr/bin/packdrake - if [ -x /tmp/drakx/mdkinst/packdrake ]; then - mv /tmp/drakx/mdkinst/packdrake /usr/bin/packdrake - fi - - rm -f $perlcoredir/libperl.so - if [ -x /tmp/drakx/mdkinst/libperl.so ]; then - mv /tmp/drakx/mdkinst/libperl.so $perlcoredir/libperl.so - fi +# for i in MonitorsDB CardsNames Cards+ +# do +# if [ -e /tmp/drakx/mdkinst/$i ]; then +# rm -f /usr/X11R6/lib/X11/$i +# mv /tmp/drakx/mdkinst/$i /usr/X11R6/lib/X11/$i +# fi +# done +# +# if [ -x /tmp/drakx/mdkinst/packdrake ]; then +# rm -f /usr/bin/packdrake +# mv /tmp/drakx/mdkinst/packdrake /usr/bin/packdrake +# fi +# +# if [ -x /tmp/drakx/mdkinst/libperl.so ]; then +# rm -f $perlcoredir/libperl.so +# mv /tmp/drakx/mdkinst/libperl.so $perlcoredir/libperl.so +# fi else echo >&2 "unable to get a working live system to start, check your working directory" + exit 2 fi #/bin/rm -rf /tmp/drakx #/bin/rm -rf /tmp/rhimage + +sync |