summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Makefile4
-rw-r--r--perl-install/Makefile.drakxtools2
-rw-r--r--perl-install/install_any.pm7
-rw-r--r--perl-install/share/aliases2
4 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 80ff66f1f..5c75921e3 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -10,7 +10,7 @@ STAGE2 = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
BASE = $(ROOTDEST)/Mandrake/base
DESTREP4PMS = $(DEST)$(REP4PMS)
PERL = perl
-LOCALFILES = ../tools/ddcprobe/ddcxinfos pnp_serial
+LOCALFILES = ../tools/ddcprobe/ddcxinfos ../tools/e2fsck.shared pnp_serial
LOCALFILES2 = extract_archive
DIRS = c Newt po pci_probing resize_fat
EXCLUDE = $(LOCALFILES) boot.img keymaps consolefonts install
@@ -33,7 +33,7 @@ tar-drakxtools: clean
$(MAKE) -C ../tools clean
cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe drakxtools
cd ../drakxtools ; rm -rf install* ForMakefile.pm pkgs.pm ftp.pm t.pm standalone/CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* .
- cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe po pci_probing resize_fat diskdrake diskdrake.rc XFdrake mousedrake lspcidrake *.pm)
+ cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile MonitorsDB Newt c ddcprobe po pci_probing resize_fat diskdrake diskdrake.rc XFdrake mousedrake lspcidrake printerdrake *.pm)
cd .. ; rm -rf drakxtools
$(DIRS):
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 67af371bb..5aa8f99c1 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -16,7 +16,7 @@ $(DIRS):
install:
install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(LIBDEST) $(X11DEST) $(DIRS:%=$(LIBDEST)/%)
- install diskdrake XFdrake mousedrake lspcidrake $(SBINDEST)
+ install diskdrake XFdrake mousedrake lspcidrake printerdrake $(SBINDEST)
install -s ddcprobe/ddcxinfos $(SBINDEST)
for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 52731da54..02752b381 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -397,9 +397,10 @@ sub g_auto_install(;$) {
exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade manualFstab nomouseprobe); #- TODO modules bootloader
- my $card = $::o->{X}{card};
- $o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
- $o->{X}{card}{resolution_wanted} = join "x", @{$card->{depth}{$card->{default_depth}}[0]};
+ if (my $card = $::o->{X}{card}) {
+ $o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
+ $o->{X}{card}{resolution_wanted} = join "x", @{$card->{depth}{$card->{default_depth}}[0]};
+ }
#- local $o->{partitioning}{clearall} = 1;
diff --git a/perl-install/share/aliases b/perl-install/share/aliases
index 516733eea..674c956eb 100644
--- a/perl-install/share/aliases
+++ b/perl-install/share/aliases
@@ -3,3 +3,5 @@ sh ash
install2 perl-install/install2
commands perl-install/commands
runinstall2 install2
+e2fsck e2fsck.shared
+fsck.ext2 e2fsck.shared