diff options
| -rw-r--r-- | docs/README | 8 | ||||
| -rw-r--r-- | perl-install/any.pm | 11 | ||||
| -rw-r--r-- | perl-install/install2.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 15 | ||||
| -rw-r--r-- | perl-install/log.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakautoinst | 7 | ||||
| -rwxr-xr-x | perl-install/standalone/drakbug_report | 1 |
9 files changed, 34 insertions, 20 deletions
diff --git a/docs/README b/docs/README index a6b691be6..d35508e66 100644 --- a/docs/README +++ b/docs/README @@ -167,11 +167,11 @@ not interesting. before graphical install really begins) - /tmp/ddebug.log: (nearly the) same as latter alt-F3 part - /tmp/syslog: same as alt-F4 -- /mnt/root/ddebug.log: at the end of each step, DrakX tries to backup - /tmp/ddebug.log to /mnt/root. Available only after mounting of /. -- /mnt/root/install.log: the log of the installation (or upgrade) of the rpms +- /mnt/root/drakx/ddebug.log: at the end of each step, DrakX tries to backup + /tmp/ddebug.log to /mnt/root/drakx. Available only after mounting of /. +- /mnt/root/drakx/install.log: the log of the installation (or upgrade) of the rpms (just like rpm's /mnt/tmp/(install|upgrade).log) -- /mnt/root/auto_inst.cfg.pl: a kickstart file generated at the end of each +- /mnt/root/drakx/auto_inst.cfg.pl: a kickstart file generated at the end of each step. Can be used in 2 ways: kickstart install or ``defcfg'' install. Hopefully you know about kickstart. ``defcfg'' is a way to customize the default values in install. For example, French can be the default language with a qwerty keyboard, diff --git a/perl-install/any.pm b/perl-install/any.pm index 36d6fc954..22929ef64 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -376,7 +376,7 @@ sub rotate_log { } sub rotate_logs { my ($prefix) = @_; - rotate_log("$prefix/root/$_") foreach qw(ddebug.log install.log); + rotate_log("$prefix/root/drakx/$_") foreach qw(ddebug.log install.log); } sub writeandclean_ldsoconf { @@ -891,17 +891,18 @@ sub report_bug { header("scsi"), cat_("/proc/scsi/scsi"), header("lsmod"), cat_("/proc/modules"), header("cmdline"), cat_("/proc/cmdline"), - header("pcmcia: stab"), cat_('/var/run/stab'), cat_('/var/lib/pcmcia/stab'), + header("pcmcia: stab"), cat_('/var/lib/pcmcia/stab') || cat_('/var/run/stab'), header("usb"), cat_("/proc/bus/usb/devices"), header("partitions"), cat_("/proc/partitions"), header("cpuinfo"), cat_("/proc/cpuinfo"), header("syslog"), cat_("/tmp/syslog"), header("ddcxinfos"), ddcxinfos(), - header("stage1.log"), cat_("/tmp/stage1.log"), - header("ddebug.log"), cat_("/tmp/ddebug.log"), - header("install.log"), cat_("$prefix/root/install.log"), + header("stage1.log"), cat_("/tmp/stage1.log") || cat_("$prefix/root/drakx/stage1.log"), + header("ddebug.log"), cat_("/tmp/ddebug.log") || cat_("$prefix/root/drakx/ddebug.log"), + header("install.log"), cat_("$prefix/root/drakx/install.log"), header("fstab"), cat_("$prefix/etc/fstab"), header("modules.conf"), cat_("$prefix/etc/modules.conf"), + header("/etc/modules"), cat_("$prefix/etc/modules"), map_index { even($::i) ? header($_) : $_ } @other; } diff --git a/perl-install/install2.pm b/perl-install/install2.pm index f98da39e3..2893b4a46 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -183,7 +183,7 @@ sub formatPartitions { etc/sysconfig/network-scripts etc/sysconfig/console/consolefonts etc/sysconfig/console/consoletrans home mnt tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi); - mkdir "$o->{prefix}/$_", 0700 foreach qw(root root/tmp); + mkdir "$o->{prefix}/$_", 0700 foreach qw(root root/tmp root/drakx); common::screenshot_dir__and_move(); @@ -626,8 +626,8 @@ sub main { -e "$o->{prefix}/usr/sbin/urpmi.update" or eval { rm_rf("$o->{prefix}/var/lib/urpmi") }; - #- have the really bleeding edge ddebug.log - eval { cp_af("/tmp/ddebug.log", "$o->{prefix}/root") }; + #- copy latest log files + eval { cp_af("/tmp/$_", "$o->{prefix}/root/drakx") foreach qw(ddebug.log stage1.log) }; #- ala pixel? :-) [fpons] common::sync(); common::sync(); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 4461e4815..f5204bcec 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -648,7 +648,7 @@ sub kdemove_desktop_file { #-############################################################################### #- auto_install stuff #-############################################################################### -sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root") . "/auto_inst.cfg.pl" } +sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root/drakx") . "/auto_inst.cfg.pl" } sub report_bug { my ($prefix) = @_; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 7352b0476..a2a43e6dc 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -49,7 +49,7 @@ sub leavingStep { log::l("step `$step' finished"); if (-d "$o->{prefix}/root") { - eval { cp_af("/tmp/ddebug.log", "$o->{prefix}/root") }; + eval { cp_af("/tmp/ddebug.log", "$o->{prefix}/root/drakx") }; output(install_any::auto_inst_file(), install_any::g_auto_install()); } @@ -382,7 +382,7 @@ sub afterInstallPackages($) { die _("Some important packages didn't get installed properly. Either your cdrom drive or your cdrom is defective. Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\" -") if grep { m|read failed: Input/output error| } cat_("$o->{prefix}/root/install.log"); +") if grep { m|read failed: Input/output error| } cat_("$o->{prefix}/root/drakx/install.log"); if (arch() !~ /^sparc/) { #- TODO restore it as may be needed for sparc -x "$o->{prefix}/usr/bin/dumpkeys" or $::testing or die @@ -939,8 +939,15 @@ sub miscellaneous { #------------------------------------------------------------------------------ sub exitInstall { my ($o) = @_; - eval { output "$o->{prefix}/root/report.bug", install_any::report_bug($o->{prefix}) }; - install_any::getAndSaveAutoInstallFloppy($o, 1, "$o->{prefix}/root/replay_install.img"); + eval { output "$o->{prefix}/root/drakx/report.bug", install_any::report_bug($o->{prefix}) }; + install_any::getAndSaveAutoInstallFloppy($o, 1, "$o->{prefix}/root/drakx/replay_install.img" ); + eval { output "$o->{prefix}/root/drakx/README", "This directory contains several installation-related files, +mostly log files (very useful if you ever report a bug!). + +Beware that some Mandrake tools rely on the contents of some +of these files... so remove any file from here at your own +risk! +" }; install_any::unlockCdrom; install_any::log_sizes($o); } diff --git a/perl-install/log.pm b/perl-install/log.pm index 59f3d4bbf..649ed30a0 100644 --- a/perl-install/log.pm +++ b/perl-install/log.pm @@ -36,7 +36,7 @@ sub openLog(;$) { if ($_[0]) { #- useLocal open LOG, "> $_[0]";# or die "no log possible :("; } else { - open LOG, "> /dev/tty3" or open LOG, ">> /tmp/install.log";# or die "no log possible :("; + open LOG, "> /dev/tty3";# or die "no log possible :("; } open LOG2, ">> /tmp/ddebug.log";# or die "no log possible :("; select((select(LOG), $| = 1)[0]); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 8c2f24865..5107c0bc8 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -862,7 +862,7 @@ sub computeGroupSize { sub init_db { my ($prefix) = @_; - my $f = "$prefix/root/install.log"; + my $f = "$prefix/root/drakx/install.log"; open(LOG, ">> $f") ? log::l("opened $f") : log::l("Failed to open $f. No install log will be kept."); *LOG or *LOG = log::F() or *LOG = *STDERR; CORE::select((CORE::select(LOG), $| = 1)[0]); diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 04ff72cbc..0bd6894a4 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -41,7 +41,7 @@ my $in = 'interactive'->vnew('su', 'default'); begin: $::isEmbedded and kill USR2, $::CCPID; -my $imagefile = "/root/replay_install.img"; +my $imagefile = "/root/drakx/replay_install.img"; -f $imagefile or $in->ask_okcancel(_("Error!"), _("I can't find needed image file `%s'.", $imagefile), 1), quit_global($in, 0); @@ -360,6 +360,11 @@ sub control_buttons { #------------------------------------------------- #- $Log$ +#- Revision 1.17 2002/01/29 22:38:31 gc +#- move /root/* files (ddebug.log, install.log, report.bug, +#- auto_inst.cfg.pl, replay_install.img) to /root/drakx/, +#- and also save stage1.log there +#- #- Revision 1.16 2002/01/18 20:22:20 gc #- - write the 'common' part of the 'explanations' stuff, #- with nice help from Pixel for the tough Perl part diff --git a/perl-install/standalone/drakbug_report b/perl-install/standalone/drakbug_report index e031a008f..6b70acb35 100755 --- a/perl-install/standalone/drakbug_report +++ b/perl-install/standalone/drakbug_report @@ -8,6 +8,7 @@ use any; my %other = ( 'rpm -qa' => join('', sort `rpm -qa`), 'mandrake version' => cat_('/etc/redhat-release'), + 'df' => join('', `df`), ); print any::report_bug('', %other); |