summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
Commit message (Expand)AuthorAgeFilesLines
* more precise msg when can't access kernel modules because we still have many ...Guillaume Cottenceau2002-02-281-1/+1
* not translating in console installs (esp. newt) when the font is missingPascal Rigaux2002-02-221-1/+1
* anchor the -IP match at the end of the stringPascal Rigaux2002-02-191-2/+2
* move loading /tmp/network from stage1 before doing the auto_install stuff toPascal Rigaux2002-02-191-17/+23
* do not use run_program::xxx, use directly "system" so that stdout is kept unc...Pascal Rigaux2002-02-171-2/+3
* create and use miscellaneousAfter (so that SECURE_LEVEL is set *after* asking)Pascal Rigaux2002-02-071-10/+1
* auto_allocate for oem mode is not needed as oem script create all necessary p...Francois Pons2002-02-051-1/+0
* move /root/* files (ddebug.log, install.log, report.bug,Guillaume Cottenceau2002-01-291-3/+3
* minimal install now handles excludedocsPascal Rigaux2002-01-241-2/+0
* can't call any::config_libsafe so early during install, move it where msec is...Pascal Rigaux2002-01-211-0/+1
* call msec with run_commands=0 to fix the network reloading (causing various p...Pascal Rigaux2002-01-201-1/+1
* corrected read_resolv => read_confdamien2002-01-101-1/+1
* cosmetikdamien2002-01-081-1/+2
* added option to only upgrade packages.Francois Pons2002-01-071-0/+1
* added update installation support to install (big modifs need testing).Francois Pons2002-01-041-0/+5
* save the output of ddcxinfos before modprobe'ing i810fb, and use that output ...Pascal Rigaux2002-01-031-3/+6
* clean_tmp now means using tmpfsPascal Rigaux2001-12-171-1/+0
* use "askdisplay" to ask a question at begining of install for whatGuillaume Cottenceau2001-12-121-0/+1
* enable easy screenshot'ingPascal Rigaux2001-12-121-0/+2
* - ensure /usr is formatted if / isPascal Rigaux2001-12-121-0/+13
* add $o->{excludedocs} featurePascal Rigaux2001-11-261-0/+2
* i810fbGuillaume Cottenceau2001-11-211-0/+17
* ensure postInstallNonRooted is done *before* ejecting cdromPascal Rigaux2001-10-111-6/+6
* ensure floppies() takes care of usb-storage if possible, so that patch on usb...Pascal Rigaux2001-10-091-1/+2
* - cleanup noatime option settingPascal Rigaux2001-09-221-8/+0
* initial support for server installPascal Rigaux2001-09-191-0/+1
* compatibility with older $o->{lang} names (for auto_installs)Pascal Rigaux2001-09-191-1/+1
* don't create bootdisk by defaultGuillaume Cottenceau2001-09-181-1/+1
* use new mkdir_p, rm_rf and cp_af from MDK::CommonPascal Rigaux2001-09-161-3/+2
* don't warn if modules are missing when testingPascal Rigaux2001-09-151-1/+1
* do not output error message for bad kernel if using --g_auto_install.Francois Pons2001-09-131-1/+1
* (selectKeyboard): remove code causing install_steps::selectKeyboard to be ski...Pascal Rigaux2001-09-131-2/+0
* display error when the kernel mismatch the modulesPascal Rigaux2001-09-121-0/+5
* removed obsolete --nocpi flag for install2.Francois Pons2001-09-121-2/+1
* make loopback installs work againPascal Rigaux2001-09-081-6/+0
* fix keyboard config + some cleanupPascal Rigaux2001-09-061-8/+0
* cleanup (use /proc/self instead of /proc/$$)Pascal Rigaux2001-09-061-1/+1
* corrected icon handlingdamien2001-08-281-1/+1
* icon correctiondamien2001-08-251-1/+1
* rename isCdNotEjectable in usingRamdisk, ensure no files are removed unless w...Pascal Rigaux2001-08-191-1/+1
* a hell lot of cleanup/rewrite:Pascal Rigaux2001-08-171-1/+2
* removed no_incondamien2001-08-171-1/+1
* add remove_unused to have more place for mo filesPascal Rigaux2001-08-161-0/+1
* - fix createBootdisk with autoGuillaume Cottenceau2001-08-141-2/+2
* - fix behaviour of draknet when auto-installGuillaume Cottenceau2001-08-141-1/+2
* auto_inst enhancementsPascal Rigaux2001-08-131-11/+12
* initial revision for drakautoinstGuillaume Cottenceau2001-08-131-92/+84
* added blank and updatemodules options to DrakX.Francois Pons2001-07-261-0/+2
* do not export sync, keep it in common (esp. so that it doesn't conflict with ...Pascal Rigaux2001-07-251-1/+1
* move to MDK::Common, bool->to_boolPascal Rigaux2001-07-241-1/+1
Size Used Avail Use Mounted on
+.
+ format DF =
+@<<<<<<<<<<<<<<<< @>>>>>>> @>>>>>>> @>>>>>>> @>>>>>% @<<<<<<<<<<<<<<<<<<<<<<<<<
+$dev, $size, $used, $free, $use, $mntpoint
+.
+ my %h;
+ foreach (cat_("/proc/mounts"), cat_("/etc/mtab")) {
+ ($dev, $mntpoint) = split;
+ $h{$dev} = $mntpoint;
+ }
+ foreach $dev (sort keys %h) {
+ $mntpoint = $h{$dev};
+ my $buf = ' ' x 20000;
+ syscall_('statfs', $mntpoint, $buf) or next;
+ (undef, undef, $size, $free) = unpack "l7", $buf;
+ $size or next;
+
+ $use = int (100 * ($size - $free) / $size);
+ $used = $size - $free;
+ if ($h) {
+ $used = int ($used / 1024) . "M";
+ $size = int ($size / 1024) . "M";
+ $free = int ($free / 1024) . "M";
+ }
+ write DF if $size;
+ }
+}
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 45340f8e9..e43b47ded 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -576,8 +576,8 @@ sub main {
#-the main cycle
my $clicked = 0;
MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) {
- $o->enteringStep($o->{step});
$o->{steps}{$o->{step}}{entered}++;
+ $o->enteringStep($o->{step});
eval {
&{$install2::{$o->{step}}}($clicked, $o->{steps}{$o->{step}}{entered});
};
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 4c96920a0..0820eb24e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -138,6 +138,6 @@ sub install_cpio {
eval { commands::rm "-r", $dir };
mkdir $dir, 0755;
- run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -i $name");
+ run_program::run("cd $dir ; bzip2 -cd $cpio | cpio -id $name $name/*");
"$dir/$name";
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cf3df79dc..584bf1fb3 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -163,16 +163,14 @@ sub mouseConfig($) {
sub configureNetwork($) {
my ($o) = @_;
my $etc = "$o->{prefix}/etc";
-#
-# rc = checkNetConfig(&$o->{intf}, &$o->{netc}, &$o->{intfFinal},
-# &$o->{netcFinal}, &$o->{driversLoaded}, $o->{direction});
+
network::write_conf("$etc/sysconfig/network", $o->{netc});
network::write_resolv_conf("$etc/resolv.conf", $o->{netc});
network::write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_) foreach @{$o->{intf}};
network::add2hosts("$etc/hosts", $o->{netc}{HOSTNAME}, map { $_->{IPADDR} } @{$o->{intf}});
network::sethostname($o->{netc}) unless $::testing;
network::addDefaultRoute($o->{netc}) unless $::testing;
- #-res_init(); # reinit the resolver so DNS changes take affect
+ #-res_init(); #- reinit the resolver so DNS changes take affect
}
#------------------------------------------------------------------------------
@@ -180,7 +178,9 @@ sub timeConfig {
my ($o, $f) = @_;
my $t = $o->{timezone};
- setVarsInSh($f, {
+ eval { commands::cp("-f", "/usr/share/zoneinfo/$t->{timezone}", "/etc/localtime") };
+ $@ and log::l("installing /etc/localtime failed");
+ setVarsInSh($f, {
ZONE => $t->{timezone},
GMT => bool2text($t->{GMT}),
ARC => "false",
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 296441bb9..4bb7e6aab 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -458,7 +458,7 @@ sub addUser($) {
},
complete => sub {
$u->{password} eq $u->{password2} or $o->ask_warn('', [ _("You must enter the same password"), _("Please try again") ]), return (1,3);
- (length $u->{password} < 6) and $o->ask_warn('', _("This password is too simple")), return (1,2);
+ #(length $u->{password} < 6) and $o->ask_warn('', _("This password is too simple")), return (1,2);
$u->{name} or $o->ask_warn('', _("Please give a user name")), return (1,0);
$u->{name} =~ /^[a-z0-9_-]+$/ or $o->ask_warn('', _("The user name must contain only lower cased letters, numbers, `-' and `_'")), return (1,0);
return 0;
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index fdd821465..44a9fc32a 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -119,7 +119,7 @@ sub setup($) {
if (my $file = install_any::install_cpio("/usr/share/keymaps", "$o->[1].kmap")) {
log::l("loading keymap $o->[1]");
- load(cat_($file));
+ load(cat_($file)) if -e $file;
}
if (my $file = install_any::install_cpio("/usr/share/xmodmap", "xmodmap.$o->[2]")) {
eval { run_program::run('xmodmap', $file) } unless $::testing;
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index c55e37a71..b9a32a2e1 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -1,8 +1,8 @@
style "default-font"
{
fontset = "\
--*-arial-medium-r-normal-*-*-120-*-*-*-*-*-*,\
--*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*,\
+-*-arial-medium-r-normal-*-*-100-*-*-*-*-*-*,\
+-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,\
-*-tahoma-medium-r-normal-*-*-*-*-*-*-*-*-*,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1990-0,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1983-0,\
@@ -23,8 +23,8 @@ style "steps"
fg[NORMAL] = { 1.0, 1.0, 1.0 }
fontset = "\
--*-arial-medium-r-normal-*-*-100-*-*-*-*-*-*,\
--*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,\
+-*-arial-medium-r-normal-*-*-80-*-*-*-*-*-*,\
+-*-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*,\
-*-tahoma-medium-r-normal-*-*-*-*-*-*-*-*-*,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1990-0,\
-*-*-medium-r-normal-*-*-*-*-*-*-*-jisx0208.1983-0,\
diff --git a/perl-install/share/list b/perl-install/share/list
index beffbce8f..01750371f 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -77,7 +77,6 @@
/usr/X11R6/lib/X11/fonts/misc/fonts.alias
/usr/X11R6/lib/X11/fonts/misc/6x13.pcf.gz
/usr/X11R6/lib/X11/fonts/misc/cursor.pcf.gz
-/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
/usr/X11R6/lib/X11/fonts/misc/7x14rk.pcf.gz
/usr/share/fonts/ISO8859-9/75dpi/fonts.dir
/usr/share/fonts/ISO8859-9/75dpi/fonts.alias