summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-21 18:42:28 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-21 18:42:28 +0000
commite1db87b9b9e4a582e106fb9f24e6be21c8fa0917 (patch)
tree15f651db405961c6249524848702e4f656bb28c3
parent636afb483acfe3dd3f668b88cd484f10a8fa3e20 (diff)
downloaddrakx-e1db87b9b9e4a582e106fb9f24e6be21c8fa0917.tar
drakx-e1db87b9b9e4a582e106fb9f24e6be21c8fa0917.tar.gz
drakx-e1db87b9b9e4a582e106fb9f24e6be21c8fa0917.tar.bz2
drakx-e1db87b9b9e4a582e106fb9f24e6be21c8fa0917.tar.xz
drakx-e1db87b9b9e4a582e106fb9f24e6be21c8fa0917.zip
no_comment
-rw-r--r--docs/README29
-rw-r--r--perl-install/install_steps_interactive.pm4
-rw-r--r--perl-install/modules.pm4
-rw-r--r--perl-install/share/compssList2
-rw-r--r--perl-install/share/list1
-rwxr-xr-xperl-install/standalone/draksec4
-rw-r--r--tools/.cvsignore1
-rw-r--r--tools/Makefile9
-rw-r--r--tools/xhost+.c11
9 files changed, 32 insertions, 33 deletions
diff --git a/docs/README b/docs/README
index 5f7376872..b38d47b3e 100644
--- a/docs/README
+++ b/docs/README
@@ -192,27 +192,8 @@ to give it the complete path.
********************************************************************************
* Making screenshots ***********************************************************
********************************************************************************
-you can use Xnest and export the install display. The problem is to get the
-proper fonts. One solution is:
-- modify your /etc/X11/fs/config:
-- move /usr/X11R6/lib/X11/fonts to /usr/X11R6/lib/X11/fonts2
-- tell xfs to take this into account
-- install DrakX's fonts in /usr/X11R6/lib/X11/fonts/misc
-- makes Xnest happy by adding the directories it needs
-- launch Xnest
-- do a network install giving ``linux display=YOUR_IP:1''
-- takes the screenshots!!
-
-perl -pi -e 's|(/usr/X11R6/lib/X11/fonts)|${1}2|' /etc/X11/fs/config
-cd /usr/X11R6/lib/X11 ; mv fonts fonts2
-killall -USR1 xfs
-(
- cd /usr/X11R6/lib/X11
- mkdir fonts
- cp -a $MIRROR_ROOT/Mandrake/mdkinst/usr/X11R6/lib/X11/fonts misc
- for i in 100dpi 75dpi Speedo TrueType Type1; do ln -s misc $i; done
-)
-Xnest -name Xnest -geometry 640x480 :1 &
-
-# with DISPLAY=:0
-xwd -name Xnest | convert - screenshot.png
+On a test machine, make a network install, switch to console (ctrl-alt-F2), enter:
+% xhost+
+
+then, on another computer:
+% DISPLAY=test_machine:0 xwd -root | convert - screenshot.png
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1a7dc1a48..1d6bf4c0c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -935,9 +935,9 @@ sub setup_thiskind {
my @r = $o->load_module($type) or return;
push @l, \@r;
} else {
- eval { commands::modprobe("isapnp") };
+ #-eval { commands::modprobe("isapnp") };
require pci_probing::main;
- $o->ask_warn('', [ pci_probing::main::list(), scalar cat_("/proc/isapnp") ]);
+ $o->ask_warn('', [ pci_probing::main::list() ]); #-, scalar cat_("/proc/isapnp") ]);
}
}
}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 1c788e505..645825a0a 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -115,7 +115,6 @@ my @drivers_by_category = (
"a100u2w" => "a100u2w",
"atp870u" => "atp870u (Acard/Artop)",
"dc395x_trm" => "dc395x_trm",
- "ide-scsi" => "ide-scsi",
"psi240i" => "psi240i",
"qlogicfc" => "qlogicfc",
"sim710" => "sim710",
@@ -132,7 +131,6 @@ my @drivers_by_category = (
"eata" => "EATA SCSI PM2x24/PM3224",
"eata_pio" => "EATA PIO Adapters",
"eata_dma" => "EATA DMA Adapters",
- "st" => "st",
"ppa" => "Iomega PPA3 (parallel port Zip)",
"imm" => "Iomega Zip (new driver)",
}],
@@ -248,7 +246,9 @@ my @drivers_by_category = (
"vfat" => "vfat",
}],
[ 'other', {
+ "st" => "st",
"sg" => "sg",
+ "ide-scsi" => "ide-scsi",
"loop" => "Loopback device",
"lp" => "Parallel Printer",
"ide-floppy" => "ide-floppy",
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 161bef2c0..b26ce6a71 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -346,7 +346,7 @@ kweather 72 0 59
kwvdial 73 0 56
ltrace 10 0 0
ld.so 0 0 94
-lftp 80 35 58
+lftp 78 78 83
lha 40 0 72
libc 10 15 75
libelf 10 15 80
diff --git a/perl-install/share/list b/perl-install/share/list
index 66887047d..d9329a80d 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -54,7 +54,6 @@
/usr/lib/perl5/5.00503/vars.pm
/usr/lib/perl5/site_perl/5.005/i386-linux/Gtk.pm
/usr/lib/perl5/site_perl/5.005/i386-linux/Gtk/Types.pm
-/usr/lib/perl5/site_perl/5.005/i386-linux/Gtk/XmHTML.pm
/usr/lib/perl5/site_perl/5.005/i386-linux/Net/Cmd.pm
/usr/lib/perl5/site_perl/5.005/i386-linux/Net/Config.pm
/usr/lib/perl5/site_perl/5.005/i386-linux/Net/FTP.pm
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 2eb11319c..8e17f8c54 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -26,7 +26,9 @@ my %m = reverse (my %l = (
));
delete @l{0,1,5} unless $::expert;
-if (my $level = $in->ask_from_list('', _("Choose security level"), [ values %l ], $l{$ENV{SECURE_LEVEL}})) {
+if (my $level = $in->ask_from_list('',
+_("Choose security level"),
+ [ values %l ], $l{$ENV{SECURE_LEVEL}})) {
my $w = $in->wait_message('', _("Setting security level"));
$in->suspend;
diff --git a/tools/.cvsignore b/tools/.cvsignore
index e570b13fa..21a6d396b 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -1,2 +1,3 @@
rpm2header
gendepslist
+xhost+
diff --git a/tools/Makefile b/tools/Makefile
index fec667eff..654345ef8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,17 +3,22 @@ DEST = $(ROOTDEST)/Mandrake/mdkinst
RPMS = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
DIRS = ddcprobe pnp_serial
BASE = $(ROOTDEST)/Mandrake/base
+CFLAGS = -Wall
.PHONY: clean install $(DIRS)
-all: $(BASE)/depslist $(BASE)/hdlist $(DIRS) install
+all: $(BASE)/depslist $(BASE)/hdlist $(DIRS) install
$(DIRS):
make -C $@
install:
- $(MAKE) gendepslist rpm2header
+ $(MAKE) gendepslist rpm2header xhost+
install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
+ install -s xhost+ $(DEST)/usr/bin
+
+xhost+: %: %.c
+ $(CC) $(CFLAGS) $< -L/usr/X11R6/lib -lX11 -o $@
gendepslist: %: %.cc
$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
diff --git a/tools/xhost+.c b/tools/xhost+.c
new file mode 100644
index 000000000..58781274e
--- /dev/null
+++ b/tools/xhost+.c
@@ -0,0 +1,11 @@
+#include <stdlib.h>
+#include <X11/Xlib.h>
+
+
+int main(int argc, char **argv) {
+ Display *d = XOpenDisplay(getenv("DISPLAY") ? getenv("DISPLAY") : ":0");
+ if (d == NULL) exit(1);
+ XDisableAccessControl(d);
+ XCloseDisplay(d);
+ exit(0);
+}