summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/TODO2
-rw-r--r--perl-install/c/stuff.xs.pm2
-rw-r--r--perl-install/install2.pm9
-rw-r--r--perl-install/install_any.pm6
-rw-r--r--perl-install/install_steps.pm5
5 files changed, 17 insertions, 7 deletions
diff --git a/docs/TODO b/docs/TODO
index 02f4d6fb9..adcb34de7 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -15,6 +15,8 @@ text install
(pix)Tree -> CTree, ``all'' branch with all packages
+install postfix in place of sendmail for security levels 4&5
+
update the list of modules (in update_kernel)
merge the install(1) of redhat
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index c7b0ed82e..a3317b76b 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -558,7 +558,7 @@ headerGetEntry_string_list(h, query)
[ qw(int S_IFCHR S_IFBLK KDSKBENT KT_SPEC NR_KEYS MAX_NR_KEYMAPS BLKRRPART TIOCSCTTY
HDIO_GETGEO BLKGETSIZE
MS_MGC_VAL MS_RDONLY O_NONBLOCK SECTORSIZE WNOHANG
- VT_ACTIVATE VT_WAITACTIVE VT_GETSTATE CDROM_LOCKDOOR
+ VT_ACTIVATE VT_WAITACTIVE VT_GETSTATE CDROM_LOCKDOOR CDROMEJECT
) ],
);
push @macros, [ qw(int RPMTAG_NAME RPMTAG_GROUP RPMTAG_SIZE RPMTAG_VERSION RPMTAG_SUMMARY RPMTAG_DESCRIPTION RPMTAG_RELEASE RPMTAG_ARCH RPMTAG_FILENAMES RPMTAG_OBSOLETES) ]
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e1deac204..ed506f7d9 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -181,8 +181,8 @@ $o = $::o = {
steps => \%installSteps,
orderedSteps => \@orderedInstallSteps,
-#-GOLD base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
- base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
+ base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
+#-GOLD base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
#- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
#- intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
@@ -312,11 +312,12 @@ sub formatPartitions {
unless ($::testing) {
$o->formatPartitions(@{$o->{fstab}});
- fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
+ fs::mount_all([ grep { isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
+ die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024;
+ fs::mount_all([ grep { isExt2($_) } @{$o->{fstab}} ], $o->{prefix});
}
eval { $o = $::o = install_any::loadO($o) } if $_[1] == 1;
- die _("Not enough swap to fulfill installation, please add some") if availableMemory < 40 * 1024;
}
mkdir "$o->{prefix}/$_", 0755 foreach
qw(dev etc etc/profile.d etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ed87b688a..2326edaa1 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -334,10 +334,14 @@ sub killCardServices {
$pid and kill(15, $pid); #- send SIGTERM
}
-sub unlockCdroms {
+sub unlockCdroms() {
ioctl detect_devices::tryOpen($_->{device}), c::CDROM_LOCKDOOR(), 0
foreach detect_devices::cdroms();
}
+sub ejectCdrom() {
+ ioctl detect_devices::tryOpen($_), c::CDROMEJECT(), 1
+ foreach map { first split } grep { m|/tmp/rhimage| } cat_("/proc/mounts");
+}
sub setupFB {
my ($o, $vga) = @_;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 077b90376..3ec11a021 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -452,7 +452,10 @@ sub miscellaneous {
}
#------------------------------------------------------------------------------
-sub exitInstall { install_any::unlockCdroms }
+sub exitInstall {
+ install_any::unlockCdroms;
+ install_any::ejectCdrom;
+}
#-######################################################################################
#- Wonderful perl :(