summaryrefslogtreecommitdiffstats
path: root/move
diff options
context:
space:
mode:
Diffstat (limited to 'move')
-rw-r--r--move/.cvsignore3
-rw-r--r--move/Makefile65
-rw-r--r--move/data/devices3
-rw-r--r--move/data/symlinks4
-rwxr-xr-xmove/hack_boot_img418
-rwxr-xr-xmove/hack_cdrom5
-rwxr-xr-xmove/hack_network5
-rwxr-xr-xmove/make_live71
-rw-r--r--move/move.pm94
-rw-r--r--move/pkgs.pm5
-rwxr-xr-xmove/runstage29
-rw-r--r--move/xwait.c18
12 files changed, 0 insertions, 700 deletions
diff --git a/move/.cvsignore b/move/.cvsignore
deleted file mode 100644
index 3e5b5c985..000000000
--- a/move/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.rdz
-xwait
-.perl_checker.cache
diff --git a/move/Makefile b/move/Makefile
deleted file mode 100644
index 3f94b72cd..000000000
--- a/move/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-
-DEST_LIVETREE = /tmp/live_tree
-DEST_STAGE2 = $(DEST_LIVETREE)/usr/bin/stage2
-
-DATA_FILES = devices symlinks
-LANG_FILES = $(shell perl -ne 'print $$1 if /ALLOWED_LANGS = qw\((.*)\)/' move.pm)
-
-STAGE1 = ../mdk-stage1
-INSTALL = ../perl-install
-
-INSTALL_FILES = install2.pm install_steps.pm install_any.pm install_interactive.pm install_steps_gtk.pm install_steps_interactive.pm install_messages.pm install_gtk.pm help.pm
-
-ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)")
-ifneq ("x$(ARCH)", "x")
-LIB_NAME = lib64
-else
-LIB_NAME = lib
-endif
-
-
-all: install
-
-build: xwait
- cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make init stage1-network stage1-cdrom init-move
-
-install: build
- while [ -e $(DEST_LIVETREE)/lock ]; do echo -e "\t*** sleeping because of lock... ***\n"; sleep 1; done
- sudo touch $(DEST_LIVETREE)/lock
- #- todo: make_boot_img alike to create boot volume from ../mdk-stage1/stage1-cdrom (isolinux mandatory since stock kernel is so big)
- sudo cp -f $(STAGE1)/init-move $(DEST_LIVETREE)/sbin/init
-
- sudo cp -f runstage2 xwait $(DEST_LIVETREE)/usr/bin
- sudo rm -rf $(DEST_STAGE2)
- sudo mkdir -p $(DEST_STAGE2)
- sudo cp -f *.pm $(DEST_STAGE2)
- sudo cp -f $(addprefix $(INSTALL)/, $(INSTALL_FILES)) $(DEST_STAGE2)
-
- sudo rm -rf $(DEST_LIVETREE)/usr/share/langs
- sudo mkdir -p $(DEST_LIVETREE)/usr/share/langs
- sudo cp -f $(patsubst %, $(INSTALL)/pixmaps/langs/lang-%.png, $(LANG_FILES)) $(DEST_LIVETREE)/usr/share/langs
-
- #- overwrite /usr/lib/libDrakX files of the live tree with those in CVS
- sudo cp -f $(addprefix $(INSTALL)/, $(shell cd $(DEST_LIVETREE)/usr/lib/libDrakX ; ls *.pm)) $(DEST_LIVETREE)/usr/lib/libDrakX || :
-
- #- overwrite stuff.so of drakxtools because it doesn't contain C_DRAKX stuff
- sudo cp -f ../perl-install/c/blib/arch/auto/stuff/stuff.so $(DEST_LIVETREE)/usr/lib/libDrakX/auto/c/stuff
-
- #- duplicated :(
- sudo perl -pi -e 's/#[-+].*//; $$_ = "\n" if (/^=(head|begin)/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $(DEST_STAGE2)/*.pm $(DEST_LIVETREE)/usr/lib/libDrakX/*.pm
-
- sudo mkdir -p $(DEST_LIVETREE)/move
- sudo cp -f $(addprefix data/, $(DATA_FILES)) $(DEST_LIVETREE)/move
-
- grep ChangeLog $(INSTALL)/CVS/Entries > /tmp/version
- sudo cp -f /tmp/version $(DEST_LIVETREE)/usr/share/VERSION
- sudo rm -f $(DEST_LIVETREE)/lock
-
-
-xwait: %: %.c
- $(CC) $(CFLAGS) $< -L/usr/X11R6/$(LIB_NAME) -lX11 -o $@
-
-clean:
- rm -f xwait
-
-# mkisofs -D -U -r $(DEST_LIVETREE) | create_compressed_fs - 65536 $(DEST_LIVETREE).clp 2000 2>/dev/null
diff --git a/move/data/devices b/move/data/devices
deleted file mode 100644
index 10cd770c9..000000000
--- a/move/data/devices
+++ /dev/null
@@ -1,3 +0,0 @@
-/dev/console c 5 1
-/dev/tty4 c 4 4
-/dev/tty3 c 4 3
diff --git a/move/data/symlinks b/move/data/symlinks
deleted file mode 100644
index 49fa24f46..000000000
--- a/move/data/symlinks
+++ /dev/null
@@ -1,4 +0,0 @@
-/sbin
-/lib
-/usr
-/bin
diff --git a/move/hack_boot_img b/move/hack_boot_img
deleted file mode 100755
index 3d564616b..000000000
--- a/move/hack_boot_img
+++ /dev/null
@@ -1,418 +0,0 @@
-#!/usr/bin/perl
-
-@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|network|blank|pcmcia|live|tftp|tftprd\n";
-
-use Config;
-Config->import;
-my ($arch) = $Config{archname} =~ /(.*)-/;
-my $corporate = $ENV{CORPORATE} && " corporate"; #- use this for building a corporate version.
-
-($img, $type) = @ARGV;
-
-$instdir = "../mdk-stage1/";
-$mnt = "/tmp/drakx_mnt";
-$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1";
-
-if ($>) {
- $sudo = "sudo";
- $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
-}
-
-sub __ { print @_, "\n"; system(@_); }
-sub _ { __ @_; $? and die; }
-
-_ "$sudo mkdir $mnt" unless -e $mnt;
-_ "$sudo mkdir ${mnt}2" unless -e "${mnt}2";
-
-$install = $ {{
- all => "stage1-full",
- other => "stage1-full",
- blank => "stage1-full",
- live => "stage1-full",
- tftp => "stage1-full",
- tftprd => "stage1-full",
- pcmcia => "stage1-full",
- network => "stage1-network",
- usb => "stage1-usb",
- cdrom => "stage1-cdrom",
- hd => "stage1-disk",
- live64 => "stage1-full",
- tftp64 => "stage1-full",
- tftprd64 => "stage1-full",
- pcmcia64 => "stage1-full",
- network64 => "stage1-network",
- cdrom64 => "stage1-cdrom",
- hd64 => "stage1-disk",
-}}{$type} or die;
-
-chomp($main = `cat ../kernel/all.kernels/.main`);
-
- @kernels = $main;
-
-foreach (@kernels) {
- if ($img =~ /rdz$/) {
- initrd($mnt, "$img-$_");
- } else {
- $::{"boot_img_$arch"}->($mnt, "$img-$_", glob("../kernel/all.kernels/$_/boot/vmlinu*"));
- }
-}
-rename("$img-$main", "$img");
-
-sub install_stripped { _ "$sudo install $_[0] $_[1]" }
-
-sub initrd {
- my ($mnt, $img) = @_;
- my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type;
- my $tmp = "$ENV{HOME}/tmp/initrd";
- my $tar = "$instdir/stage1-data/stage1-with-busybox.tar.bz2";
-
- __ "$sudo umount $tmp $mnt 2>/dev/null";
- _ "dd if=/dev/zero of=$tmp bs=1k count=4000";
- _ "$mke2fs $tmp";
- _ "$sudo mount -t ext2 $tmp $mnt -o loop";
-
- _ "$sudo tar xjC $mnt -f $tar";
- install_stripped("$instdir/init", "$mnt/sbin");
- install_stripped("$instdir/$install", "$mnt/sbin/stage1");
-
- if ($type eq "network" || $type eq "usb" || $type eq "all" || $type eq "other" || $type eq "blank") {
- install_stripped("$instdir/ppp/pppd-bin", "$mnt/sbin/pppd");
- install_stripped("$instdir/rp-pppoe/pppoe-bin", "$mnt/sbin/pppoe");
- _ "$sudo mknod $mnt/dev/ppp c 108 0";
- _ "$sudo mknod $mnt/dev/ptyp0 c 2 0";
- _ "$sudo mknod $mnt/dev/ttyp0 c 3 0";
- }
-
- my $ftype = $type =~ /^(all)$/ ? "pcmcia" : $type;
- if ($ftype eq "pcmcia") {
- _ "$sudo cp -a /etc/pcmcia $mnt/etc";
- _ "cp $mnt/etc/pcmcia/config /tmp/pcmcia_config_tmp";
- _ "../tools/patch_pcmcia_config.pl /tmp/pcmcia_config_tmp ../kernel/all.modules/$main/modules.dep";
- _ "sudo mv /tmp/pcmcia_config_tmp $mnt/etc/pcmcia/config";
- }
- my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
- $modz = "../kernel/all.modules$I/$ext";
- if ($type !~ /blank/) {
- _ "$sudo cp -f $modz/${ltype}_modules.mar $mnt/modules/modules$I.mar" ;
- _ "$sudo cp -f $modz/modules.dep $mnt/modules/";
- }
- _ "$sudo umount $mnt";
-
-
-# Workaround for vfat-loop bug (quite touchy)
- _ "gzip -9f $tmp";
- _ "cp -f $tmp.gz $img";
- _ "rm -f $tmp.gz";
-# _ "gzip -9 -c $tmp > $img";
-# _ "rm -f $tmp";
-}
-
-sub boot_img_i386 {
- my ($mnt, $img, $kernel) = @_;
-
- __ "$sudo umount $mnt 2>/dev/null";
- my $automatic = "";
-
- if ($type eq "hd") {
- _ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img";
- } elsif ($type eq "all") {
- _ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img";
- } else {
- _ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo.img.bz2 > $img";
- }
-
- $automatic = "automatic=method:cdrom" if ($type eq "cdrom");
- $automatic = "automatic=method:disk" if ($type eq "hd");
-
- _ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop";
- _ "cat $kernel > $mnt/vmlinuz" if $type !~ /blank/;
-
- my $rdz = $img; $rdz =~ s/\.img/.rdz/;
- initrd("${mnt}2", $rdz) if !-e $rdz;
- eval { _ "cp -f $rdz $mnt/$type.rdz" };
- if ($@) {
- unlink "$mnt/$type.rdz";
- my $avail = (split ' ', `df $mnt`)[-3];
- my $s = int((-s $rdz) / 1024);
- die sprintf("not enough room for $rdz: need %dKB (available %dKB < needed %dKB)\n", $s - $avail, $avail, $s);
- }
-
-# my $ftype = $type =~ /^(other|all)$/ ? "cdrom" : $type;
- my $timeout = 72;
- output("$mnt/syslinux.cfg",
-"default linux
-prompt 1
-timeout $timeout
-display boot.msg
-F1 help.msg
-F2 boot.msg
-label linux
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic vga=788
-label vgalo
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic vga=785
-label vgahi
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic vga=791
-label vga16
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic vga16
-label text
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic text
-label patch
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic patch vga=788
-label expert
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic expert vga=788
-label rescue
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic rescue rw
-label lnx4win
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic lnx4win vga=788" .
-
-($type eq 'all' &&
-"label preinst
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz automatic=method:cdrom rescue oem rw
-label oem
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz automatic=method:cdrom rescue oem rw") .
-
-"label auto
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz $automatic auto_install=Mandrake/base/auto_inst.cfg.pl
-label all
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz pcmcia vga=788
-label ackbar
- kernel vmlinuz
- append ramdisk_size=32000 initrd=$type.rdz automatic=method:nfs,network:static,ip:192.168.1.205,dns:192.168.1.11,domain:mandrakesoft.com,server:ackbar,directory:/export vga=788
-");
- _ "sync";
- _ "df $mnt";
-}
-
-sub boot_img_alpha {
- my ($mnt, $img) = @_;
-
- __ "$sudo umount $mnt 2>/dev/null";
- _ "dd if=/dev/zero of=$img bs=1k count=1440";
- _ "$mke2fs $img";
- _ "/sbin/e2writeboot $img /boot/bootlx";
- _ "$sudo mount -t ext2 $img $mnt -o loop";
- _ "cp -f vmlinux.gz $mnt" if $type !~ /blank/;
- -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz");
-
- mkdir "$mnt/etc", 0777;
- output("$mnt/etc/aboot.conf",
-"0:vmlinux.gz initrd=$type.rdz rw ramdisk_size=32000 $type
-1:vmlinux.gz initrd=$type.rdz rw ramdisk_size=32000 text $type
-");
- _ "sync";
- _ "df $mnt";
-}
-
-sub boot_img_sparc {
- my ($mnt, $img) = @_;
- if ($type =~ /^live(.*)/) {
- #- hack to produce directly into /export the needed file for cdrom boot.
- my $dir = "/export";
- my $boot = "boot"; #- non-absolute pathname only!
-
- _ "mkdir -p $dir/$boot";
- _ "cp -f /boot/cd.b /boot/second.b $dir/$boot";
- _ "cp -f vmlinux$1 $dir/$boot/vmlinux$1";
- -f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd("${mnt}2", "$dir/$boot/live$1.rdz");
-
- output("$dir/$boot/silo.conf", "
-partition=1
-default=linux
-timeout=100
-read-write
-message=/$boot/boot.msg
-image=\"cat /$boot/boot.msg\"
- label=1
- single-key
-image=\"cat /$boot/general.msg\"
- label=2
- single-key
-image=\"cat /$boot/expert.msg\"
- label=3
- single-key
-image=\"cat /$boot/rescue.msg\"
- label=4
- single-key
-image=\"cat /$boot/kickit.msg\"
- label=5
- single-key
-image=\"cat /$boot/param.msg\"
- label=6
- single-key
-image[sun4c,sun4d,sun4m]=/$boot/vmlinux
- label=linux
- alias=install
- initrd=/$boot/live.rdz
- append=\"ramdisk_size=32000$corporate\"
-image[sun4c,sun4d,sun4m]=/$boot/vmlinux
- label=text
- initrd=/$boot/live.rdz
- append=\"ramdisk_size=32000 text$corporate\"
-image[sun4c,sun4d,sun4m]=/$boot/vmlinux
- label=expert
- initrd=/$boot/live.rdz
- append=\"ramdisk_size=32000 expert$corporate\"
-image[sun4c,sun4d,sun4m]=/$boot/vmlinux
- label=ks
- initrd=/$boot/live.rdz
- append=\"ramdisk_size=32000 ks$corporate\"
-image[sun4c,sun4d,sun4m]=/$boot/vmlinux
- label=rescue
- initrd=/$boot/live.rdz
- append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\"
-image[sun4u]=/$boot/vmlinux64
- label=linux
- alias=install
- initrd=/$boot/live64.rdz
- append=\"ramdisk_size=32000$corporate\"
-image[sun4u]=/$boot/vmlinux64
- label=text
- initrd=/$boot/live64.rdz
- append=\"ramdisk_size=32000 text$corporate\"
-image[sun4u]=/$boot/vmlinux64
- label=expert
- initrd=/$boot/live64.rdz
- append=\"ramdisk_size=32000 expert$corporate\"
-image[sun4u]=/$boot/vmlinux64
- label=ks
- initrd=/$boot/live64.rdz
- append=\"ramdisk_size=32000 ks$corporate\"
-image[sun4u]=/$boot/vmlinux64
- label=rescue
- initrd=/$boot/live64.rdz
- append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\"
-");
-
- output("$dir/$boot/README", "
-To Build a Bootable CD-ROM, try:
- mkisofs -R -o t.iso -s /$boot/silo.conf /export
-");
- } elsif ($type =~ /^tftprd(.*)/) {
- my $dir = "/export";
- my $boot = "images";
- my $setarch = $1 ? "sparc64" : "sparc32";
-
- _ "mkdir -p $dir/$boot";
- -f "$type.rdz" or initrd("${mnt}2", "$type.rdz");
- _ "cp -f vmlinux$1.aout $dir/$boot/$type.img";
- _ "$setarch kernel$1/src/arch/sparc$1/boot/piggyback $dir/$boot/$type.img kernel$1/boot/System.map $type.rdz";
- } elsif ($type =~ /^tftp(.*)/) {
- my $dir = "/export";
- my $boot = "images";
-
- _ "mkdir -p $dir/$boot";
- _ "cp -f vmlinux$1.aout $dir/$boot/$type.img";
- } else {
- my $dir = "floppy";
- my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type;
-
- __ "$sudo umount $mnt 2>/dev/null";
- _ "rm -rf $dir";
- _ "mkdir -p $dir";
- _ "cp -f /boot/fd.b /boot/second.b $dir";
- _ "cp -f vmlinuz$I $dir/vmlinux$I.gz" if $type !~ /blank/;
- -f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd("${mnt}2", "$dir/$type.rdz");
-
- output("$dir/boot.msg", "
-Welcome to Mandrake Linux 7.1
-
-Press <Enter> to install or upgrade a system 7mMandrake Linux7m
-");
-
- output("$dir/silo.conf", "
-partition=1
-default=linux
-timeout=100
-read-write
-message=/boot.msg
-image=/vmlinux$I.gz
- label=linux
- initrd=/$type.rdz
- append=\"ramdisk_size=32000 $ltype$corporate\"
-");
- _ "genromfs -d $dir -f /dev/ram -A 2048,/.. -a 512 -V \'DrakX boot disk\'";
- _ "$sudo mount -t romfs /dev/ram $mnt";
- _ "silo -r $mnt -F -i /fd.b -b /second.b -C /silo.conf";
- _ "$sudo umount $mnt";
- _ "dd if=/dev/ram of=$type.img bs=1440k count=1";
- _ "sync";
- _ "$sudo mount -t romfs /dev/ram $mnt";
- _ "df $mnt";
- }
-}
-
-sub boot_img_ppc {
- my ($mnt, $img, $kern, $modz) = @_;
- my $dir = "/export";
- my $boot = "boot"; #- non-absolute pathname only!
- my ($extension) = $modz =~ /.*\/([^\/]+)/;
- _ "mkdir -p $dir/$boot";
- _ "cp -f $kern $dir/$boot/vmlinux";
- _ "cp -f all.rdz$extension $dir/boot/all.gz";
- _ "cp -f tools/ppc/yaboot $dir/boot/yaboot";
-
- output("$dir/$boot/yaboot.conf", "
-init-message = \"\\nWelcome to Mandrake Linux PPC!\\nHit <TAB> for boot options.\\n\\n\"
-timeout = 150
-default = install-novideo
-
-image = cd:,\\\\\\\\vmlinux
- label = install-novideo
- initrd = cd:,\\\\\\\\all.gz
- initrd-size = 32000
- append = \" video=ofonly\"
-
-image = cd:,\\\\\\\\vmlinux
- label = install-atyfb
- initrd = cd:,\\\\\\\\all.gz
- initrd-size = 32000
- append = \" video=atyfb:vmode:17\"
-
-image = cd:,\\\\\\\\vmlinux
- label = install-aty128fb
- initrd = cd:,\\\\\\\\all.gz
- initrd-size = 32000
- append = \" video=aty128fb:vmode:17\"
-
-image = cd:,\\\\\\\\vmlinux
- label = install-text
- initrd = cd:,\\\\\\\\all.gz
- initrd-size = 32000
- append = \" text\"
-
-image = cd:,\\\\\\\\vmlinux
- label = rescue
- initrd = cd:,\\\\\\\\all.gz
- initrd-size = 32000
- append = \" rescue\"
-");
- #- seem to need 2 yaboot.conf, one in the root, and one in boot
- _ "cp -f $dir/boot/yaboot.conf $dir/yaboot.conf";
-
- output("$dir/$boot/README", "
-To Build a Bootable CD-ROM, do:
-cd /tools/ppc
-./mkINSTALLCD /export ppc-cd.img
-");
-
-}
-
-sub output {
- my $f = shift;
- local *F;
- open F, "> $f" or die "error writing to $f";
- print F join '', @_;
-}
diff --git a/move/hack_cdrom b/move/hack_cdrom
deleted file mode 100755
index 1779c6ee6..000000000
--- a/move/hack_cdrom
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-make || exit 1
-./hack_boot_img cdrom.rdz cdrom
-cp -f cdrom.rdz /tftpboot/gc/network.rdz
diff --git a/move/hack_network b/move/hack_network
deleted file mode 100755
index 6334b50b2..000000000
--- a/move/hack_network
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-make || exit 1
-./hack_boot_img network.rdz network
-cp -f network.rdz /tftpboot/gc/network.rdz
diff --git a/move/make_live b/move/make_live
deleted file mode 100755
index 06ba0280d..000000000
--- a/move/make_live
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../perl-install";
-use common;
-use pkgs;
-
-my @langs = map { /^../; $& } split /\s/, (cat_('move.pm') =~ /ALLOWED_LANGS = qw\((.*)\)/)[0];
-
-@ARGV == 0 or die "usage: make_live\n";
-
-sub installPackages {
- rename "/etc/rpm/macros", "/etc/rpm/macros.";
- output_p("/etc/rpm/macros", "%_install_langs " . join(":", @langs) . "\n");
-
- mkdir_p("$::prefix/var/lib/rpm");
- mkdir_p("$::prefix/root/drakx");
-
-
- undef *install_any::setDefaultPackages;
- *install_any::setDefaultPackages = sub {};
-
- undef *install_any::getFile;
- *install_any::getFile = sub {
- my ($f, $o_method) = @_;
- log::l("getFile $f:$o_method");
- open(my $F, '/export/' . install_any::relGetFile($f)) or return;
- $F;
- };
- install_any::setPackages(my $o = $::o = {
- prefix => $::prefix,
- meta_class => 'desktop',
- default_packages => [ qw(XFree86-server XFree86-xfs XFree86-FBDev) ],
- });
-
- my %compssUsersChoice = map { $_ => 1 } map { @{$_->{flags}} } values %{$o->{compssUsers}};
- $compssUsersChoice{$_} = 1 foreach 'SYSTEM', 'DVD', 'USB', 'SOUND';
- $compssUsersChoice{qq(LOCALES"$_")} = 1 foreach @langs;
-
- pkgs::setSelectedFromCompssList($o->{packages}, \%compssUsersChoice, 4, 0);
-
- my @toInstall = pkgs::packagesToInstall($o->{packages});
- $ENV{DURING_INSTALL} = 1;
- $ENV{LD_LIBRARY_PATH} = "/lib:/usr/lib:/usr/X11R6/lib:/usr/lib/qt3/lib";
- pkgs::install($::prefix, 0, \@toInstall, $o->{packages});
-
- eval { fs::umount("$::prefix/proc") };
-
- unlink "/etc/rpm/macros";
- rename "/etc/rpm/macros.", "/etc/rpm/macros";
-}
-
-my $cwd = chomp_(`pwd`);
-$::prefix = "/tmp/live_tree";
-
-{
- eval { fs::umount("$::prefix/proc") };
-# eval { rm_rf($::prefix) };
- output("$::prefix/etc/fstab", "none /proc proc defaults 0 0\n");
- installPackages();
- system("chroot $::prefix ldconfig");
-}
-
-system("ln -sf /var/lib/xkb $::prefix/etc/X11/xkb/compiled"); # don't want the relative path, prefering the absolute path
-system("find $::prefix/dev -type b -o -type c | xargs chmod a+rw");
-
-substInFile {
- #- /lib is ro, for the moment we don't save, we'll see later if we may want to save (using /var/dev-state for example)
- s|.*lib/dev-state.*||;
-} "$::prefix/etc/devfsd.conf";
-
-system("chroot $::prefix pango-querymodules > $::prefix/etc/pango/pango.modules");
diff --git a/move/move.pm b/move/move.pm
deleted file mode 100644
index bc061fd21..000000000
--- a/move/move.pm
+++ /dev/null
@@ -1,94 +0,0 @@
-package move; # $Id$ $
-
-use diagnostics;
-use strict;
-
-use modules;
-use common;
-use fs;
-use run_program;
-use log;
-use lang;
-
-my @ALLOWED_LANGS = qw(en_US fr es it de);
-
-#- run very soon at stage2 start, setup things on tmpfs rw / that
-#- were not necessary to start stage2 itself (there were setup
-#- by stage1 of course)
-sub init {
- my ($o) = @_;
- #- rw things
- mkdir "/$_" foreach qw(home mnt root etc var);
- mkdir_p "/var/$_" foreach qw(log run/console spool lib/xkb lock/subsys);
- mkdir_p "/etc/$_" foreach qw(X11);
- touch '/etc/modules.conf';
- symlinkf "/proc/mounts", "/etc/mtab";
-
- #- ro things
- symlinkf "/image/etc/$_", "/etc/$_"
- foreach qw(alternatives shadow man.config services shells pam.d security inputrc ld.so.conf
- DIR_COLORS bashrc profile profile.d rc.d init.d devfsd.conf devfs gtk-2.0 pango fonts modules.devfs
- dynamic gnome-vfs-2.0 gnome-vfs-mime-magic gtk gconf menu menu-methods nsswitch.conf default login.defs
- skel ld.so.cache);
- symlinkf "/image/etc/X11/$_", "/etc/X11/$_"
- foreach qw(encodings.dir app-defaults applnk fs lbxproxy proxymngr rstart wmsession.d xinit.d xinit xkb xserver xsm);
-
- #- to be able to adduser, one need to have /etc/passwd and /etc/group writable
- cp_af("/image/etc/$_", "/etc") foreach qw(passwd group);
-
- #- free up stage1 memory
- fs::umount($_) foreach qw(/stage1/proc /stage1);
-
- #- devfsd needed for devices accessed by old names
- fs::mount("none", "/dev", "devfs", 0);
- run_program::run('/sbin/devfsd', '/dev');
-
- modules::load_category('multimedia/sound');
-
- $o->{steps}{startMove} = { reachable => 1, text => "Start Move" };
- $o->{orderedSteps} = [ qw(selectLanguage acceptLicense selectMouse selectKeyboard startMove) ];
-
- member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs;
-}
-
-sub install2::startMove {
- my ($_o) = @_;
-
- $::WizardWindow->destroy;
- require ugtk2;
- my $root = ugtk2::gtkroot();
- my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file('/usr/share/mdk/screensaver/3.png');
- my ($w, $h) = ($pixbuf->get_width, $pixbuf->get_height);
- $root->draw_pixbuf(Gtk2::Gdk::GC->new($root), $pixbuf, 0, 0, ($::rootwidth - $w) / 2, ($::rootheight - $h)/2, $w, $h, 'none', 0, 0);
- ugtk2::gtkflush();
-
- run_program::run('adduser', 'mdk');
-
- output('/var/run/console.lock', 'mdk');
- output('/var/run/console/mdk', 1);
- run_program::run('pam_console_apply');
-
- if (fork()) {
- sleep 1;
- log::l("DrakX waves bye-bye");
- exec 'su', 'mdk', 'startkde';
- } else {
- exec 'xwait' or c::_exit(0);
- }
-}
-
-sub automatic_xconf {
- my ($o) = @_;
- log::l('automatic XFree configuration');
-
- require Xconfig::default;
- $o->{raw_X} = Xconfig::default::configure({ KEYBOARD => 'uk' }, $o->{mouse}); #- using uk instead of us for now to have less warnings
-
- require Xconfig::main;
- require class_discard;
- Xconfig::main::configure_everything_auto_install($o->{raw_X}, class_discard->new, {},
- { allowNVIDIA_rpms => [], allowATI_rpms => [] });
-}
-
-
-1;
diff --git a/move/pkgs.pm b/move/pkgs.pm
deleted file mode 100644
index 9fa952261..000000000
--- a/move/pkgs.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package pkgs; # $Id$ $
-
-#- dummy (use pkgs in perl-install/install_any.pm)
-
-1;
diff --git a/move/runstage2 b/move/runstage2
deleted file mode 100755
index 64c557db6..000000000
--- a/move/runstage2
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/bin/stage2 /usr/lib/libDrakX);
-use install2;
-
-$::isStandalone = 0;
-install2::main(@ARGV, '--move');
-
-c::_exit(0);
diff --git a/move/xwait.c b/move/xwait.c
deleted file mode 100644
index a199b790e..000000000
--- a/move/xwait.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <stdlib.h>
-#include <X11/Xlib.h>
-
-int main() {
- Display *display = XOpenDisplay(NULL);
-
- if (display) {
- XEvent event;
-
- XSelectInput(display, DefaultRootWindow(display), SubstructureNotifyMask);
- do {
- XNextEvent(display, &event);
- } while (event.type != CreateNotify);
- XCloseDisplay(display);
- }
-
- exit(display == NULL);
-}