From 068d599562888a36a50e5bbdeb8b70f83fa7c287 Mon Sep 17 00:00:00 2001
From: Mystery Man <unknown@mandriva.org>
Date: Tue, 7 Aug 2001 17:40:36 +0000
Subject: This commit was manufactured by cvs2svn to create branch
 'v_webmin_0_87'.

---
 rescue/.cvsignore              |   2 -
 rescue/Makefile                |  14 -
 rescue/aliases                 |   4 -
 rescue/dirs                    |   7 -
 rescue/drvinst                 |  70 ----
 rescue/guessmounts             |  83 ----
 rescue/kernel_read_part.c      |  26 --
 rescue/list                    | 141 -------
 rescue/list.alpha              |   2 -
 rescue/list.i386               |  10 -
 rescue/list.ppc                |  11 -
 rescue/list.sparc              |   3 -
 rescue/make_rescue_img         | 102 -----
 rescue/tree/bin/insmod         |   3 -
 rescue/tree/bin/login          |   2 -
 rescue/tree/boot/grub/menu.lst |   5 -
 rescue/tree/etc/fstab          |   4 -
 rescue/tree/etc/group          |   1 -
 rescue/tree/etc/host.conf      |   2 -
 rescue/tree/etc/hosts          |   1 -
 rescue/tree/etc/inittab        |  14 -
 rescue/tree/etc/issue          |  26 --
 rescue/tree/etc/oem            | 831 -----------------------------------------
 rescue/tree/etc/passwd         |   3 -
 rescue/tree/etc/profile        |  24 --
 rescue/tree/etc/rc.reboot      |   8 -
 rescue/tree/etc/rc.sysinit     |  48 ---
 rescue/tree/etc/resolv.conf    |   2 -
 rescue/tree/sbin/fakeshutdown  |  39 --
 rescue/tree/sbin/modprobe      |  40 --
 rescue/tree/usr/lib/CVS.       |   0
 31 files changed, 1528 deletions(-)
 delete mode 100644 rescue/.cvsignore
 delete mode 100644 rescue/Makefile
 delete mode 100644 rescue/aliases
 delete mode 100644 rescue/dirs
 delete mode 100755 rescue/drvinst
 delete mode 100755 rescue/guessmounts
 delete mode 100644 rescue/kernel_read_part.c
 delete mode 100644 rescue/list
 delete mode 100644 rescue/list.alpha
 delete mode 100644 rescue/list.i386
 delete mode 100644 rescue/list.ppc
 delete mode 100644 rescue/list.sparc
 delete mode 100755 rescue/make_rescue_img
 delete mode 100755 rescue/tree/bin/insmod
 delete mode 100755 rescue/tree/bin/login
 delete mode 100644 rescue/tree/boot/grub/menu.lst
 delete mode 100644 rescue/tree/etc/fstab
 delete mode 100644 rescue/tree/etc/group
 delete mode 100644 rescue/tree/etc/host.conf
 delete mode 100644 rescue/tree/etc/hosts
 delete mode 100644 rescue/tree/etc/inittab
 delete mode 100644 rescue/tree/etc/issue
 delete mode 100755 rescue/tree/etc/oem
 delete mode 100644 rescue/tree/etc/passwd
 delete mode 100644 rescue/tree/etc/profile
 delete mode 100755 rescue/tree/etc/rc.reboot
 delete mode 100755 rescue/tree/etc/rc.sysinit
 delete mode 100644 rescue/tree/etc/resolv.conf
 delete mode 100755 rescue/tree/sbin/fakeshutdown
 delete mode 100755 rescue/tree/sbin/modprobe
 delete mode 100644 rescue/tree/usr/lib/CVS.

(limited to 'rescue')

diff --git a/rescue/.cvsignore b/rescue/.cvsignore
deleted file mode 100644
index c1a06f76b..000000000
--- a/rescue/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-rescue_stage2.bz2
-kernel_read_part
diff --git a/rescue/Makefile b/rescue/Makefile
deleted file mode 100644
index 59de38f3d..000000000
--- a/rescue/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst sparc%,sparc,$(ARCH))
-
-
-ROOTDEST = /export
-
-install: rescue_stage2.bz2
-	cp -f $< $(ROOTDEST)/Mandrake/base
-
-rescue_stage2.bz2: kernel_read_part list list.$(ARCH) drvinst guessmounts make_rescue_img
-	./make_rescue_img
-
-clean: 
-	rm -f rescue_stage2.bz2 kernel_read_part
diff --git a/rescue/aliases b/rescue/aliases
deleted file mode 100644
index c9118404a..000000000
--- a/rescue/aliases
+++ /dev/null
@@ -1,4 +0,0 @@
-/bin/zcat gzip
-/bin/gunzip gzip
-/bin/rpm /usr/bin/rpm-dynamic
-/bin/vi vim-minimal
\ No newline at end of file
diff --git a/rescue/dirs b/rescue/dirs
deleted file mode 100644
index 6ace88d5d..000000000
--- a/rescue/dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-/mnt/cdrom
-/mnt/disk
-/mnt/floppy
-/lib
-/tmp
-/modules
-/proc
diff --git a/rescue/drvinst b/rescue/drvinst
deleted file mode 100755
index 177f3cbde..000000000
--- a/rescue/drvinst
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-#
-# Copyright 2000 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-local $_ = join '', @ARGV;
-
-"@ARGV" =~ /-h/ and die "usage: drivers_install [drivertype1 drivertype2..]\n";
-
-
-sub pci_probe {
-    my @l;
-    foreach (`/usr/bin/lspcidrake`) {
-	push @l, do {
-	    if (/^(\S+)\s*: (.+) \[([^\]]+)/) {
-		{ driver => $1,  description => $2, type => $3 };
-	    } elsif (/^(\S+)\s*: (.+)/) {
-		{ driver => $1,  description => $2, type => 'NOT_DEFINED' };
-	    } else {
-		next;
-	    }
-	};
-    }
-    @l;
-}
-
-sub install_module($$) {
-    my ($driver, $descr) = @_;
-    print "Installing driver $driver (for \"$descr\")\n";
-    system("/sbin/modprobe", $driver) and print "\tfailed\n";
-}
-
-
-#- start
-foreach $card (pci_probe()) {
-    $card->{type} eq "DISPLAY_VGA" and next;
-    $card->{driver} eq "unknown" and next;
-    $card->{driver} =~ "Card:" and next;
-
-    if (!@ARGV || grep { $card->{type} =~ /$_/i } @ARGV) {
-	install_module($card->{driver}, $card->{description});
-    }
-}
-
-
-
-#-------------------------------------------------
-#- $Log$
-#- Revision 1.3  2001/03/29 11:33:28  gc
-#- test for "Card:" and not install, some videoboards are not reported as DISPLAY_VGA :-(
-#-
-#- Revision 1.2  2001/02/12 18:42:17  uid553
-#- pixelization
-#-
-#- Revision 1.1  2001/02/12 14:31:10  uid535
-#- - add lspci, lspcidrake, vim-minimal
-#- - better /etc/issue
-#- - better PS1
-#- - write embryonic tool (installation of detected drivers according to pci cards)
-#-
diff --git a/rescue/guessmounts b/rescue/guessmounts
deleted file mode 100755
index d148e7e26..000000000
--- a/rescue/guessmounts
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-#
-# Copyright 2001 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-
-sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l }
-
-
-#- start
-system('drvinst'); #- class2text seems broken, I can't detect easily only modules for SCSI storage :-(
-
-print "\nPlease wait, trying to find your root device...\n";
-
-my $target = '/mnt';
--d $target || mkdir($target) or die "couldn't create $target\n";
-
-
-my (undef, undef, @parts) = cat_('/proc/partitions');
-
-my @fstab;
-my $root;
-
-M: foreach (@parts) {
-    my $dev = (split)[3] or next;
-    $dev = "/dev/$dev";
-
-    for my $fs ('ext2', 'reiserfs') {
-	my $where = $target;
-	if (!system("mount -t $fs $dev $where 2>/dev/null")) {
-	    if (-f "$where/etc/fstab") {
-		print "Found a probable root partition on $dev (type $fs)\n";
-		@fstab = cat_("$where/etc/fstab");
-		$root = $dev;
-		last M;
-	    } else {
-		system('umount', $where) and die "error unmounting $where\n";
-	    }
-	    last;
-	}
-    }
-}
-
-if ($root) {
-    print "\nMounting other partition from fstab on $target...\n";
-    foreach (@fstab) {
-	my ($dev, $where, $type, $opts) = split;
-	next if (!$type || $dev eq 'none' || $opts =~ /noauto/ ||
-                 $type =~ /^(supermount|swap|nfs)$/ ||
-                 $where eq '/' ||
-                 $where =~ m,proc|cdrom|floppy|/mnt/zip,
-		 );
-	$opts = join(',', grep { !/codepage=/ && !/iocharset/ } split(',', $opts)); #- vfat opts, we don't have the modules in rescue
-	$where = "$target$where";
-	-d $where || mkdir($where) or die "couldn't create $where\n";
-	print "Mounting $dev on $where type $type\n";
-	system("mount -t $type $dev $where -o $opts");
-    }
-    print "Your partitions are mounted on $target.\n".
-	  "For example you can use 'chroot $target' to simulate your system.\n".
-	  "(you can reinstall lilo that way if necessary).\n\n";
-}
-
-
-#-------------------------------------------------
-#- $Log$
-#- Revision 1.2  2001/06/10 22:41:21  prigaux
-#- pixelization (tested!)
-#-
-#- Revision 1.1  2001/06/10 21:08:33  gc
-#- - add 'guessmounts' that mimics RH's detecting of partitions when rescue starts
-#-
-#-
diff --git a/rescue/kernel_read_part.c b/rescue/kernel_read_part.c
deleted file mode 100644
index 279dfe787..000000000
--- a/rescue/kernel_read_part.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdio.h>
-#include <sys/mount.h>
-#include <fcntl.h>
-
-void die(char *msg)
-{
-  perror(msg);
-  exit(1);
-}
-
-void kernel_read(char *dev)
-{
-  int fd;
-  if ((fd = open(dev, O_RDONLY)) == -1) die("can't open device");
-  ioctl(fd, BLKRRPART, 0);
-  close(fd);
-}
-
-int main(int argc, char **argv) 
-{
-  if (argc != 2) {
-    fprintf(stderr, "usage: kernel_read_part <hard drive device>\n");
-    exit(1);
-  }
-  kernel_read(argv[1]);
-}
diff --git a/rescue/list b/rescue/list
deleted file mode 100644
index eea7dd1b9..000000000
--- a/rescue/list
+++ /dev/null
@@ -1,141 +0,0 @@
-/bin/bash
-/bin/cat
-/bin/chmod
-/bin/chown
-/bin/cp
-/bin/date
-/bin/dd
-/bin/df
-/bin/dmesg
-/bin/false
-/bin/grep
-/bin/gzip
-/usr/bin/bzip2
-/usr/bin/bunzip2
-/usr/bin/bzcat
-/usr/bin/packdrake
-/usr/bin/parsehdlist
-/bin/hostname
-/bin/kill
-/bin/ln
-/bin/loadkeys
-/usr/bin/du
-/usr/lib/kbd
-/bin/ls
-/bin/mkdir
-/bin/mknod
-/bin/mount
-/bin/mount
-/bin/mv
-/bin/ping
-/bin/ps
-/bin/pwd
-/bin/rm
-/bin/rmdir
-/bin/setserial
-/sbin/lsmod
-/bin/cpio
-/usr/bin/diff
-/bin/sh
-/bin/sleep
-/bin/sync
-/bin/touch
-/bin/true
-/bin/umount
-/dev/console
-/dev/fd[01]
-/dev/hd[a-h]*
-/dev/initctl
-/dev/kmem
-/dev/loop*
-/dev/mem
-/dev/null
-/dev/port
-/dev/ram*
-/dev/random
-/dev/scd*
-/dev/sd[a-h]*
-/dev/stderr
-/dev/stdin
-/dev/stdout
-/dev/tty
-/dev/ttyS[0-3]
-/dev/tty[0-9]
-/dev/urandom
-/dev/zero
-/etc/inputrc
-/etc/termcap
-/lib/libnss_files-*
-/lib/libnss_files.so.2
-/sbin/debugfs
-/sbin/e2fsck
-/sbin/fdisk
-/sbin/fsck.ext2
-/sbin/halt
-/sbin/ifconfig
-/sbin/init
-/sbin/insmod
-/sbin/ldconfig
-/sbin/mingetty
-/sbin/mkdosfs
-/sbin/mkfs.ext2
-/sbin/reboot
-/sbin/rmmod
-/sbin/shutdown
-/usr/bin/strace
-/sbin/route
-/sbin/mkswap
-/sbin/swapoff
-/sbin/swapon
-/sbin/tune2fs
-/sbin/update
-/usr/bin/cmp
-/usr/bin/cut
-/usr/bin/eject
-/usr/bin/fdformat
-/usr/bin/file
-/usr/bin/find
-/usr/bin/ftp
-/usr/bin/head
-/usr/bin/hexedit
-/usr/bin/less
-/usr/bin/loadkeys
-/usr/bin/reset
-/usr/bin/split
-/usr/bin/tail
-/usr/bin/tee
-/usr/bin/telnet
-/usr/bin/telnet
-/usr/bin/tset
-/usr/sbin/chroot
-/usr/sbin/parted
-/usr/sbin/traceroute
-/usr/share/magic
-/usr/share/terminfo/l/linux
-/var/run/utmp
-/sbin/killall5
-/usr/bin/perl
-/usr/bin/perl5
-/usr/bin/perlPERL_VERSION
-/bin/sort
-/usr/bin/md5sum
-/etc/protocols
-/etc/services
-/bin/rpm
-/sbin/mkraid
-/usr/lib/rpm/rpmrc
-/usr/lib/rpm/macros
-/usr/lib/perl5/PERL_VERSION/strict.pm
-/usr/lib/perl5/PERL_VERSION/vars.pm
-/usr/lib/perl5/PERL_VERSION/warnings/register.pm
-/usr/lib/perl5/PERL_VERSION/warnings.pm
-/usr/lib/perl5/PERL_VERSION/Carp.pm
-/usr/lib/perl5/PERL_VERSION/Exporter.pm
-/usr/bin/lspci
-/usr/share/pci.ids
-/usr/bin/lspcidrake
-/usr/share/ldetect-lst/pcitable
-/usr/share/ldetect-lst/usbtable
-/bin/vim-minimal
-/lib/libnss_dns.so.2
-/lib/libresolv.so.2
diff --git a/rescue/list.alpha b/rescue/list.alpha
deleted file mode 100644
index 4ab451f01..000000000
--- a/rescue/list.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/perl5/site_perl/PERL_VERSION/alpha-linux/packdrake.pm
-/sbin/sfdisk
diff --git a/rescue/list.i386 b/rescue/list.i386
deleted file mode 100644
index e977048ae..000000000
--- a/rescue/list.i386
+++ /dev/null
@@ -1,10 +0,0 @@
-/usr/sbin/ext2resize
-/sbin/rescuept
-/usr/sbin/grub
-/usr/sbin/grub-install
-/sbin/mkreiserfs
-/sbin/reiserfsck
-/sbin/sfdisk
-/boot/grub/stage[12]
-/usr/lib/perl5/PERL_VERSION/i386-linux/CORE/libperl.so
-/usr/lib/perl5/site_perl/PERL_VERSION/i386-linux/packdrake.pm
diff --git a/rescue/list.ppc b/rescue/list.ppc
deleted file mode 100644
index a3fddbfd9..000000000
--- a/rescue/list.ppc
+++ /dev/null
@@ -1,11 +0,0 @@
-/usr/lib/perl5/PERL_VERSION/ppc-linux/CORE/libperl.so
-/usr/lib/perl5/site_perl/PERL_VERSION/ppc-linux/packdrake.pm
-/sbin/pdisk
-/sbin/ybin
-/sbin/mkofboot
-/usr/local/lib/yaboot/ofboot
-/usr/local/lib/yaboot/yaboot
-/usr/local/sbin/ofpath
-/sbin/nvsetenv
-/dev/nvram
-/usr/bin/hformat
diff --git a/rescue/list.sparc b/rescue/list.sparc
deleted file mode 100644
index 4d5c9118e..000000000
--- a/rescue/list.sparc
+++ /dev/null
@@ -1,3 +0,0 @@
-/sbin/silo
-/sbin/sfdisk
-/usr/lib/perl5/site_perl/PERL_VERSION/sparc-linux/packdrake.pm
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
deleted file mode 100755
index 2ef35061b..000000000
--- a/rescue/make_rescue_img
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-use MDK::Common;
-use lib "../perl-install";
-use keyboard;
-use commands;
-
-use Config;
-Config->import;
-my ($arch) = $Config{archname} =~ /(.*)-/;
-
-$tmp = "/tmp/rescue_tmp";
-$mnt = "/tmp/rescue_stage2_img";
-$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1";
-$rescue = "rescue_stage2";
-
-if ($>) {
-    $sudo = "sudo";
-    $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
-}
-
-BEGIN { undef *_; }
-sub __ { print @_, "\n"; system(@_); }
-sub _ { __ @_; $? and die; }
-
-sub install_ {
-    return if -e "$tmp$_[0]";
-    my $d = dirname($_[0]);
-    commands::mkdir_("-p", "$tmp$d") unless -d "$tmp$d";
-    _ "$sudo cp $_[1] $_[0] $tmp$d";
-}
-sub install_lib { install_($_[0], "") }
-sub install { grep {/lib\w+.so/} @_ and install_lib(@_) or install_($_[0], "-a") }
-
-sub installown($$) {
-    my ($own, $dir) = @_;
-    return if -e "$tmp$dir$own";
-    commands::mkdir_("-p", "$tmp$dir") unless -d "$tmp$dir";
-    _ "$sudo cp -a $own $tmp$dir";
-}
-
-_ "$sudo rm -rf $tmp" if -e $tmp;
-_ "mkdir $tmp";
-_ 'find . -name "*~" | xargs rm -f';
-foreach (cat_("dirs")) {
-    chomp;
-    commands::mkdir_("-p", "$tmp$_");
-}
-_ "cp -a tree/* $tmp";
-_ "find $tmp -name 'CVS*' | xargs rm -rf";
-
-foreach (keyboard::loadkeys_files) {
-    install($_);
-    symlink "$2.kmap.gz", "$tmp$1/$3.kmap.gz" if m|(.*)/((..).+)\.kmap\.gz|;
-}
-unlink "$tmp/usr/lib/kbd/keymaps/i386/qwertz/fr.kmap.gz";
-
-my $perl_version = join ".", unpack "C3", $^V;
-@files = map { chomp; s/PERL_VERSION/$perl_version/g; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
-`ls @files`; 
-$? == 0 or exit 1;
-
-foreach (@files) {
-    install($_);
-    chomp, install_lib($_) foreach `ldd $_ 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//'`;
-}
-foreach (cat_("aliases")) {
-    chomp; my ($f, $dest) = split;
-    symlink $dest, "$tmp$f";
-}
-
-chomp($main = `cat ../all.kernels/.main`);
-
-_ "cp ../all.modules/modules.cz-$main $tmp/modules/modules.cz";
-_ "cp ../all.modules/$main/modules.dep $tmp/modules";
-
-installown("drvinst", "/usr/bin");
-installown("guessmounts", "/usr/bin");
-
-#_ "install -s kernel_read_part $tmp/sbin" if $arch =~ /i.86/;
-__ "$sudo strip $tmp/{lib,bin,sbin}/* $tmp/usr/{bin,sbin}/* 2>/dev/null";
-
-exit 0 if $ARGV[0];
-
-$size = `du -s $tmp | cut -f1` + 2048; #- add 2MB of free space
-
-commands::mkdir_("-p", $mnt) if !-e $mnt;
-__ "$sudo umount $rescue 2>/dev/null";
-
-_ "dd if=/dev/zero of=$rescue bs=1k count=$size";
-_ "$mke2fs $rescue";
-_ "$sudo mount -t ext2 $rescue $mnt -o loop";
-_ "rmdir $mnt/lost+found";
-
-_ "$sudo chown -R root.root $tmp";
-_ "$sudo cp -a $tmp/* $mnt";
-_ "$sudo rm -rf $tmp";
-
-_ "$sudo umount $rescue";
-_ "rmdir $mnt";
-
-_ "bzip2 -f -9 $rescue";
diff --git a/rescue/tree/bin/insmod b/rescue/tree/bin/insmod
deleted file mode 100755
index 717dc39e1..000000000
--- a/rescue/tree/bin/insmod
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo "Use modprobe instead"
-echo "Or even better use autoprobe"
diff --git a/rescue/tree/bin/login b/rescue/tree/bin/login
deleted file mode 100755
index 4b2816926..000000000
--- a/rescue/tree/bin/login
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /bin/bash --login
diff --git a/rescue/tree/boot/grub/menu.lst b/rescue/tree/boot/grub/menu.lst
deleted file mode 100644
index 1af0c85e3..000000000
--- a/rescue/tree/boot/grub/menu.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-timeout 0
-
-title oem
-kernel (hd0,0)/boot/vmlinuz ramdisk_size=32000 hd vga=788 fbeginner oem
-initrd (hd0,0)/boot/hd.rdz
diff --git a/rescue/tree/etc/fstab b/rescue/tree/etc/fstab
deleted file mode 100644
index fbafb7801..000000000
--- a/rescue/tree/etc/fstab
+++ /dev/null
@@ -1,4 +0,0 @@
-/dev/ram3 / ext2 defaults 1 1
-/dev/fd0 /mnt/floppy auto defaults,noauto 0 0
-none /proc proc defaults,noauto,ro 0 0
-/dev/cdrom /mnt/cdrom auto defaults,noauto 0 0
diff --git a/rescue/tree/etc/group b/rescue/tree/etc/group
deleted file mode 100644
index 5ba713c83..000000000
--- a/rescue/tree/etc/group
+++ /dev/null
@@ -1 +0,0 @@
-root::0:root
diff --git a/rescue/tree/etc/host.conf b/rescue/tree/etc/host.conf
deleted file mode 100644
index 1a8c1e151..000000000
--- a/rescue/tree/etc/host.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-order hosts,bind
-multi on
diff --git a/rescue/tree/etc/hosts b/rescue/tree/etc/hosts
deleted file mode 100644
index a9bbdee7f..000000000
--- a/rescue/tree/etc/hosts
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1		mandrake-rescue
diff --git a/rescue/tree/etc/inittab b/rescue/tree/etc/inittab
deleted file mode 100644
index 0348c66f4..000000000
--- a/rescue/tree/etc/inittab
+++ /dev/null
@@ -1,14 +0,0 @@
-#Inittab for Mandrake Rescue Disk
-#Author: Daouda Lo <daouda@mandrakesoft.com>
-id:3:initdefault:
-
-si::sysinit:/etc/rc.sysinit
-re:6:wait:/etc/rc.reboot
-ca:12345:ctrlaltdel:/sbin/fakeshutdown
-
-1:12345:respawn:/bin/bash --login
-2:23:respawn:/sbin/mingetty tty2
-3:23:respawn:/sbin/mingetty tty3
-4:23:respawn:/sbin/mingetty tty4
-5:23:respawn:/sbin/mingetty tty5
-6:23:respawn:/sbin/mingetty tty6
diff --git a/rescue/tree/etc/issue b/rescue/tree/etc/issue
deleted file mode 100644
index 55da5cd1e..000000000
--- a/rescue/tree/etc/issue
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-                      
-                                          
-                                       
-                                      
-                                        
-         `----'                               
-                      
-                      
-                      [2[1;37;4
-                      
-                      
-                      Mandrake Linux Rescue Disk
-                      
-                      
-                      
-                      
-
-
-Mandrake Linux release 8.1 (Cooker)
-
-Use loadkeys to change your keyboard layout (eg: loadkeys fr)
-Use modprobe to load modules (eg: modprobe snd-card-fm801)
-Use drvinst to install drivers according to detected devices
-
diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
deleted file mode 100755
index 7b471f0a6..000000000
--- a/rescue/tree/etc/oem
+++ /dev/null
@@ -1,831 +0,0 @@
-#!/usr/bin/perl
-
-if (shift(@ARGV) ne '-f') {
-    print "Call it with option -f, but don't fear loosing all your data, this command is dangerous!";
-    print "
-usage: /etc/oem -f [options]
-where [options] are:
-    server                          : allow server installalation
-    boot_entries=entry1,...,entryN  : set boot entries to use,
-                                      the first one is the default one
-    no<option>                      : disable options <option>
-";
-    exit 1;
-}
-my (%options, $yes, $hd, $cd);
-
-#- avoid globing as it is not available in rescue ramdisk.
-foreach my $device (split ' ', `/bin/ls -d /proc/ide/hd*`) {
-    open F, "$device/media" or next;
-    foreach (<F>) {
-	/disk/  and do { $hd ||= $device; $hd =~ s,/proc/ide/,,; };
-	/cdrom/ and do { $cd ||= $device; $cd =~ s,/proc/ide/,,; };
-    }
-    close F;
-}
-#- examine available SCSI devices (avoid SCSI floppies like LS-120 or ZIP disk or generic floppies).
-eval {
-    system "/usr/bin/drvinst"; #- load scsi drivers else it wont do anything.
-
-    my ($driveNum, $cdromNum) = (0, 0);
-    open F, "/proc/scsi/scsi" or die "no scsi available";
-    local $_ = <F>; /^Attached devices:/ or die "to attached devices found";
-    while ($_ = <F>) {
-	my ($id) = /^Host:.*?Id: (\d+)/ or die "no host found";
-	$_ = <F>; my ($vendor, $model) = /^\s*Vendor:\s*(.*?)\s+Model:\s*(.*?)\s+Rev:/ or die "no vendor nor model found";
-	$_ = <F>; my ($type) = /^\s*Type:\s*(.*)/;
-	if ($type =~ /Direct-Access/ && $model !~ /ZIP\s+\d+|LS-?120|144MB|[Ff]loppy/) {
-	    $hd ||= "sd" . chr($driveNum++ + ord('a'));
-	} elsif ($type =~ /CD-ROM/) {
-	    $cd ||= "scd" . $cdromNum++;
-	}
-    }
-};
--e "/dev/$hd" or die "unable to access hard disk";
-print "hd: $hd\ncd: $cd\n";
-
-#- find a cdrom (like) image, normally a true cdrom but if nfs install is running, use it instead.
-mkdir "/cdrom";
-open F, "/proc/cmdline";
-while (<F>) {
-    /automatic=method:nfs,.*server:([^\s,]*),.*directory:([^\s,]*)/
-      and system "mount", "-r", "-t", "nfs", "$1:$2", "/cdrom", "-o", "nolock";
-}
-close F;
-unless (-e "/cdrom/VERSION") {
-    -e "/dev/$cd" or die "unable to access local cdrom";
-    system "mount", "-r", "-t", "iso9660", "/dev/$cd", "/cdrom";
-}
-
-#- detect language used and default options.
-my ($lang, $flang);
-open F, "/cdrom/VERSION" or die "no installation cdrom found on $cd";
-while (<F>) {
-    /[\s-]fr/ and ($lang, $flang) = ("fr", "fr_FR");
-    /\[server\]/ and $options{server} = '';
-    /\[boot_entries[=:]([^]]*)\]/ and $options{boot_entries} = $1;
-}
-close F;
-foreach (@ARGV) { /^([^=:]*)[=:]?(.*)/ and $options{$1} = $2; /^no([^=:]*)/ and delete $options{$1} }
-
-#- default language fall to english ?
-$lang or ($lang, $flang) = ("en", "en_US");
-print "Found lang $lang\n";
-foreach (keys %options) {
-    print "Using option [$_" . ($options{$_} && "=$options{$_}") . "]\n";
-}
-
-#- check for already existing partition table, if none are found
-#- create 3 partitions (one for install, one for swap and one for root).
-#- if only a fat partition is found, resize it do include the above partition.
-#- other combination are really dangerous and are not supported, ask
-#- the user that all data on the disk will be erased and go on.
-my ($heads, $sectors, $cylinders, $hd_size, @hd_parts);
-sub correct_start_end {
-    my ($rstart, $end, $keep_start) = @_;
-    my ($cylinder_size, $c_start, $c_end) = ($sectors*$heads*512/1024/1024, undef, undef);
-    if (abs($cylinder_size*$cylinders-$hd_size)/$hd_size < 0.01) {
-	$c_start = $$rstart+($keep_start ? 0 : $cylinder_size/$heads);
-	$c_end = $cylinder_size*int(1/2+$end/$cylinder_size);
-	$c_end > $hd_size and $c_end = $hd_size;
-	$$rstart = $c_end;
-    } else {
-	$c_start = $$rstart;
-	$c_end = $end;
-	$c_end > $hd_size and $c_end = $hd_size;
-	$$rstart = $c_end+5; #- fall back to use a problable safe method.
-    }
-    $c_start >= $c_end and die "no space left for partitionning\n";
-    ($c_start, $c_end);
-}
-open F, "fdisk -l /dev/$hd |";
-while (<F>) {
-    /(\d+)\s*heads/ and $heads = $1;
-    /(\d+)\s*sectors/ and $sectors = $1;
-    /(\d+)\s*cylinders/ and $cylinders = $1;
-}
-close F;
-for (1..2) {
-    open F, "parted /dev/$hd -s print |";
-    while (<F>) {
-	/^Disk geometry [^:]*:\s*([\d\.]+)-([\d\.]+)/ and do { $hd_size = $2 - $1 };
-	#/^Disk label type:\s*msdos/ and do { $hd_type = 'msdos' };
-	/^(\d+)\s+([\d\.]+)\s+([\d\.]+)\s+(primary|logical|extended)\s*(\S*)/ and do {
-	    #- this automatically drops extended partition here!
-	    push @hd_parts, { minor => $1, start => $2, end => $3, type => $4, fstype => $5 };
-	};
-    }
-    close F;
-    $hd_size and last;
-    print "Unable to detect partition on disk, trying with new label\n";
-    do {
-	print "
-
-I'm going to install the OEM version on your hard drive
-!!ALL DATA WILL BE LOST!!
-
-Type \`\`yes'' and [enter] to go on\n"
-    } while (($yes = <STDIN>) !~ /^\s*yes\s*$/i);
-    system "parted", "/dev/$hd", "mklabel", "msdos";
-}
-my ($min_size, $def_size, $trigger_size, $inst_size, $swap_size) = (2100, 2700, 4000, 200, 128);
-$hd_size > $min_size or die "hard disk is too small to contain oem install (${hd_size}MB found, need $min_size at least)";
-
-my ($fat_pos, $resize_fat_size, $root_size);
-if (@hd_parts == 1 && $hd_parts[$fat_pos = 0]{fstype} eq 'FAT' ||
-    @hd_parts == 2 && $hd_parts[0]{type} eq 'primary' && $hd_parts[$fat_pos = 1]{fstype} eq 'FAT' ||
-    @hd_parts == 3 && $hd_parts[0]{type} eq 'primary' && $hd_parts[1]{type} eq 'primary' && $hd_parts[$fat_pos = 2]{fstype} eq 'FAT' ||
-    @hd_parts == 2 && $hd_parts[0]{type} eq 'extended' && $hd_parts[$fat_pos = 1]{fstype} eq 'FAT' ||
-    @hd_parts == 3 && $hd_parts[0]{type} eq 'extended' && $hd_parts[1]{type} eq 'primary' && $hd_parts[$fat_pos = 5]{fstype} eq 'FAT') {
-    if ($hd_size - $hd_parts[$fat_pos]{end} > $min_size) {
-	#- check first if there are some available space left on the disk.
-	#- so we are using it, root_size is fixed to match hard disk size.
-	$resize_fat_size = 0;
-	$root_size = $hd_size - $hd_parts[$fat_pos]{end} - $inst_size - $swap_size;
-	$root_size > $trigger_size and $root_size = $def_size;
-    } elsif ($hd_size > 2*$min_size) {
-	#- resize this fat partition.
-	$resize_fat_size = 0.5 * $hd_size;
-	$root_size = $hd_size - $resize_fat_size - $inst_size - $swap_size;
-	$root_size > $trigger_size and $root_size = $def_size;
-    }
-}
-unless ($root_size) {
-    #- there have not been defined above, so remove everything and start from
-    #- a blank partition.
-    $resize_fat_size = undef;
-    $root_size = $hd_size - $resize_fat_size - $inst_size - $swap_size;
-    $root_size > $trigger_size and $root_size = $def_size;
-}
-
-#- launch parted to edit partition table, start at minor.
-#- point define where we start.
-my $minor = defined $resize_fat_size && $hd_parts[0]{type} eq 'extended' ? 6 : 5;
-my $point = 0.0;
-
-if (defined $resize_fat_size) {
-    do {
-	print "
-
-!!An existing Windows partition has been found and will be kept.
-Additional Linux partitions will be created!!
-
-Type \`\`yes'' and [enter] to go on\n"
-    } while (($yes = <STDIN>) !~ /^\s*yes\s*$/i);
-    #- keep the current partition table, and try to resize the fat partition
-    #- if the size is not 0.
-    #- KEEP IN MIND there is only one partition defined.
-    open F, "| parted -s /dev/$hd";
-    if ($resize_fat_size) {
-	$point = $hd_parts[$fat_pos]{start};
-	printf F "resize %d %s %s\n", $hd_parts[$fat_pos]{minor}, correct_start_end(\$point, $point+$resize_fat_size, 'keepstart');
-    } else {
-	$point = $hd_parts[$fat_pos]{end};
-    }
-    $point+=9; #- keep blank space between partitions if parted cannot handle partition table correctly.
-} else {
-    unless (defined $yes) {
-	do {
-	    print "
-
-I'm going to install the OEM version on your hard drive
-!!ALL DATA WILL BE LOST!!
-
-Type \`\`yes'' and [enter] to go on\n"
-        } while (($yes = <STDIN>) !~ /^\s*yes\s*$/i);
-    }
-    #- build a new disk label here.
-    open F, "| parted -s /dev/$hd";
-    print F "mklabel msdos\n";
-}
-
-#- at this point, the partition are created.
-my ($instz, $inst, $swap, $root, $var, $home) = ($minor-1, $minor, $minor+1, $minor+2, undef, undef);
-
-#- all linux partition are stored inside an extended partition, this is easier to manipulate after.
-if ($minor == 5) {
-    print F "mkpart extended $point $hd_size\n";
-} else {
-    $hd_parts[0]{type} eq 'extended' or die "first partition assumed to be extended";
-    $point = $hd_parts[0]{start};
-    print F "resize $hd_parts[0]{minor} $point $hd_size\n";
-}
-printf F "mkpart logical ext2 %s %s\n", correct_start_end(\$point, $point+$inst_size);
-printf F "mkpart logical linux-swap %s %s\n", correct_start_end(\$point, $point+$swap_size);
-printf F "mkpart logical ext2 %s %s\n", correct_start_end(\$point, $point+$root_size);
-if (exists $options{server}) {
-    my $var_size = ($hd_size - $point) / 2;
-    if ($var_size > 1500) {
-	$var = $root+1;
-	printf F "mkpart logical ext2 %s %s\n", correct_start_end(\$point, $point+$var_size);
-    }
-}
-if ($hd_size - $point > 100) {
-    $home = ($var || $root) + 1;
-    printf F "mkpart logical ext2 %s %s\n", correct_start_end(\$point, $hd_size);
-}
-print F "quit\n";
-close F or die "unable to partition the disk $hd";
-
-#- we have to build swap and mount it.
-print "Setting swap\n";
-system "mkswap", "/dev/$hd$swap";
-system "swapon", "/dev/$hd$swap";
-
-#- we have 
-print "Formatting /dev/$hd$inst partition\n";
-system "mkfs.ext2", "/dev/$hd$inst";
-print "Formatting /dev/$hd$root partition\n";
-system "mkfs.ext2", "/dev/$hd$root";
-if ($var) {
-    print "Formatting /dev/$hd$var partition\n";
-    system "mkfs.ext2", "/dev/$hd$var";
-}
-if ($home) {
-    print "Formatting /dev/$hd$home partition\n";
-    system "mkfs.ext2", "/dev/$hd$home";
-}
-
-print "Mounting partitions\n";
-mkdir "/hd";
-system "mount", "-t", "ext2", "/dev/$hd$inst", "/hd";
-mkdir "/mnt";
-system "mount", "-t", "ext2", "/dev/$hd$root", "/mnt";
-if ($var) {
-    mkdir "/mnt/var";
-    system "mount", "-t", "ext2", "/dev/$hd$var", "/mnt/var";
-}
-if ($home) {
-    mkdir "/mnt/home";
-    system "mount", "-t", "ext2", "/dev/$hd$home", "/mnt/home";
-}
-
-print "Copying installation on hard drive\n";
-if (-e "/boot/vmlinuz" && -e "/boot/hd.rdz" || -e "/cdrom/boot/vmlinuz" && -e "/cdrom/boot/hd.rdz") {
-    system "cp", "-a", "/boot", "/cdrom/boot", "/hd";
-} else {
-    mkdir "/hd/boot";
-    unless (-e "/tmp/hd/vmlinuz" && -e "/tmp/hd/hd.rdz") {
-	system "cp", "/cdrom/images/hd.img", "/hd/hd.img";
-	mkdir "/tmp/hd";
-	system "modprobe", "loop";
-	system "mount", "/hd/hd.img", "/tmp/hd", "-o", "loop";
-    }
-    system "cp", "-a", "/tmp/hd/vmlinuz", "/tmp/hd/hd.rdz", "/hd/boot";
-}
-
-mkdir "/hd/Mandrake";
-mkdir "/hd/Mandrake/RPMS";
-system "cp", "-a", "/cdrom/VERSION", "/hd";
-system "cp", "-a", "/cdrom/Mandrake/base", "/cdrom/Mandrake/mdkinst", "/hd/Mandrake";
-
-if (open F, ">/hd/Mandrake/oem_patch.pl") {
-    print "Setting OEM specific extension to DrakX\n";
-    if (exists $options{server}) {
-	print F q{
-	    use install_steps;
-	    package install_steps;
-	    undef *choosePackages;
-	    *choosePackages = sub {
-		my ($o, $packages, $compssUsers, $first_time) = @_;
-
-		#- make sure we kept some space left for available else the system may
-		#- not be able to start (xfs at least).
-		my $available = install_any::getAvailableSpace($o);
-		my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
-
-		#- avoid destroying user selection of packages but only
-		#- for expert, as they may have done individual selection before.
-	        install_any::unselectMostPackages($o);
-
-		#- use specific OEM packages selection, go to level 4.
-		#- and select at least GAMES group, everything else has
-		#- already be selected during master preparation.
-		$o->{compssUsersChoice}{$_} = 0 foreach 'GNOME';
-		$o->{compssUsersChoice}{$_} = 0 
-		    foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station';
-		$o->{compssListLevel} = 5;
-	        pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $o->{compssListLevel}, $availableCorrected);
-
-		$availableCorrected;
-	    };
-	};
-    } else {
-	print F q{
-	    use install_steps;
-	    package install_steps;
-	    undef *choosePackages;
-	    *choosePackages = sub {
-		my ($o, $packages, $compssUsers, $first_time) = @_;
-
-		#- make sure we kept some space left for available else the system may
-		#- not be able to start (xfs at least).
-		my $available = install_any::getAvailableSpace($o);
-		my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
-
-		#- avoid destroying user selection of packages but only
-		#- for expert, as they may have done individual selection before.
-	        install_any::unselectMostPackages($o);
-
-		#- use specific OEM packages selection, go to level 4.
-		#- and select at least GAMES group, everything else has
-		#- already be selected during master preparation.
-		$o->{compssListLevel} = 4;
-		$o->{compssUsersChoice}{GAMES} = 1;
-	        pkgs::setSelectedFromCompssList($packages, $o->{compssUsersChoice}, $o->{compssListLevel}, $availableCorrected);
-
-		$availableCorrected;
-	    };
-	};
-    }
-    if ($options{boot_entries}) {
-	print "Setting OEM specific extension for boot entries\n";
-	print F q{
-	    my $sorted_entries = q(} . $options{boot_entries} . q{); #- insert boot_entries options here as string q(...).
-	    my $old_setupBootloaderBefore = \&setupBootloaderBefore;
-	    undef *setupBootloaderBefore;
-	    *setupBootloaderBefore = sub {
-		$old_setupBootloaderBefore->(@_);
-		my @entries = split ',', $sorted_entries;
-		my @result_entries;
-		foreach my $p (@entries) {
-		    foreach (@{$_[0]{bootloader}{entries}}) {
-			$_->{label} eq $p and push @result_entries, $_;
-		    }
-		}
-		if (@result_entries) {
-		    $_[0]{bootloader}{entries} = \@result_entries;
-		    $_[0]{bootloader}{default} = $result_entries[0]{label}; #- first image is default.
-		}
-	    };
-	};
-    }
-    close F;
-}
-
-print "Setting bootloader\n";
-mkdir "/hd/boot/grub";
-foreach (1..2) {
-    -e "/hd/boot/grub/stage$_" or system "cp", "-a", "/boot/grub/stage$_", "/hd/boot/grub";
-}
-open F, ">/hd/boot/grub/menu.lst";
-if (defined $resize_fat_size) {
-    print F "timeout 5\n";
-    print F "color black/cyan yellow/cyan\n\n";
-    print F "title linux\n";
-} else {
-    print F "timeout 0\n\n";
-    print F "title oem\n";
-}
-print F "kernel (hd0,$instz)/boot/vmlinuz ramdisk_size=32000 automatic=method:disk,disk:$hd,partition:$hd$inst,directory:/ hd vga=788 fbeginner flang=$flang oem defcfg=/tmp/hdimage/Mandrake/oem_patch.pl\n";
-print F "initrd (hd0,$instz)/boot/hd.rdz\n";
-#- if a windows partition is available, add an entrie for it.
-if (defined $resize_fat_size) {
-    print F "\ntitle windows\n";
-    printf F "rootnoverify (hd0,%s)\n", $hd_parts[$fat_pos]{minor}-1;
-    print F "makeactive\n";
-    print F "chainloader +1\n";
-}
-close F;
-open F, "| grub --device-map=/hd/boot/grub/device.map --batch";
-print F "install (hd0,$instz)/boot/grub/stage1 d (hd0) (hd0,$instz)/boot/grub/stage2 p (hd0,$instz)/boot/grub/menu.lst\n";
-print F "quit\n";
-close F or die "error while executing grub";
-
-my $packages = select_packages("/cdrom", $lang);
-
-my @media;
-open F, "/cdrom/Mandrake/base/hdlists";
-foreach (<F>) {
-    chomp;
-    s/\s*#.*$//;
-    /^\s*$/ and next;
-    m/^\s*(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file";
-
-    push @media, { rpmsdir => $2, descr => $3 };
-}
-close F;
-
-#- initialize installation.
-$ENV{DURING_INSTALL} = 1;
-$ENV{RPM_INSTALL_LANG} = "$flang:$lang";
-$ENV{LD_LIBRARY_PATH} = "/usr/X11R6/lib";
-$ENV{SECURE_LEVEL} = 2;
-foreach (qw(/etc /etc/sysconfig /etc/rpm /var /var/lib /var/lib/rpm /proc)) {
-    mkdir "/mnt/$_";
-}
-system "mount", "-t", "proc", "proc", "/mnt/proc";
-open F, ">/mnt/etc/fstab";
-print F "/dev/$hd$root / ext2 defaults 1 1\n";
-if ($var) {
-    print F "/dev/$hd$var /var ext2 defaults 1 2\n";
-}
-if ($home) {
-    print F "/dev/$hd$home /home ext2 defaults 1 2\n";
-}
-close F;
-open F, ">/mnt/etc/sysconfig/i18n";
-print F "LANG=$lang\n";
-print F "LANGUAGE=$flang:$lang\n";
-print F "LC_MESSAGES=$flang\n";
-close F;
-open F, ">/mnt/etc/rpm/macros";
-print F "%_install_langs $flang:$lang\n";
-close F;
-system "rpm", "--root", "/mnt", "--initdb";
-
-#- copy and install from each cd image.
-foreach my $medium (@media) {
-    while (! -d "/cdrom/$medium->{rpmsdir}") {
-	system "unmount", "/dev/$cd";
-	system "eject", "/dev/$cd";
-	print "Please insert the cdrom labeled \"$medium->{descr}\"\n  and press [enter] when done\n";
-	$yes = <STDIN>;
-	system "mount", "-r", "-t", "iso9660", "/dev/$cd", "/cdrom";
-    }
-
-    print "Copying packages from medium labeled \"$medium->{descr}\" to hard disk\n";
-    system "mkdir", "-p", "/hd/$medium->{rpmsdir}";
-    foreach my $pkg (@{$packages->{depslist}}) {
-	$pkg->{closure} && !$pkg->{selected} or next;
-	foreach (qw(i586 i486 i386 noarch)) {
-	    my $file = "/cdrom/$medium->{rpmsdir}/$pkg->{name}.$_.rpm";
-	    -e $file or next;
-	    print "  copying $pkg->{name}.$_.rpm\n";
-	    system "cp", "-a", $file, "/hd/$medium->{rpmsdir}";
-	    delete $pkg->{closure};
-	    last;
-	}
-    }
-
-    print "Installing packages from medium labeled \"$medium->{descr}\"\n";
-    if (my $pkg = pkgs::packageByName($packages, 'glibc')) { #- HACK FOR GLIBC
-	if (delete $pkg->{selected}) {
-	    foreach (qw(i586 i486 i386 noarch)) {
-		my $file = "/cdrom/$medium->{rpmsdir}/$pkg->{name}.$_.rpm";
-		-e $file or next;
-		system "rpm", "--root", "/mnt", "--nodeps", "--force", "--noscripts", "-ivh", $file;
-		last; #- update glibc twice, in case.
-	    }
-	}
-    } else {
-	die "no glibc package found";
-    }
-    my @files;
-    foreach my $pkg (@{$packages->{depslist}}) {
-	$pkg->{selected} or next;
-	foreach (qw(i586 i486 i386 noarch)) {
-	    my $file = "/cdrom/$medium->{rpmsdir}/$pkg->{name}.$_.rpm";
-	    -e $file or next;
-	    push @files, $file;
-	    delete $pkg->{selected};
-	    last;
-	}
-    }
-    system "rpm", "--root", "/mnt", "--nodeps", "--force", "-ivh", @files;
-    print "Installed " . scalar(@files) . " packages\n";
-
-    scalar(grep { $_->{selected} || $_->{closure} } @{$packages->{depslist}}) == 0 and last;
-}
-
-#- try to figure out if a oem-message-graphic already exists.
-#- if this is the case, rename it to /mnt/boot/message-graphic
-if (-e "/cdrom/Mandrake/base/oem-message-graphic") {
-    print "Using specific oem graphic image\n";
-    if (-e "/mnt/boot/message-graphic") {
-	rename "/mnt/boot/message-graphic", "/mnt/boot/message-graphic.old";
-	system "cp", "-a", "/cdrom/Mandrake/base/oem-message-graphic", "/mnt/boot/message-graphic";
-    } elsif (-e "/mnt/boot/lilo-graphic/message") {
-	rename "/mnt/boot/lilo-graphic/message", "/mnt/boot/lilo-graphic/message.old";
-	system "cp", "-a", "/cdrom/Mandrake/base/oem-message-graphic", "/mnt/boot/lilo-graphic/message";
-    }
-}
-
-system "umount", "/mnt/proc";
-system "umount", "-a", "-f", "-t", "noproc";
-system "eject", "/dev/$cd";
-
-print "
-Done. OEM hard drive ready!
-The hard drive is now ready for a customer.
-System is now halted.\n\n";
-
-system "halt";
-
-#- provide package fullname that have to be installed and copied.
-sub select_packages {
-    my ($dir, $lang) = @_;
-    my $o = { packages => read_depslist("$dir/Mandrake/base/depslist.ordered") };
-
-    #- DO NOT FORGET TO UPDATE HERE ACCORDING TO gi/perl-install/install_any.pm
-    my @pkgs = qw(XFree86 XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa
-		  dhcpcd pump dhcpxd dhcp-client isdn4net isdn4k-utils dev pptp-adsl-fr rp-pppoe ppp ypbind
-		  rhs-printfilters lpr cups cups-drivers samba ncpfs ghostscript-utils autologin
-		  kernel-pcmcia-cs apmd cdrecord rio500
-                 );
-    push @pkgs, "XFree86-$_" foreach qw(3DLabs 3dfx 8514 AGX FBDev I128 Mach8 Mach32 Mach64 Mono P9000 Rage128 S3 S3V SVGA VGA16 W32);
-    foreach (@pkgs) {
-	my $pkg = pkgs::packageByName($o->{packages}, $_);
-	$pkg and pkgs::selectPackage($o->{packages}, $pkg);
-    }
-    foreach my $pkg (@{$o->{packages}{depslist}}) {
-	$pkg->{name} =~ /NVIDIA/ and pkgs::selectPackage($o->{packages}, $pkg);
-    }
-    foreach my $pkg (@{$o->{packages}{depslist}}) {
-	delete $pkg->{selected} and $pkg->{closure} = 1;
-    }
-    foreach (qw(Mesa-common xpp libqtcups2 qtcups kups)) {
-	my $pkg = pkgs::packageByName($o->{packages}, $_);
-	$pkg and $pkg->{closure} = 1;
-    }
-
-    #- act as DrakX will do to select packages.
-    pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die "no basesystem package found");
-    pkgs::read_rpmsrate($o->{packages}, install_any::getFile("Mandrake/base/rpmsrate") || die "unable to read rpmsrate");
-    ($o->{compssUsers}, $o->{compssUsersSorted}, $o->{compssUsersIcons}, $o->{compssUsersDescr}) = 
-      pkgs::readCompssUsers($o->{packages}, $o->{meta_class});
-    eval { install_any::getFile("XXX") }; #- close out any still opened filehandle..
-
-    if (exists $options{server}) {
-	foreach (qw(KDE ACCESSIBILITY PUBLISHING CUPS EDITORS TEXT_TOOLS COMMUNICATIONS TERMINALS
-		    NETWORKING_FILE_TRANSFER NETWORKING_OTHER
-		    NETWORKING_FILE_TRANSFER_SERVER NETWORKING_FIREWALLING_SERVER
-		    NETWORKING_MAIL_SERVER NETWORKING_OTHER_SERVER
-		    NETWORKING_REMOTE_ACCESS NETWORKING_REMOTE_ACCESS_SERVER NETWORKING_DNS
-		    NETWORKING_FILE NETWORKING_FILE_SERVER NETWORKING_WWW NETWORKING_WWW_SERVER
-		    ARCHIVING DEVELOPMENT MONITORING FILE_TOOLS CONFIG BOOKS SYSTEM)) {
-	    $o->{compssUsersChoice}{$_} = 1;
-	}
-	#- additional packages to be selected for server, databases with MySQL (avoid rpmsrate modifications).
-	foreach (qw(MySQL-client MySQL-shared MySQL perl-Mysql)) {
-	    my $pkg = pkgs::packageByName($o->{packages}, $_);
-	    $pkg and pkgs::selectPackage($o->{packages}, $pkg);
-	}
-    } else {
-	$o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}} } @{$o->{compssUsersSorted}};
-	$o->{compssUsersChoice}{SYSTEM} = 1;
-	@{$o->{compssUsersChoice}}{grep { /SERVER|DATABASES/ } keys %{$o->{compssUsersChoice}}} = ();
-    }
-
-    my $lang_pkg = $lang && pkgs::packageByName($o->{packages}, "locales-$lang");
-    if ($lang_pkg) {
-	pkgs::selectPackage($o->{packages}, $lang_pkg);
-	$o->{compssUsersChoice}{qq(LOCALES"$lang")} = 1;
-	$o->{compssUsersChoice}{qq(LOCALES"$flang")} = 1;
-    }
-
-    pkgs::setSelectedFromCompssList($o->{packages}, $o->{compssUsersChoice}, 4, 0);
-
-    #- package that have to selected here as a bonus for oem install.
-    foreach (qw(cups cups-drivers drakprofile draksync numlock raidtools reiserfs-utils icewm-light
-		Mesa Mesa-demos alsa alsa-utils
-		xawtv kwintv xscreensaver-gl Mesa-demos xmms-mesa bzflag csmash gltron spacecup chromium tuxracer
-                glibc vim-minimal kernel kernel22
-		sox aumix xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen
-               )) {
-	my $pkg = pkgs::packageByName($o->{packages}, $_);
-	$pkg and pkgs::selectPackage($o->{packages}, $pkg);
-    }
-
-    #- special packages that are to be move to closure always ...
-    foreach (qw(kernel-smp kernel-linus kernel-secure hackkernel-smp hackkernel-linus hackkernel-secure
-		xawtv kwintv xscreensaver-gl xmms-mesa bzflag csmash gltron spacecup chromium tuxracer
-		kernel22-smp kernel22-secure alsa imwheel nfs-utils-clients lvm usbd reiserfsprogs
-		sox aumix xawtv gatos kwintv sane-frontends gphoto gnome-toaster gcombust xcdroast apmd cdlabelgen
-		), exists $options{server} ? qw(Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib) : ()) {
-	my $pkg = pkgs::packageByName($o->{packages}, $_);
-	$pkg and $pkg->{closure} = 1, delete $pkg->{selected};
-    }
-
-    $o->{packages};
-}
-
-sub chop_version($) {
-    ($_[0] =~ /(.*)-[^-]+-[^-]+/)[0] || $_[0];
-}
-
-sub read_depslist {
-    my ($file) = @_;
-    my $packages = { depslist => [], names => {} };
-
-    #- read depslist.oredered file.
-    my $id = 0;
-
-    open F, "$file" or die "unable to open ordered dependencies list file";
-    while (<F>) {
-	my ($name, $size, @deps) = split;
-	push @{$packages->{depslist}}, { id => $id++, name => $name, size => $size, deps => \@deps };
-    }
-    close F;
-
-    foreach (@{$packages->{depslist}}) {
-	$packages->{names}{chop_version($_->{name})} = $_;
-    }
-
-    print STDERR "read " . scalar(@{$packages->{depslist}}) . " package dependancies\n";
-    $packages;
-}
-
-#- compability method for the below ones, wrap DrakX code extracted.
-package log;
-sub l {}
-
-package detect_devices;
-sub matching_desc { 0 }
-
-package install_any;
-sub getFile { open FILE, "/cdrom/$_[0]" or return; \*FILE }
-
-package pkgs;
-sub formatXiB { $_[0] } #- NOP
-sub packageName { ::chop_version($_[0]{name}) }
-sub packageSize { $_[0]{size} }
-sub packageDepsId { @{$_[0]{deps}} }
-sub packageRate { $_[0]{values}[0] }
-sub packageRateRFlags { @{$_[0]{values}} }
-sub packageSetRateRFlags {
-    my ($pkg, @rate_rflags) = @_;
-    $pkg->{values} = [ @rate_rflags ];
-}
-sub packageByName {
-    my ($packages, $name) = @_;
-    $packages->{names}{$name};
-}
-sub packageById {
-    my ($packages, $id) = @_;
-    $packages->{depslist}[$id];
-}
-sub selectedSize {
-    my ($packages) = @_;
-    my $size = 0;
-    foreach (@{$packages->{depslist}}) {
-	$_->{selected} and $size += $_->{size};
-    }
-    $size;
-}
-my @preferred = qw(perl-GTK postfix wu-ftpd ghostscript-X vim-minimal kernel ispell-en);
-sub selectPackage {
-    my ($packages, $pkg, $base, $otherOnly, $check_recursion) = @_;
-
-    #- avoid infinite recursion (mainly against badly generated depslist.ordered).
-    $check_recursion ||= {}; exists $check_recursion->{$pkg->{name}} and return; $check_recursion->{$pkg->{name}} = undef;
-
-    #- make sure base package are set even if already selected.
-    $base and $pkg->{base} = 1;
-
-    #- select package and dependancies, otherOnly may be a reference
-    #- to a hash to indicate package that will strictly be selected
-    #- when value is true, may be selected when value is false (this
-    #- is only used for unselection, not selection)
-    unless ($pkg->{selected}) {
-	foreach (@{$pkg->{deps}}) {
-	    my $preferred;	    
-	    if (/\|/) {
-		#- choice deps should be reselected recursively as no
-		#- closure on them is computed, this code is exactly the
-		#- same as pixel's one.
-		my %preferred; @preferred{@preferred} = ();
-		foreach (split '\|') {
-		    my $dep = $packages->{depslist}[$_] or next;
-		    $preferred ||= $dep;
-		    $dep->{selected} and $preferred = $dep, last;
-		    exists $preferred{::chop_version($dep->{name})} and $preferred = $dep;
-		}
-		selectPackage($packages, $preferred, $base, $otherOnly, $check_recursion) if $preferred;
-	    } else {
-		#- deps have been closed except for choices, so no need to
-		#- recursively apply selection, expand base on it.
-		my $dep = $packages->{depslist}[$_];
-		$base and $dep->{base} = 1;
-		$otherOnly and !$dep->{selected} and $otherOnly->{::chop_version($dep->{name})} = 1;
-		$otherOnly or $dep->{selected} += 1;
-	    }
-	}
-    }
-    $otherOnly and !$pkg->{selected} and $otherOnly->{::chop_version($pkg->{name})} = 1;
-    $otherOnly or $pkg->{selected} += 1;
-    1;
-}
-
-#- this code is extracted from DrakX and SHOULD NOT BE MODIFIED, wrapper method exists above to provide a good choice.
-sub read_rpmsrate {
-    my ($packages, $f) = @_;
-    my $line_nb = 0;
-    my (@l);
-    while (<$f>) {
-	$line_nb++;
-	/\t/ and die "tabulations not allowed at line $line_nb\n";
-	s/#.*//; 		 # comments
-
-	my ($indent, $data) = /(\s*)(.*)/;
-	next if !$data;		# skip empty lines
-
-	@l = grep { $_->[0] < length $indent } @l;
-
-	my @m = @l ? @{$l[$#l][1]} : ();
-	my ($t, $flag, @l2);
-	while ($data =~ 
-	       /^((
-                   [1-5]
-                   |
-                   (?:            (?: !\s*)? [0-9A-Z_]+(?:".*?")?)
-                   (?: \s*\|\|\s* (?: !\s*)? [0-9A-Z_]+(?:".*?")?)*
-                  )
-                  (?:\s+|$)
-                 )(.*)/x) {
-	    ($t, $flag, $data) = ($1,$2,$3);
-	    while ($flag =~ s,^\s*(("[^"]*"|[^"\s]*)*)\s+,$1,) {
-	    }
-	    my $ok = 0;
-	    $flag = join('||', grep { 
-		if (my ($inv, $p) = /^(!)?HW"(.*)"/) {
-		    ($inv xor detect_devices::matching_desc($p)) and $ok = 1;
-		    0;
-		} else {
-		    1;
-		}
-	    } split '\|\|', $flag);
-	    push @m, $ok ? 'TRUE' : $flag || 'FALSE';
-	    push @l2, [ length $indent, [ @m ] ];
-	    $indent .= $t;
-	}
-	if ($data) {
-	    # has packages on same line
-	    my ($rate) = grep { /^\d$/ } @m or die sprintf qq(missing rate for "%s" at line %d (flags are %s)\n), $data, $line_nb, join('&&', @m);
-	    foreach (split ' ', $data) {
-		if ($packages) {
-		    my $p = packageByName($packages, $_) or next;
-		    
-		    my @m2 = map { packageName(packageById($packages, $_)) =~ /locales-(.*)/ ? qq(LOCALES"$1") : () } packageDepsId($p);
-		    packageSetRateRFlags($p, $rate, (grep { !/^\d$/ } @m), @m2);
-		} else {
-		    print "$_ = ", join(" && ", @m), "\n";
-		}
-	    }
-	    push @l, @l2;
-	} else {
-	    push @l, [ $l2[0][0], $l2[$#l2][1] ];
-	}
-    }
-    $line_nb > 0 or die "nothing read in rpmsrate";
-}
-
-sub readCompssUsers {
-    my ($packages, $meta_class) = @_;
-    my (%compssUsers, %compssUsersIcons, , %compssUsersDescr, @sorted, $l);
-    my (%compss); 
-
-    my $file = 'Mandrake/base/compssUsers';
-    my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file";
-    local $_;
-    while (<$f>) {
-	/^\s*$/ || /^#/ and next;
-	s/#.*//;
-
-	if (/^(\S.*)/) {
-	    my ($icon, $descr);
-	    /^(.*?)\s*\[icon=(.*?)\](.*)/  and $_ = "$1$3", $icon  = $2;
-	    /^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2;
-	    $compssUsersIcons{$_} = $icon; 
-	    $compssUsersDescr{$_} = $descr; 
-	    push @sorted, $_;
-	    $compssUsers{$_} = $l = [];
-	} elsif (/^\s+(.*?)\s*$/) {
-	    push @$l, $1;
-	}
-    }
-    \%compssUsers, \@sorted, \%compssUsersIcons, \%compssUsersDescr;
-}
-
-sub setSelectedFromCompssList {
-    my ($packages, $compssUsersChoice, $min_level, $max_size, $install_class) = @_;
-    $compssUsersChoice->{TRUE} = 1; #- ensure TRUE is set
-    my $nb = selectedSize($packages);
-#    foreach my $p (sort { substr($a,0,1) <=> substr($b,0,1) } values %{$packages->{names}}) {
-    foreach my $p (sort { $b->{values}[0] <=> $a->{values}[0] } @{$packages->{depslist}}) { #- LOCALLY MODIFIED FOR OEM
-#	my ($rate, @flags) = split "\t", $p->[$VALUES];
-	my ($rate, @flags) = packageRateRFlags($p);
-	next if !$rate || $rate < $min_level || grep { !grep { /^!(.*)/ ? !$compssUsersChoice->{$1} : $compssUsersChoice->{$_} } split('\|\|') } @flags;
-
-	#- determine the packages that will be selected when
-	#- selecting $p. the packages are not selected.
-	my %newSelection;
-	selectPackage($packages, $p, 0, \%newSelection);
-
-	#- this enable an incremental total size.
-	my $old_nb = $nb;
-	foreach (grep { $newSelection{$_} } keys %newSelection) {
-	    $nb += packageSize($packages->{names}{$_});
-	}
-	if ($max_size && $nb > $max_size) {
-	    $nb = $old_nb;
-	    $min_level = packageRate($p);
-	    last;
-	}
-
-	#- at this point the package can safely be selected.
-	selectPackage($packages, $p);
-    }
-    log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
-    $min_level;
-}
diff --git a/rescue/tree/etc/passwd b/rescue/tree/etc/passwd
deleted file mode 100644
index 568451e4e..000000000
--- a/rescue/tree/etc/passwd
+++ /dev/null
@@ -1,3 +0,0 @@
-root::0:0::/:/bin/bash
-shutdown:*:6:0:shutdown:/sbin:/sbin/shutdown
-halt:*:7:0:halt:/sbin:/sbin/halt
diff --git a/rescue/tree/etc/profile b/rescue/tree/etc/profile
deleted file mode 100644
index 3cc1f05c1..000000000
--- a/rescue/tree/etc/profile
+++ /dev/null
@@ -1,24 +0,0 @@
-# /etc/profile
-# (c) MandrakeSoft, Chmouel Boudjnah <chmouel@mandrakesoft.com>
-
-# System wide environment and startup programs
-# Functions and aliases go in /etc/bashrc
-
-PROFILE_LOADED=1
-
-export PATH=/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:/mnt/disk/sbin:/mnt/disk/bin:/mnt/disk/usr/sbin:/mnt/disk/usr/bin:/mnt/disk/usr/X11R6/bin
-
-PS1="[root@rescue \w]\\$ "
-ls () { /bin/ls --color=auto -F "$@";}
-ll () { /bin/ls --color=auto -Fl "$@";}
-d () { /bin/ls --color=auto -F "$@";}
-s () { cd .. ;}
-which () { type -p "$@" ;}
-HOSTNAME=rescue
-HISTSIZE=1000
-HISTFILESIZE=1000
-
-INPUTRC=/etc/inputrc
-export PATH PS1 USER HOSTNAME HISTSIZE HISTFILESIZE INPUTRC
-
-cat /etc/issue
diff --git a/rescue/tree/etc/rc.reboot b/rescue/tree/etc/rc.reboot
deleted file mode 100755
index 0b67416f1..000000000
--- a/rescue/tree/etc/rc.reboot
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-sleep 1
-/sbin/killall5 -9
-
-umount -a -f -t noproc
-
-reboot -i -d
diff --git a/rescue/tree/etc/rc.sysinit b/rescue/tree/etc/rc.sysinit
deleted file mode 100755
index 2c36c31c5..000000000
--- a/rescue/tree/etc/rc.sysinit
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-action() { echo $1; shift; $*; }
-
-export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-echo -e "\t\t\tWelcome to \\033[1;36mMandrake\\033[0;39m Linux"
-
-action "Mounting proc filesystem" mount -n -t proc /proc /proc
-action "Remounting root filesystem in read-write mode" mount -n -o remount,rw /
-
->/etc/mtab
-mount -f /
-mount -f /proc
-
-# Set the hostname.
-action "Setting hostname rescue" hostname rescue
-echo rescue > /etc/HOSTNAME
-
-# Loads common modules ( no kerneld :( )
-echo "Loading additional modules..."
-load() { modprobe $* 2>/dev/null; }
-load ide-mod
-load ide-probe
-load ide-disk
-load ide-cd
-load floppy
-load af_packet
-load isofs
-load vfat
-load reiserfs
-load loop
-load sd_mod
-load sr_mod
-
-grep -q oem /proc/cmdline && exec /etc/oem -f
-
-/sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0
-/sbin/route add 127.0.0.1 lo
-
-if ! grep -q noguessmounts /proc/cmdline; then
-    echo "I will try now to guess your mountpoints;"
-    echo -e "If any problems, reboot with \\033[1;37mrescue noguessmounts\\033[0;39m to disable this."
-    echo ""
-    guessmounts
-    echo "Press <enter> to continue"
-    read
-fi
diff --git a/rescue/tree/etc/resolv.conf b/rescue/tree/etc/resolv.conf
deleted file mode 100644
index 3822939b1..000000000
--- a/rescue/tree/etc/resolv.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-search foo.com
-nameserver 192.168.1.1
diff --git a/rescue/tree/sbin/fakeshutdown b/rescue/tree/sbin/fakeshutdown
deleted file mode 100755
index c6d9b8440..000000000
--- a/rescue/tree/sbin/fakeshutdown
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Guillaume Cottenceau (gc@mandrakesoft.com)
-#
-# Copyright 2001 MandrakeSoft
-#
-# This software may be freely redistributed under the terms of the GNU
-# public license.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l }
-
-print "\n";
-
-
-#- try to umount as much as possible; uses Pixel's ultra optimized algo (let you guess how it works..)
-print "Umounting:\n";
-my @mounts = cat_('/proc/mounts');
-my $something_moved;
-do {
-    $something_moved = 0;
-    foreach (@mounts) {
-	my $where = (split)[1];
-	next if $where eq '/'; #- ouch! umounting the ramdisk on / always succeeds, and makes it becoming ro :-(
-	if (!system("umount $where 2>/dev/null")) {
-	    print "\t$where\n";
-	    $something_moved++;
-	}
-    }
-} while $something_moved;
-
-
-#- shutdown with init
-exec '/sbin/init', 6;
diff --git a/rescue/tree/sbin/modprobe b/rescue/tree/sbin/modprobe
deleted file mode 100755
index 574f8ff56..000000000
--- a/rescue/tree/sbin/modprobe
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-sub cat_ { local *F; open F, $_[0] or $_[1] ? die "cat of file $_[0] failed: $!\n" : return; my @l = <F>; wantarray ? @l : join '', @l }
-
-sub read_already_loaded() {
-    foreach (cat_("/proc/modules")) {
-	my ($name) = split;
-	$conf{$name}{loaded} = 1;
-    }
-}
-
-sub load_deps($) {
-    my ($file) = @_;
-
-    local *F;
-    open F, $file or log::l("error opening $file: $!"), return 0;
-    foreach (<F>) {
-	my ($f, $deps) = split ':';
-	push @{$deps{$f}}, split ' ', $deps;
-    }
-}
-
-sub load {
-    my ($name, @options) = @_;
-    $name =~ s/\.o//;
-
-    $conf{$name}{loaded} and return;
-    eval { load($_, 'prereq') } foreach @{$deps{$name}};
-
-    system("packdrake -x /modules/modules.cz* /tmp $name.o");
-    -r "/tmp/$name.o" or die "can't find module $name\n";
-    system("/sbin/insmod -f /tmp/$name.o"); $? and die("insmod $name failed");
-    system("rm /tmp/$name.o");
-}
-
-!@ARGV || $ARGV[0] =~ /-h/ and die "usage: modprobe <module> [<options...>]\n";
-
-read_already_loaded();
-load_deps("/modules/modules.dep");
-load(@ARGV);
diff --git a/rescue/tree/usr/lib/CVS. b/rescue/tree/usr/lib/CVS.
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.1