re-sync after the big svn loss

15 files changed, 0 insertions, 1385 deletions

diff --git a/live/One/2006.0/config/auto_inst.cfg.pl b/live/One/2006.0/config/auto_inst.cfg.pl
deleted file mode 100644
index a29302153..000000000
--- a/live/One/2006.0/config/auto_inst.cfg.pl
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/perl -cw
-# 
-# You should check the syntax of this file before using it in an auto-install.
-# You can do this with 'perl -cw auto_inst.cfg.pl' or by executing this file
-# (note the '#!/usr/bin/perl -cw' on the first line).
-$o = {
-       'rpmsrate_flags_chosen' => {
-           # office
-           CAT_OFFICE => 1,
-           CAT_SPELLCHECK => 1,
-           CAT_PUBLISHING => 1,
-           CAT_PIM => 1,
-           CAT_ARCHIVING => 1,
-           CAT_PRINTER => 1,
-           # multimedia
-           CAT_AUDIO => 1,
-           CAT_GRAPHICS => 1,
-           CAT_VIDEO => 1,
-           # internet
-           CAT_NETWORKING_WWW => 1,
-           CAT_NETWORKING_MAIL => 1,
-           CAT_NETWORKING_NEWS => 1,
-           CAT_COMMUNICATIONS => 1,
-           CAT_NETWORKING_CHAT => 1,
-           CAT_NETWORKING_FILE_TRANSFER => 1,
-           CAT_NETWORKING_IRC => 1,
-           CAT_NETWORKING_INSTANT_MESSAGING => 1,
-           CAT_NETWORKING_DNS => 1,
-           # network
-           CAT_NETWORKING_REMOTE_ACCESS => 1,
-           CAT_NETWORKING_FILE => 1,
-           # config
-           CAT_CONFIG => 1,
-           # console
-           CAT_TERMINALS => 1,
-           CAT_TEXT_TOOLS => 1,
-           CAT_SHELLS => 1,
-           CAT_FILE_TOOLS => 1,
-           # kde
-           CAT_KDE => 1,
-           CAT_X => 1,
-           CAT_ACCESSIBILITY => 1,
-           CAT_THEMES => 1,
-           # system
-           CAT_SYSTEM => 1,
-
-           # FIXME, use $::o->{build_live_system} for that
-           '3D' => 1,
-           BURNER => 1,
-           DVD => 1,
-           PCMCIA => 1,
-           TV => 1,
-           USB => 1,
-           SCANNER => 1,
-           # installs Gnome packages only, not suitable for One
-           # PHOTO => 1,
-       },
-       # so that rpmsrate flags are really used
-       'compssListLevel' => 4, # default from install_steps_interactive
-       'default_packages' => [
-                               #- live requirements
-                               'drakx-finish-install',
-                               'squashfs-tools',
-                               'dkms-minimal',
-
-                               #- should be required by live-install
-                               'lilo',
-                               'grub',
-                               # perl -MMDK::Common -e 'my $cmds = eval (`cat /usr/lib/libDrakX/fs/format.pm` . "\\%cmds"); print join(", ", uniq(map { "\"$_->[0]\"" } values %$cmds)) . "\n";' 2>/dev/null
-                               "reiserfsprogs", "jfsprogs", "reiser4progs", "hfsutils", "dosfstools", "e2fsprogs", "xfsprogs", "util-linux",
-                               # from diskdrake/*.pm
-                               'ntfsprogs',
-                               'davfs',
-
-                               #- should be required by draklive copy wizard
-                               'syslinux',
-                               'cdrecord',
-                               'rsync',
-                               'mtools',
-
-                               #- printerdrake/scannerdrake related
-                               'gutenprint-gimp2',
-                               'foomatic-filters',
-                               'foomatic-db',
-                               'foomatic-db-hpijs',
-                               'foomatic-db-engine',
-                               'printer-filters',
-                               'printer-utils',
-                               'printer-testpages',
-                               'ghostscript',
-                               'hplip-hpijs',
-                               'gutenprint-ijs',
-                               'gutenprint-foomatic',
-                               'gutenprint-escputil',
-                               'postscript-ppds',
-                               'hplip-model-data',
-                               'nmap',
-                               'scli',
-                               'cups',
-                               'net-tools',
-                               'xpp',
-                               'cups-drivers',
-                               'gutenprint-cups',
-                               'curl',
-                               'cups-common',
-                               'samba-client',
-                               'nc',
-                               'hplip',
-                               'sane-backends',
-                               'xsane',
-                               'libsane-hpaio1',
-                               'usbutils',
-                               'ImageMagick',
-                               'libhpip0',
-                               'xinetd',
-                               'saned',
-                               'kdegraphics-kooka',
-
-                               #- drakclock
-                               'ntp',
-
-                               #- network
-                               'zcip', 'tmdns', 'ethtool', 'rp-pppoe', 'ppp-pppoatm',
-
-                               #- acpi
-                               'acpi', 'acpid',
-
-                               #- useful packages
-                               'ndiswrapper',
-                               'xmoto',
-			     ],
-       # explicitely specify the security level, so that environment of the build machine doesn't take precedence
-       'security' => 3,
-       'useSupermount' => 'magicdev',
-       'users' => [
-		    {
-		      'icon' => 'default',
-		      'realname' => '',
-		      'uid' => '',
-		      'groups' => [],
-		      'name' => 'guest',
-		      'shell' => '/bin/bash',
-		      'gid' => ''
-		    }
-		  ],
-       'locale' => {
-                     'country' => 'US',
-                     'IM' => undef,
-                     'lang' => 'en_US',
-                     'utf8' => 1
-                   },
-       'authentication' => {
-			     'shadow' => 1,
-			     'local' => 1,
-			     'md5' => 1
-			   },
-       'superuser' => {
-			'pw' => '',
-			'realname' => 'root',
-			'uid' => '0',
-			'shell' => '/bin/bash',
-			'home' => '/root',
-			'gid' => '0'
-		      },
-       'keyboard' => {
-		       'GRP_TOGGLE' => '',
-		       'KBCHARSET' => 'C',
-		       'KEYBOARD' => 'us',
-		       'KEYTABLE' => 'us'
-		     },
-       'timezone' => {
-		       'ntp' => undef,
-		       'timezone' => 'America/New_York',
-		       'UTC' => 1
-		     },
-       'X' => {},
-       'partitioning' => {
-			   'auto_allocate' => '',
-			   'clearall' => 0,
-			   'eraseBadPartitions' => 0
-			 },
-       #- doc takes too much place
-       'excludedocs' => 1,
-       'postInstall' => join(";",
-                             #- do not modify it the standard way, since the behaviour would be unexpected during install
-                             "perl -pi -e 's/META_CLASS=.*/META_CLASS=one/' /etc/sysconfig/system",
-                             "perl -pi -e 's/\\(Community\\)/\(Official\)/' /etc/mandriva-release",
-                             #- try not to run kat a second time when running kde apps as root (#21308)
-                             "touch /root/.mdv-no_kat",
-                             #- remove useless ISDN network configuration file,
-                             #- it should be present if configured only
-                             "rm -f /etc/sysconfig/network-scripts/ifcfg-ippp0",
-                             ),
-     };
diff --git a/live/One/2006.0/config/live.cfg b/live/One/2006.0/config/live.cfg
deleted file mode 100644
index 67e0c1236..000000000
--- a/live/One/2006.0/config/live.cfg
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/perl -cw
-
-use MDK::Common;
-my %local_cfg = getVarsFromSh('config/local_cfg');
-
-my $_l = {
-    workdir => $local_cfg{WORKDIR},
-    system => {
-        root => $local_cfg{CHROOT},
-        repository => $local_cfg{REPOSITORY},
-        kernel => '2.6.12-17mdk-i586-up-1GB',
-        auto_install => 'config/auto_inst.cfg.pl',
-        patch_install => 'config/patch-2006-live.pl',
-	# rpmsrate: removed OpenOffice.org-help-*, gimp-help-2
-        # and dkms-zaptel/zaptel-tools (they pulled kernel-source)
-        # clean-rpmsrate -o /home/blino/live/2006.0/config/rpmsrate /home/blino/cvs/mandriva/BRANCHES/2006/gi/perl-install/share/rpmsrate /mnt/ken/community/2006.0/i586/media/main/
-	rpmsrate => 'config/rpmsrate',
-        langs_always => [ 'en_US' ],
-        files => [
-            [ 'files/kside238-ONE.png', '/usr/share/apps/kicker/pics/kside_download.png', 0644 ],
-            #- make cups the default spooler
-            [ 'files/defaultspooler', '/etc/foomatic/defaultspooler', 0644 ],
-            #- eject eject cd medium before halt/reboot
-            [ 'files/halt.local', '/sbin/halt.local', 0755 ],
-            #- disable first boot wizard at live boot
-            [ 'files/firstboot', '/etc/sysconfig/firstboot', 0644 ],
-            #- enable drakx-finish-install at live boot
-            [ 'files/finish-install', '/etc/sysconfig/finish-install', 0644 ],
-            #- don't make kbluetoothdrc display an annoying and useless popup window, and disable it by default
-            [ 'files/kbluetoothdrc', '/etc/kde/kbluetoothdrc', 0644 ],
-        ],
-        patches => [
-            'patches/halt.loopfs.patch',
-            'patches/netfs.loopfs.patch',
-            'patches/lp.script.start.patch',
-            # use nvidia legacy driver for GeForce3/4 (forget about acceleration for FX/6800 series)
-            if_($local_cfg{BUILD_CDCOM}, 'patches/Cards+.legacy.patch'),
-        ],
-        if_($local_cfg{BUILD_CDCOM}, additional_media => [
-            {
-                name => '2006com',
-                path => 'http://192.168.100.7/dis/2006.0/i586/',
-                distrib => 1,
-                # no space left for acroread, j2re, opera
-                packages => [ qw(mindawn skype FlashPlayer RealPlayer RealPlayer-rpnp) ],
-            },
-            {
-                name => 'firmwares',
-                path => 'http://192.168.100.78/kercom/i586/2006/release/firmwares/',
-                packages => [ qw(atmel-firmware fcdsl2-firmware fcdsl-firmware fcdslsl-firmware fcdslslusb-firmware fcdslusba-firmware fcdslusb-firmware fcusb2-firmware ipw2100-firmware ipw2200-firmware prism54-firmware speedtouch_mgmt) ],
-            },
-            {
-                name => 'drivers',
-                path => 'http://192.168.100.78/kercom/i586/2006/updates/modules/',
-                # for i in /mnt/dkms/i586/2006/updates/modules/*.rpm; do [[ "$i" != *devel* ]] && rpm -qp --qf '%{name} ' $i; done; echo
-                # we already have legacy drivers: nvidia nvidia-kernel-2.6.12-17mdk-i586-up-1GB
-                # tricky to handle (requires pcitable tweaks): a320raid-kernel-2.6.12-17mdk-i586-up-1GB
-                # no doc: hcfpcimodem-doc hsfmodem-doc
-                packages => [
-                    # Fritz! drivers
-                    qw(fcdsl2-kernel-2.6.12-17mdk-i586-up-1GB fcdsl-kernel-2.6.12-17mdk-i586-up-1GB fcdslsl-kernel-2.6.12-17mdk-i586-up-1GB fcdslslusb-kernel-2.6.12-17mdk-i586-up-1GB fcdslusb2-kernel-2.6.12-17mdk-i586-up-1GB fcdslusba-kernel-2.6.12-17mdk-i586-up-1GB fcdslusb-kernel-2.6.12-17mdk-i586-up-1GB fcpci-kernel-2.6.12-17mdk-i586-up-1GB fcusb2-kernel-2.6.12-17mdk-i586-up-1GB fcusb-kernel-2.6.12-17mdk-i586-up-1GB fxusb_CZ-kernel-2.6.12-17mdk-i586-up-1GB fxusb-kernel-2.6.12-17mdk-i586-up-1GB),
-                    qw(ati ati-kernel-2.6.12-17mdk-i586-up-1GB hcfpcimodem hcfpcimodem-kernel-2.6.12-17mdk-i586-up-1GB hsfmodem hsfmodem-kernel-2.6.12-17mdk-i586-up-1GB madwifi madwifi-kernel-2.6.12-17mdk-i586-up-1GB nvidia_legacy nvidia_legacy-kernel-2.6.12-17mdk-i586-up-1GB slmodem slmodem-kernel-2.6.12-17mdk-i586-up-1GB unicorn unicorn-kernel-2.6.12-17mdk-i586-up-1GB),
-                ],
-            },
-        ]),
-        # ken:/mnt/BIG/dis/2006.0/one/
-        rpms => [
-            'rpms/unionfs-kernel-2.6.12-17mdk-i586-up-1GB-1.1.1.1.20060117.1mdk-1mdk.i586.rpm',
-            'rpms/unionfs-tools-1.1.1-1.20060117.1mdk.i586.rpm',
-            'rpms/draklive-install-0.1-6mdk.noarch.rpm',
-            'rpms/drakx-finish-install-10.3-0.64.4.20060mdk.i586.rpm',
-            'rpms/drakxtools-10.3-0.64.4.20060mdk.i586.rpm',
-            'rpms/drakxtools-backend-10.3-0.64.4.20060mdk.i586.rpm',
-            'rpms/drakxtools-newt-10.3-0.64.4.20060mdk.i586.rpm',
-            'rpms/harddrake-10.3-0.64.4.20060mdk.i586.rpm',
-            'rpms/harddrake-ui-10.3-0.64.4.20060mdk.i586.rpm',
-            'rpms/mandriva-theme-One-1.0.12-3mdk.noarch.rpm',
-            'rpms/mandriva-theme-One-screensaver-1.0.12-3mdk.noarch.rpm',
-            'rpms/mdkonline-2.0-2mdk.noarch.rpm',
-            'rpms/gurpmi-4.7.15-1.3.20060mdk.noarch.rpm',
-            'rpms/urpmi-4.7.15-1.3.20060mdk.noarch.rpm',
-            'rpms/rpmdrake-2.20-4.1.20060mdk.i586.rpm',
-            if_($local_cfg{BUILD_CDCOM}, 'rpms/xmoto-0.1.11-0.1.20060mdk.i586.rpm'),
-        ],
-        erase_rpms => [
-            #'mandriva-theme', # doesn't work, the preuninstall script is buggy and completely removes the theme
-            'mandriva-theme-screensaver',
-        ],
-        disable_services => [
-            qw(bluetooth cpufreq laptop-mode pcmcia),
-            qw(cups hplip),     # printing
-            qw(capi4linux ibod isdn4linux isdnlog),
-            qw(cpqarrayd upsd upsmon), # uncommon hardware
-            qw(lisa ntpd snmpd), # unneeded software
-            qw(acpi acpid),     # enabled by drakboot when needed
-            qw(dkms),           # slows down live boot
-            if_($local_cfg{BUILD_CDCOM}, qw(hcfpci hsf slmodemd)),
-        ],
-        vga_mode => 788,
-    },
-    regions => {'americas_western_europe' => ['br','ca','cy','de','en_GB','en_IE','en_US','es','eu','fr','ga','gl','gn','it','iu','kl','lb','mt','nds','oc','pt','pt_BR','qu','sc','wa'],'asiafrica' => ['af','am','ar','as','az','ber','bn','fa','gu','he','hi','hy','id','ja','ka','km','kn','ko','ku','ky','lo','mi','ml','mn','mr','ms','ne','pa_IN','ph','ss','st','ta','te','tg','th','tk','tt','ug','ur','uz','uz@Latn','ve','vi','xh','zh_CN','zh_TW','zu'],'central_europe' => ['da','el','eo','fi','fo','fur','fy','is','li','nb','nl','nn','se','sv','tr'],'eastern_europe' => ['be','bg','bs','cs','et','hr','hu','lt','ltg','lv','mk','pl','ro','ru','sk','sl','sq','sr','sr@Latn','uk','yi']},
-    media => {
-        storage => 'cdrom',
-    },
-    mount => $predefined{mounts}{volatile_squash_union},
-};
diff --git a/live/One/2006.0/config/local_cfg b/live/One/2006.0/config/local_cfg
deleted file mode 100644
index 1b57394e5..000000000
--- a/live/One/2006.0/config/local_cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-WORKDIR=/home/public/live/2006.0
-CHROOT=/chroot/live/2006.0
-REPOSITORY=/mnt/ken/community/2006.0/i586
-BUILD_CDCOM=0
diff --git a/live/One/2006.0/config/patch-2006-live.pl b/live/One/2006.0/config/patch-2006-live.pl
deleted file mode 100644
index 37b13f6fd..000000000
--- a/live/One/2006.0/config/patch-2006-live.pl
+++ /dev/null
@@ -1,201 +0,0 @@
-$o->{autoExitInstall} = 1;
-$o->{build_live_system} = 1;
-$o->{desktop} = 'KDE';
-$o->{autologin} = ${$o->{users}}[0]->{name};
-
-
-my %cmdline;
-my $opt; foreach (@ARGV) {
-    if (/^--?(.*)/) {
-        $cmdline{$opt} = 1 if $opt;
-        $opt = $1;
-    } else {
-        $cmdline{$opt} = $_ if $opt;
-        $opt = '';
-    }
-} $cmdline{$opt} = 1 if $opt;
-exists $cmdline{langs} and $o->{locale}{langs} = +{ map { $_ => 1 } split(':', $cmdline{langs}) };
-
-use install_any;
-package install_any;
-
-undef *ejectCdrom;
-*ejectCdrom = sub {};
-
-use pkgs;
-package pkgs;
-
-undef *read_rpmsrate;
-*read_rpmsrate = sub {
-    my ($packages, $rpmsrate_flags_chosen, $f) = @_;
-
-    my ($rates, $flags, $need_to_copy) = read_rpmsrate_raw($f);
-    
-    foreach (keys %$flags) {
-	my $p = packageByName($packages, $_) or next;
-	my @flags = (@{$flags->{$_}}, map { if_(/locales-(.*)/, qq(LOCALES"$1")) } $p->requires_nosense);
-
-	@flags = map {
-	    my ($user_flags, $known_flags) = partition { /^!?CAT_/ } split('\|\|', $_);
-	    my $ok = find {
-		my $inv = s/^!//;
-		$inv xor do {
-		    if (my ($p) = /^HW"(.*)"/) {
-			return $::o->{build_live_system} ? !$inv : detect_devices::matching_desc__regexp($p);
-		    } elsif (($p) = /^HW_CAT"(.*)"/) {
-			return $::o->{build_live_system} ? !$inv : modules::probe_category($p);
-		    } elsif (($p) = /^DRIVER"(.*)"/) {
-			return $::o->{build_live_system} ? !$inv : detect_devices::matching_driver__regexp($p);
-		    } elsif (($p) = /^TYPE"(.*)"/) {
-			return $::o->{build_live_system} ? !$inv : detect_devices::matching_type($p);
-		    } else {
-			$rpmsrate_flags_chosen->{$_};
-		    }
-		};
-	    } @$known_flags;
-	    $ok ? 'TRUE' : @$user_flags ? join('||', @$user_flags) : 'FALSE';
-	} @flags;
-
-	$p->set_rate($rates->{$_});
-	$p->set_rflags(member('FALSE', @flags) ? 'FALSE' : @flags);
-    }
-    push @{$packages->{needToCopy} ||= []}, @$need_to_copy;
-};
-
-undef *bestKernelPackage;
-*bestKernelPackage = sub {
-    my ($packages) = @_;
-
-    my @kernels = packages2kernels($packages) or internal_error('no kernel available');
-    my ($version_BOOT) = c::kernel_version() =~ /^(\d+\.\d+)/;
-    if (my @l = grep { $_->{version} =~ /\Q$version_BOOT/ } @kernels) {
-	#- favour versions corresponding to current BOOT version
-	@kernels = @l;
-    }
-    my @preferred_exts =
-      $::o->{build_live_system} ? '-i586-up-1GB' :
-      detect_devices::is_xbox() ? '-xbox' :
-      detect_devices::is_i586() ? '-i586-up-1GB' :
-      !detect_devices::has_cpu_flag('pae') ? ('-i686-up-4GB', '-i586-up-1GB') :
-      detect_devices::hasSMP() ? '-smp' :
-      '';
-    foreach my $prefered_ext (@preferred_exts, '') {
-	if (my @l = grep { $_->{ext} eq $prefered_ext } @kernels) {
-	    @kernels = @l;
-	}
-    }
-
-    log::l("bestKernelPackage (" . join(':', @preferred_exts) . "): " . join(' ', map { $_->{pkg}->name } @kernels) . (@kernels > 1 ? ' (choosing the first)' : ''));
-    $preferred{'kernel-source-' . $kernels[0]{version}} = undef;
-    $kernels[0]{pkg};
-};
-
-undef *selected_leaves;
-*selected_leaves = sub {
-    my ($packages) = @_;
-    my $provides = $packages->{provides};
-
-    my @l = grep { $_->flag_requested || $_->flag_installed } @{$packages->{depslist}};
-
-    my %required_ids;
-    foreach my $pkg (@l) {
-	foreach my $req ($pkg->requires_nosense) {
-	    my $h = $provides->{$req} or next;
-	    my @provides = my ($provide) = keys %$h;
-	    @provides == 1 or next;
-	    if ($provide != (exists $required_ids{$pkg->id} ? $required_ids{$pkg->id} : $pkg->id)) {
-#		log::l($packages->{depslist}[$provide]->name . " is not a leaf because required by " . $pkg->name . " (through require $req)"); 
-		#- $pkg requires $req, provided by $provide, so we can skip $provide
-		$required_ids{$provide} = $pkg->id;
-	    }
-	}
-    }
-    [ map { $_->name } grep { ! exists $required_ids{$_->id} } @l ];    
-};
-
-use install_steps;
-package install_steps;
-
-my $old = \&configureNetwork;
-undef *configureNetwork;
-*configureNetwork = sub {
-    my ($o) = @_;
-    if ($o->{build_live_system}) {
-        require network::ethernet;
-        network::ethernet::install_dhcp_client($o, undef);
-    }
-    &$old;
-};
-
-undef *doPartitionDisksAfter;
-*doPartitionDisksAfter = sub {
-    my ($o) = @_;
-
-    if (!$::testing) {
-	my $hds = $o->{all_hds}{hds};
-	partition_table::write($_) foreach @$hds;
-	$_->{rebootNeeded} and $o->rebootNeeded foreach @$hds;
-    }
-
-    fs::set_removable_mntpoints($o->{all_hds});
-    fs::mount_options::set_all_default($o->{all_hds}, %$o, lang::fs_options($o->{locale}))
-	if !$o->{isUpgrade};
-
-    $o->{fstab} = [ fs::get::fstab($o->{all_hds}) ];
-
-    if ($::local_install) {
-	my $p = fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ]);
-	my $part = fs::get::device2part($p->{device}, $o->{fstab}) || $o->{fstab}[0];
-	$part->{mntpoint} = '/';
-	$part->{isMounted} = 1;
-    }
-
-    fs::get::root_($o->{fstab}) or die "Oops, no root partition";
-
-    if (arch() =~ /ppc/ && detect_devices::get_mac_generation() =~ /NewWorld/) {
-	die "Need bootstrap partition to boot system!" if !(defined $partition_table::mac::bootstrap_part);
-    }
-    
-    if (arch() =~ /ia64/ && !fs::get::has_mntpoint("/boot/efi", $o->{all_hds})) {
-	die N("You must have a FAT partition mounted in /boot/efi");
-    }
-
-    if ($o->{partitioning}{use_existing_root}) {
-	#- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat
-	fs::mount::part($_) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} }
-				    grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}};
-    }
-
-    cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/nfsimage| &&
-      !any { $_->{mntpoint} eq "/mnt/nfs" } @{$o->{all_hds}{nfss}} and
-	push @{$o->{all_hds}{nfss}}, { fs_type => 'nfs', mntpoint => "/mnt/nfs", device => $1, options => "noauto,ro,nosuid,soft,rsize=8192,wsize=8192" };
-};
-
-use network::network;
-package network::network;
-
-undef *write_zeroconf;
-*write_zeroconf = sub {
-    my ($net, $in) = @_;
-    my $zhostname = $net->{zeroconf}{hostname};
-    my $file = $::prefix . $tmdns_file;
-
-    if ($zhostname) {
-	$in->do_pkgs->ensure_binary_is_installed('tmdns', 'tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
-	$in->do_pkgs->ensure_binary_is_installed('zcip', 'zcip', 'auto');
-    }
-
-    #- write blank hostname even if disabled so that drakconnect does not assume zeroconf is enabled
-    eval { substInFile { s/^\s*(hostname)\s*=.*/$1 = $zhostname/ } $file } if $zhostname || -f $file;
-
-    require services;
-    services::set_status('tmdns', $net->{zeroconf}{hostname}, $::isInstall);
-};
-
-use Xconfig::card;
-package Xconfig::card;
-
-#- don't create (potentially broken) ld.so.conf.d files for X drivers
-#- anyway we don't want to configure it for the live system
-undef *libgl_config;
-*libgl_config = sub {};
diff --git a/live/One/2006.0/config/rpmsrate b/live/One/2006.0/config/rpmsrate
deleted file mode 100644
index 5656b9f30..000000000
--- a/live/One/2006.0/config/rpmsrate
+++ /dev/null
@@ -1,783 +0,0 @@
-
-
-CAT_LSB
-  5 lsb
-
-CAT_ICEWM
-  5 icewm
-  5 rox
-  3 icepref
-
-CAT_GRAPHICAL_DESKTOP
-  4 WindowMaker
-  3 epplets blackbox fluxbox enlightenment ethemes xfce
-  2 wmnet
-  1 lesstif-mwm
-
-CAT_GNOME
-  5 gnome-panel nautilus nautilus-filesharing gnome-control-center metacity
-  5 yelp gnome2 gdm
-  4 gnome-applets gtk-themes file-roller
-    gnome-utils gucharmap xlockmore 
-    gconf-editor desktop-printing eog evince
-  4 CAT_THEMES gnome-icon-theme gnome-themes-extras gnome-themes hicolor-icon-theme gdm-themes
-  3 gnome-pilot
-  2 bug-buddy
-
-CAT_KDE
-  5 galaxy-kde x86-compat-galaxy-kde galaxy-kde-kwin kdebase-nsplugins kdebase-progs krozat mandriva-galaxy xsettings-kde
-  5 kdebase-kdm
-  5 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-be kde-i18n-bg kde-i18n-bn kde-i18n-br kde-i18n-bs kde-i18n-ca kde-i18n-cs kde-i18n-cy kde-i18n-da kde-i18n-de kde-i18n-el kde-i18n-en_GB kde-i18n-eo kde-i18n-es kde-i18n-et kde-i18n-eu kde-i18n-fa kde-i18n-fi kde-i18n-fo kde-i18n-fr kde-i18n-ga kde-i18n-gl kde-i18n-he kde-i18n-hi kde-i18n-hr kde-i18n-hu kde-i18n-id kde-i18n-is kde-i18n-it kde-i18n-ja kde-i18n-ko kde-i18n-lo kde-i18n-lt kde-i18n-lv kde-i18n-mi kde-i18n-mk kde-i18n-mn kde-i18n-ms kde-i18n-mt kde-i18n-nb kde-i18n-nds kde-i18n-nl kde-i18n-nn kde-i18n-oc kde-i18n-pa kde-i18n-pl kde-i18n-pt kde-i18n-pt_BR kde-i18n-ro kde-i18n-ru kde-i18n-se kde-i18n-sk kde-i18n-sl kde-i18n-sr kde-i18n-sv kde-i18n-ta kde-i18n-tg kde-i18n-th kde-i18n-tr kde-i18n-uk kde-i18n-uz kde-i18n-vi kde-i18n-wa kde-i18n-xh kde-i18n-zh_CN.GB2312 kde-i18n-zh_TW.Big5 kde-i18n-zu
-  5 kdebase-servicemenu zip
-  5 kdeutils-ark kdeutils-kcalc kdeutils-kcharselect kdeutils-kdf kdeutils-kfloppy kdeutils-kdepasswd
-  5 kdepim-kontact
-  5 kdeaddons-searchbar
-  5 kdeutils-kwalletmanager
-  5 kdegraphics-kuickshow
-  3 kdeutils-kedit kdeutils-khexedit kdeutils-kjots kdeutils-ktimer
-  4 CAT_GRAPHICS || PHOTO kdegraphics-common
-  4 CAT_THEMES kdeartwork kdeartwork-kde-classic
-  4 digikam digikamimageplugins kipi-plugins dcraw
-  4 klamav
-
-CAT_VIDEO
-  5 CAT_GNOME totem xine-esd
-  5 CAT_KDE kaffeine
-  5 CAT_KDE kdenlive
-  5 CAT_ICEWM xine-ui
-  4 RealPlayer
-  3 powerdvd
-  3 xmms-smpeg mplayer-gui
-  2 xmovie
-TV
-  5 CAT_KDE kdetv
-  5 !CAT_KDE || CAT_GNOME || CAT_ICEWM tvtime
-  3 xawtv
-  3 zapping
-  3 HW"ATI" ati.2
-
-CAT_OFFICE
-  5 CAT_KDE || CAT_GNOME OpenOffice.org
-  5 CAT_KDE || CAT_GNOME OpenOffice.org-l10n-af OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-cy OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-et OpenOffice.org-l10n-eu OpenOffice.org-l10n-fi OpenOffice.org-l10n-fr OpenOffice.org-l10n-he OpenOffice.org-l10n-hu OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nb OpenOffice.org-l10n-nl OpenOffice.org-l10n-nn OpenOffice.org-l10n-ns OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-pt_BR OpenOffice.org-l10n-ru OpenOffice.org-l10n-sk OpenOffice.org-l10n-sl OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr OpenOffice.org-l10n-zh_CN OpenOffice.org-l10n-zh_TW OpenOffice.org-l10n-zu
-  5 CAT_KDE koffice-kivio
-  5 !CAT_KDE || CAT_GNOME || CAT_ICEWM dia
-  5 gnucash gnucash-hbci gnucash-ofx
-  5 planner
-  5 CAT_KDE kdenetwork-kdict
-  5 CAT_KDE kdepim-karm
-  5 CAT_ICEWM abiword gnumeric
-  4 acroread acroread-nppdf 
-  4 acroread-l10n-da acroread-l10n-de
-  3 gaddr xpdf gv
-  3 wv ical
-  2 units lyx
-  CAT_KDE
-    5 kdepim-korganizer
-    5 kdepim-kaddressbook
-    5 kdepim-knotes
-    5 kdegraphics-kghostview kdegraphics-kpdf
-    5 kdepim-kpilot
-    3 koffice koffice-i18n-af koffice-i18n-az koffice-i18n-br koffice-i18n-eo koffice-i18n-fa koffice-i18n-he koffice-i18n-ja koffice-i18n-lo koffice-i18n-lt koffice-i18n-mt koffice-i18n-ro koffice-i18n-se koffice-i18n-sk koffice-i18n-ta koffice-i18n-th koffice-i18n-tr koffice-i18n-uk koffice-i18n-zh_TW koffice-i18n-zu koffice-i18n-bg
-    3 kdegraphics-kdvi
-  CAT_GNOME
-    4 gnome-pim
-    3 gnome-pilot-conduits
-
-CAT_SPELLCHECK
-  5 aspell-af aspell-am aspell-az aspell-be aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-en aspell-eo aspell-es aspell-et aspell-fa aspell-fi aspell-fo aspell-fr aspell-ga aspell-gd aspell-gl aspell-gv aspell-he aspell-hi aspell-hr aspell-hu aspell-id aspell-is aspell-it aspell-ku aspell-lt aspell-lv aspell-mi aspell-mk aspell-mn aspell-mr aspell-ms aspell-mt aspell-nds aspell-nl aspell-nn aspell-no aspell-pa aspell-pl aspell-pt aspell-ro aspell-ru aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-ta aspell-tl aspell-tr aspell-uk aspell-uz aspell-vi aspell-wa aspell-yi aspell-zu
-  5 myspell-af_ZA myspell-bg_BG myspell-ca_ES myspell-cs_CZ myspell-cy_GB myspell-da_DK myspell-de_AT myspell-de_CH myspell-de_DE myspell-el_GR myspell-en_AU myspell-en_CA myspell-en_GB myspell-en_NZ myspell-en_US myspell-es_ES myspell-es_MX myspell-et_EE myspell-fo_FO myspell-fr_BE myspell-fr_FR myspell-ga_IE myspell-gl_ES myspell-hr_HR myspell-hu_HU myspell-id_ID myspell-it_IT myspell-lt_LT myspell-mi_NZ myspell-ms_MY myspell-nb_NO myspell-nl_NL myspell-nn_NO myspell-pl_PL myspell-pt_BR myspell-pt_PT myspell-ro_RO myspell-ru_RU myspell-sk_SK myspell-sl_SI myspell-sv_SE myspell-sw_KE myspell-uk_UA myspell-zu_ZA
-  5 myspell-hyph-bg myspell-hyph-cs myspell-hyph-da myspell-hyph-de myspell-hyph-el myspell-hyph-en myspell-hyph-es myspell-hyph-et myspell-hyph-fi myspell-hyph-fr myspell-hyph-ga myspell-hyph-hu myspell-hyph-id myspell-hyph-is myspell-hyph-it myspell-hyph-lt myspell-hyph-nl myspell-hyph-pl myspell-hyph-pt myspell-hyph-ru myspell-hyph-sk myspell-hyph-sl myspell-hyph-sv myspell-hyph-uk
-
-SOUND
-  5 CAT_KDE kdemultimedia-kmix
-  5 CAT_ICEWM aumix
-  3 CAT_KDE xmms-arts
-  3 sox
-
-CAT_AUDIO
-  5 CAT_KDE kdemultimedia-kscd
-  5 CAT_KDE xine-arts amarok-engine-arts
-  5 CAT_KDE || CAT GNOME audacity
-  5 CAT_KDE kdemultimedia-kaudiocreator kdemultimedia-common
-  5 CAT_KDE || CAT_GNOME gnome-media
-  4 CAT_GNOME rhythmbox sound-juicer
-  5 CAT_ICEWM grip
-  4 CAT_GNOME gnome-audio
-  4 CAT_KDE rosegarden4
-  3 cdp
-  3 cdparanoia
-  3 cdrecord-cdda2wav
-  3 CAT_GNOME gnome-audio-extra
-  3 CAT_KDE kdeaddons-noatun
-  3 CAT_KDE kdemultimedia-kmid
-  3 CAT_KDE kdemultimedia-kmidi
-  3 CAT_KDE kdemultimedia-noatun
-  3 timidity-instruments
-  3 beep-media-player
-  5 DRIVER"^snd-" alsa-utils
-  4 DRIVER"^snd-" gstreamer-alsa
-
-  5 DRIVER"^snd-sb" cspctl
-  5 DRIVER"^snd-sb|^sbawe" sb16_csp
-  5 DRIVER"^sbawe" awesfx
-  5 DRIVER"snd-darla20|snd-darla24|snd-gina20|snd-gina24|snd-gina3g|snd-indi|snd-indigodj|snd-indigoio|snd-layla20|snd-layla24|snd-layla3g|snd-mia|snd-mona" echomixer
-  5 DRIVER"snd-emu10k1|snd-emu10k1x" as10k1 ld10k1
-  5 DRIVER"snd-hdsp" hdspconf hdsploader hdspmixer rmedigicontrol
-  5 DRIVER"snd-ice1712|snd-ice1724" envy24control
-
-  5 DRIVER"snd-pcxhr" pcxhrloader
-  5 DRIVER"snd-sscape" sscape_ctl
-  5 DRIVER"snd-mixart" mixartloader
-  5 DRIVER"snd-usb-usx2y" us428control usx2yloader
-  5 DRIVER"^snd-vx" vxloader
-  3 xmms-esd
-  3 xmms-kjofol-skins
-  3 xmms-more-vis-plugins
-  3 xmms-skins
-  3 3D xmms-mesa
-  3 HW"Rio 500" rio500
-  2 mp3info mpg123 playmidi playmidi-X11 xmms-mikmod
-
-
-CAT_ACCESSIBILITY
-  5 dasher
-  5 gnopernicus
-  5 gok
-  5 CAT_KDE kdeaccessibility
-  2 gtkeyboard
-
-CAT_PUBLISHING
-  5 scribus
-  5 enscript ghostscript-module-X 
-  4 psutils texinfo
-  2 docbook-dtd31-sgml latex2html jadetex tetex-afm tetex-dvips tetex-latex tetex-xdvi tetex-latex-arab tetex-latex-heb 
-  2 CAT_BOOKS tetex-doc
-  1 cttex docbook-style-dsssl openjade 
-  1 CAT_BOOKS docbook-style-dsssl-doc
-
-CAT_SHELLS
-  3 zsh
-  3 CAT_BOOKS bash-doc zsh-doc
-  2 pdksh tcsh
-  1 bash1
-
-CAT_SCIENCES
-  4 gnuplot
-  3 HDF
-  2 mathplot octave
-
-CAT_EDUCATION
-  4 CAT_KDE kdeedu
-
-CAT_EDITORS
-  4 emacs-X11
-  3 GXedit
-  3 CAT_KDE kdebase-kate
-  3 vim-X11
-  3 yudit
-  2 cooledit emacs-tramp emacs-leim jed-xjed joe nedit xemacs xemacs-extras xemacs-info
-  1 emacs-el xemacs-el emacs-nox jed 
-  CAT_GNOME
-    4 gedit
-
-CAT_TEXT_TOOLS
-  5 words
-  4 groff patch recode rgrep
-  3 ed
-  2 groff-gxditview lout
-  CAT_BOOKS
-    3 gawk-doc
-    1 lout-doc
-
-CAT_COMMUNICATIONS
-  5 efax
-  5 gnomemeeting
-  5 CAT_KDE kphone
-  4 CAT_KDE kdebase-kdeprintfax kdegraphics-kfax
-  4 CAT_ICEWM drakfax
-  4 CAT_ICEWM jpilot pilot-link
-  4 hylafax-client 
-  2 hylafax-server dip
-  2 lrzsz mgetty mgetty-contrib mgetty-sendfax mgetty-viewfax mgetty-voice minicom
-  1 jpilot-Mail jpilot-syncmal statserial
-
-CAT_TERMINALS
-  5 open
-  5 !CAT_KDE !CAT_GNOME xterm
-  5 CAT_KDE kdebase-konsole
-  5 CAT_GNOME gnome-terminal
-  4 screen kon2
-  3 bash-completion
-  3 Eterm vlock
-  3 aterm x3270
-
-  3 CAT_GNOME gnome-telnet
-  4 LOCALES"ja" kterm 
-
-CAT_NETWORKING_CHAT
-  3 CAT_KDE kdenetwork-ktalk
-  3 talk ytalk
-
-CAT_NETWORKING_CHAT_SERVER
-  4 jabber 
-  3 talk-server
-
-CAT_NETWORKING_FILE_TRANSFER
-  5 CAT_X gftp
-  5 lftp mirrordir rsync
-  4 CAT_KDE lisa
-  4 rdist
-  3 fmirror ncftp tftp
-  2 uucp
-
-CAT_NETWORKING_FILE_TRANSFER_SERVER
-  4 proftpd
-  3 proftpd-anonymous
-  2 wu-ftpd anonftp
-
-CAT_NETWORKING_LDAP_SERVER
-  4 openldap-servers directory_administrator
-
-CAT_NETWORKING_INSTANT_MESSAGING
-  5 CAT_KDE kdenetwork-kopete
-  5 LOCALES"zh" CAT_KDE eva
-  5 !CAT_KDE || CAT_GNOME gaim
-  3 licq
-  3 ayttm
-  3 licq-console licq-rms
-  CAT_GNOME
-    3 gnomeicu gossip
-    3 gtk+licq
-
-CAT_NETWORKING_IRC
-  3 xchat
-  3 BitchX
-  3 CAT_KDE kdenetwork-ksirc
-  3 mozilla-irc
-  2 irssi
-  1 eggdrop
-
-CAT_NETWORKING_FIREWALLING_SERVER
-  5 iproute2 routed iptables
-  3 prelude-manager
-
-CAT_NETWORKING_GROUPWARE_SERVER
-  5 kolab-server
-  3 phpgroupware
-
-CAT_NETWORKING_MAIL
-  5 CAT_KDE kdepim-kmail
-  5 CAT_GNOME evolution
-  3 mailx metamail
-  3 faces mozilla-thunderbird mozilla-thunderbird-en mozilla-thunderbird-fr
-  3 fetchmail urlview mutt spamassassin
-  3 !CAT_GNOME !CAT_KDE xmailbox
-  3 CAT_KDE kdepim-korn
-  2 FaxMail faces-xface
-  1 fetchmail-daemon fetchmailconf
-
-CAT_NETWORKING_MAIL_SERVER
-  5 postfix 
-  4 mailman
-  3 imap
-
-CAT_NETWORKING_NEWS
-  5 CAT_KDE kdepim-knode
-  5 CAT_GNOME pan
-  2 slrn
-  1 slrn-pull
-
-CAT_NETWORKING_NEWS_SERVER
-  4 inn 
-  3 inews 
-
-CAT_NETWORKING_OTHER
-  2 finger ucd-snmp-utils macutils
-
-CAT_NETWORKING_OTHER_SERVER
-  3 dhcp-server gated ntp
-
-  3 intimed nscd pidentd
-    rdate bootparamd 
-    cleanfeed ucd-snmp leafnode
-    cvsweb
-    xorg-x11-Xvfb xorg-x11-Xnest
-  2 diald finger-server mars-nwe
-
-CAT_NIS
-  5 ypbind
-
-CAT_NIS_SERVER
-  5 ypserv
-
-CAT_NETWORKING_REMOTE_ACCESS
-  5 openssh-clients telnet-client-krb5 keychain
-  4 traceroute rfbdrake
-  3 CAT_KDE kdeutils-kdessh
-  3 tightvnc
-  2 rsh
-
-CAT_NETWORKING_REMOTE_ACCESS_SERVER
-  5 openssh-server
-  4 rfbdrake
-  2 tightvnc-server
-  1 telnet-server-krb5 rsh-server
-  3 CAT_BOOKS tightvnc-doc
-
-CAT_NETWORKING_DNS
-  4 bind-utils 
-
-CAT_NETWORKING_DNS_SERVER
-  5 bind 
-  4 caching-nameserver
-  1 nslint
-
-CAT_NETWORKING_FILE
-  4 samba-client nfs-utils-clients 
-    CAT_X smb4k
-  2 CAT_X LinNeighborhood 
-  2 arkeia-gui arkeia-client arkeia-arkc
-  2 CAT_GNOME gnomba gtm
-  2 autofs
-
-CAT_NETWORKING_FILE_SERVER 
-  5 nfs-utils
-  4 samba-server
-  3 CAT_BOOKS samba-doc
-  3 CAT_KDE kdenetwork-krfb
-  2 arkeia-server samba-winbind
-  3 squid squidGuard
-
-CAT_NETWORKING_WWW
-  5 CAT_X mozilla-firefox
-  5 CAT_X mozilla-firefox-af mozilla-firefox-br mozilla-firefox-ca mozilla-firefox-cs mozilla-firefox-da mozilla-firefox-de mozilla-firefox-el mozilla-firefox-es mozilla-firefox-fi mozilla-firefox-fr mozilla-firefox-ga mozilla-firefox-he mozilla-firefox-hu mozilla-firefox-it mozilla-firefox-ja mozilla-firefox-ko mozilla-firefox-nb mozilla-firefox-nl mozilla-firefox-pl mozilla-firefox-pt mozilla-firefox-pt_BR mozilla-firefox-ro mozilla-firefox-ru mozilla-firefox-sk mozilla-firefox-sl mozilla-firefox-sv mozilla-firefox-tr mozilla-firefox-zh_CN mozilla-firefox-zh_TW
-  5 CAT_KDE kdewebdev
-  5 CAT_GNOME screem
-  5 CAT_GNOME epiphany epiphany-extensions
-  4 FlashPlayer crossover-plugin-demo j2re x86-compat-j2re
-  4 wget
-  4 lynx
-  3 CAT_KDE kdeaddons
-  3 links
-  3 CAT_KDE kdenetwork-kget
-  3 CAT_KDE kdenetwork-knewsticker
-  3 mozilla
-  3 mozplugger
-  3 opera
-  3 bluefish
-  CAT_DEVELOPMENT
-    4 nvu
-
-CAT_NETWORKING_WWW_SERVER
-  5 apache-mpm-prefork apache-mod_perl apache-mod_ssl apache-mod_php
-  4 apache-mod_suexec
-  4 CAT_BOOKS apache-doc
-  3 drbd-utils-heartbeat
-  3 php-gd php-imap php-ldap php-mysql
-    php-pgsql php-readline php_cgi mod_sxnet HTML-Embperl
-  3 CAT_BOOKS php-manual-en php-manual-fr
-
-CAT_GRAPHICS
-  5 qiv
-  5 gimp ufraw-gimp
-  5 CAT_KDE kuickshow
-  5 !CAT_KDE gthumb
-  5 CAT_KDE kdegraphics-ksnapshot
-  4 !CAT_KDE || CAT_GNOME flphoto gtkam
-  4 ImageMagick giftrans gphoto2
-  3 gimp-data-extras
-  3 CAT_BOOKS
-  3 CAT_KDE kdeaddons-konqimagegallery
-  3 CAT_KDE kdegraphics-kpaint
-  3 CAT_KDE kdegraphics-kruler
-  3 CAT_KDE kdegraphics-kview
-  3 CAT_KDE kdegraphics-mrmlsearch
-  3 skencil
-  3 xwpick
-  3 xli
-  2 gif2png gimp-perl xpcd xfig xpcd-gimp gd-utils
-  1 netpbm libungif-progs qcad transfig xpaint xmorph
-  1 3D Mesa-demos
-  CAT_GNOME
-    3 gnome-iconedit
-    3 ee
-
-CAT_ARCHIVING
-  5 unzip zip dump sharutils
-  2 mt-st
-  2 taper
-  1 lha
-  CAT_GNOME
-    2 gnozip
-    2 gtktalog
-
-BURNER
-  5 mkisofs cdrecord dvd+rw-tools
-  5 CAT_KDE k3b-dvd kover
-  5 CAT_GNOME nautilus-cd-burner
-  4 !CAT_KDE !CAT_GNOME CAT_X xcdroast
-  3 gcombust
-  3 CAT_GNOME gnome-toaster
-  2 !CAT_KDE !CAT_GNOME CAT_X eroaster
-  CAT_DEVELOPMENT
-    3 cdrecord-devel
-
-SCANNER
-  4 sane-frontends xsane
-  4 CAT_KDE kdegraphics-kooka
-
-PHOTO
-  4 gphoto gphoto2 ufraw
-
-CAT_DATABASES
-  5 postgresql
-  3 MySQL-client
-  CAT_DATABASES_SERVER
-    4 postgresql-server
-    3 MySQL
-    2 postgresql-jdbc postgresql-tcl postgresql-test
-  CAT_DEVELOPMENT 
-    4 perl-Mysql
-    3 postgresql-devel
-    1 MySQL-bench libmysql14-devel libmysql-devel
-
-CAT_GAMES
-  5 frozen-bubble
-  5 lbreakout2
-  5 supertux
-  5 crack-attack crack-attack-music crack-attack-sounds
-  3 clanbomber freeciv-client toppler
-  3 cxhextris rocksndiamonds powermanga mures methane
-  2 Maelstrom pingus ltris penguin-command pysol xpilot trophy xboard skobo xpat2 xsoldier xfishtank
-  1 fortune-mod nil
-  CAT_GNOME
-    3 gnome-games
-    3 gnome-chess
-  CAT_KDE
-    3 kdegames
-    3 kdeaddons-atlantik
-    3 kdetoys
-  3D
-    5 armagetron csmash
-      !HW"Riva.*128" chromium ppracer
-
-    3 !HW"Riva.*128" !HW"Rage X[CL]" !HW"Rage Mobility (?:P\/M|L) " !HW"3D Rage (?:LT|Pro)" bzflag
-
-CAT_DEVELOPMENT
-  5 autoconf2.1 automake1.4 m4 make 
-  3 autoconf2.5
-  1 tmake pmake
-
-  5 libtool binutils ltrace gcc
-  2 gperf indent
-  1 glibc-profile
-
-  4 gcc-c++ libstdc++6-devel libstdc++-devel
-  2 libsigc++-examples
-
-  4 bison flex
-  2 byacc
-
-  2 doxygen C++2LaTeX
-
-  3 jikes kaffe
-  1 gcc-java
-
-  5 cvs rcs
-  2 diffstat tkcvs
-
-  3 swig
-
-  4 python tkinter
-  3 libpython2.4-devel python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
-
-  4 perl perl-Term-Readline-Gnu perl-libwww-perl perl-devel
-  3 perl-DBI perl-IO-stringy perl-PDL perl-Parse-RecDescent 
-    perl-Tk perlftlib perl-URI perl-DB_File
-    perl-Data-ShowTable perl-HTML-Parser perl-HTML-SimpleParse
-    perl-MIME-tools perl-MP3-Info perl-MailTools perl-Msgcat
-
-  4 rpm-build
-  3 rpmlint librpm4.4-devel rpm-devel rpm-rebuilder
-  3 kernel-source
-
-  2 gcc-g77 nasm dev86 
-  1 gcc-objc
-
-  2 gprolog ocaml umb-scheme mawk guile clisp
-    hugs98 swi-prolog ruby 
-
-  4 gettext-devel libncurses5-devel ncurses-devel
-
-  5 CAT_X memprof
-  5 valgrind
-  5 gdb
-  1 xxgdb
-
-  CAT_BOOKS
-    5 qt3-example
-    2 pam-doc python-docs slang-doc kernel-doc nasm-doc ruby-doc lkmpg
-
-  CAT_KDE
-    5 kdevelop
-    5 kdesdk
-    5 libkdenetwork2-kopete-devel libkdebase4-kate-devel libkdepim2-common-devel
-      libkdebase4-nsplugins-devel libkdepim2-kaddressbook-devel
-      libkdepim2-kmail-devel libkdecore4-devel kdecore-devel libkdepim2-knode-devel
-      libkdeedu1-devel kdeedu-devel libkdepim2-kontact-devel libkdegames1-devel
-      libkdepim2-korganizer-devel libkdegraphics0-common-devel
-      libkdepim2-kpilot-devel libkdegraphics0-kooka-devel
-      libkdesdk1-cervisia-devel libkdegraphics0-kpovmodeler-devel
-      libkdesdk1-devel kdesdk-devel libkdegraphics0-ksvg-devel libkdesdk1-kbabel-devel
-      libkdegraphics0-kview-devel libkdetoys1-devel kdetoys-devel
-      libkdemultimedia1-common-devel libkdeutils1-common-devel
-      libkdemultimedia1-kscd-devel libkdeutils1-ksim-devel
-      libkdemultimedia1-noatun-devel libkdevelop3-devel kdevelop-devel libarts1-devel arts-devel
-      libqt3-devel qt-devel quanta-devel libquanta0-kfilereplace-devel
-      libquanta0-kommander-devel koffice-devel
-
-  CAT_GNOME
-    3 glade2 pygnome libgnomeui2_0-devel libpanel-applet-2_0-devel
-    2 pygnome-capplet pygnome-libglade
-      libgnomemm-1.2_9-devel libgnome-pilot2-devel glademm 
-    1 libgnucash0-devel 
-
-  CAT_DEVELOPMENT_OTHER
-    2 libMagick8.4.2-devel libMagick-devel libMesaGLU1-devel libXaw3d7-devel Xaw3d-devel
-      libgd2-devel gd-devel p2c-devel libgmp3-devel gmp-devel libguile12-devel guile-devel libgr-devel libjpeg62-devel libjpeg-devel libpng3-devel libpng-devel
-      libtermcap2-devel libtermcap-devel libtiff3-devel libtiff-devel libungif4-devel libungif-devel libxml2-devel libxml-devel
-      libslang1-devel slang-devel sox-devel zlib1-devel zlib-devel libxorg-x11-devel dev86-devel
-      libgdk-pixbuf2-devel gdk-pixbuf-devel libgimp2.0-devel gimp-devel libgpm1-devel gpm-devel libghttp1-devel libghttp-devel libgtop2.0_5-devel libgtop-devel
-      libmikmod2-devel libmikmod-devel librep-devel libunicode0-devel libunicode-devel libpopt0-devel popt-devel libpwdb0-devel pwdb-devel libt1lib5-devel t1lib-devel
-      libsnmp-devel mpeg_lib-devel libWindowMaker0-devel WindowMaker-devel libaa1-devel libaa-devel libadns1-devel adns-devel
-      libalsa2-devel libalsa-devel libaudiofile0-devel audiofile-devel libcups2-devel cups-devel e2fsprogs-devel
-      libg-wrap1-devel g-wrap-devel gkrellm-devel libPropList0-devel libPropList-devel licq-devel openldap-devel
-      libparted1.6-devel parted-devel pciutils-devel pilot-link-devel svgalib-devel
-      librecode0-devel recode-devel libaspell15-devel aspell-devel cracklib-devel faces-devel libfnlib0-devel fnlib-devel
-      libfreetype6-devel freetype-devel gtk+mdk-devel libgtkglarea5-devel gtkglarea-devel libxorg-x11-static-devel imap-devel
-      php-devel libpth20-devel pth-devel libsane1-devel sane-devel swig-devel xdelta-devel isapnptools-devel
-      libpango1.0_0-devel pango-devel libreadline5-devel readline-devel
-
-CAT_MONITORING
-  5 procinfo psacct
-  4 lsof swatch tcpdump traceroute
-  4 nmap lm_sensors
-  4 CAT_X nmap-frontend
-  4 smartmontools
-  3 CAT_KDE kdeutils-ksim
-  3 iplog arpwatch lslk xcpustate xsysinfo pciutils lshw
-  2 cfengine gkrellm gps rusers mon 
-  2 3D xtraceroute
-  1 logcheck
-  CAT_GNOME
-    4 gnome-system-monitor
-
-CAT_FILE_TOOLS
-  5 file gnupg mkxauth mtools slocate
-  4 symlinks mc
-  3 dosfstools draksync tree
-  2 git FileRunner
-  1 xdelta
-
-CAT_WEBMIN
-  5 webmin
-  5 mdkwebadmin
-  CAT_BOOKS
-    3 mandriva-doc-Server_Conf_Guide-en mandriva-doc-Server_Conf_Guide-fr
-    3 mandriva-doc-contrib-Server_Conf_Guide-pl mandriva-doc-contrib-Server_Conf_Guide-zh_cn
-
-CAT_WIZARDS
-  5 drakwizard
-
-CAT_CONFIG
-  3 ipvsadm quota nut
-  2 gfcc adjtimex xinput timeconfig samba-swat
-  1 ipxutils
-
-CAT_BOOKS
-  4 mandriva-doc-Starter-de mandriva-doc-Starter-en mandriva-doc-Starter-es mandriva-doc-Starter-fr mandriva-doc-Starter-it mandriva-doc-Starter-pt_br
-  4 mandriva-doc-contrib-Starter-et mandriva-doc-contrib-Starter-zh_cn mandriva-doc-contrib-Starter-pl
-  4 META_CLASS"desktop" mandriva-doc-Discovery-en mandriva-doc-Discovery-fr
-
-CAT_X
-  5 xorg-x11 xorg-x11-server rxvt xorg-x11-75dpi-fonts urw-fonts fonts-ttf-dejavu
-  5 icewm-light monitor-edid
-  5 HIGH_SECURITY mountloop
-  5 LOCALES"zh" || LOCALES"am" scim-tables
-  5 LOCALES"ja" scim-anthy scim-input-pad scim-tomoe
-  5 LOCALES"ja" !CAT_KDE uim-gtk
-  5 LOCALES"ja" CAT_KDE uim-qt
-  5 LOCALES"ko" scim-hangul
-  5 LOCALES"vi" scim-m17n
-  5 LOCALES"zh" scim-pinyin
-  5 LOCALES"zh_TW" scim-chewing
-  5 LOCALES"am" || LOCALES"ja" || LOCALES"ko" || LOCALES"vi"  || LOCALES"zh" CAT_KDE scim-qtimm
-  5 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" rxvt-CJK rxvt-unicode
-
-  4 vim-enhanced
-  4 gurpmi rpmdrake drakconf userdrake fonts-ttf-decoratives fonts-ttf-west_european
-    mandrake-mime menudrake desktop-common-data
-    mdkonline drakfirsttime gtk-engines bootsplash
-    galaxy-gnome x86-compat-galaxy-gnome
-
-  CAT_BOOKS
-    3 mandriva-doc-Drakxtools-Guide-de mandriva-doc-Drakxtools-Guide-en mandriva-doc-Drakxtools-Guide-es mandriva-doc-Drakxtools-Guide-fr mandriva-doc-Drakxtools-Guide-it mandriva-doc-Drakxtools-Guide-pt_br
-    3 mandriva-doc-contrib-Drakxtools-et mandriva-doc-contrib-Drakxtools-ru
-
-  3 xorg-x11-100dpi-fonts draksync
-  3 USB usbview
-  2 LOCALES"ja" || LOCALES"ko" || LOCALES"zh" jmcce 
-  2 imlib-cfgeditor
-  1 Mesa xtoolwait X11R6-contrib 
-
-
-  3 ami fcitx gcin im-ja imhangul kinput2-wnn4 nabi scim-canna scim-fcitx scim-m17n scim-prime scim-skk scim-uim skim xvnkb
-
-  2 app-defaults-be app-defaults-cs app-defaults-ga app-defaults-ru app-defaults-th app-defaults-uk
-
-  5 LOCALES"ru" || LOCALES"uk" xorg-x11-cyrillic-fonts
-    LOCALES"am" fonts-ttf-ethiopic
-    LOCALES"ar" fonts-ttf-arabic-arabeyes fonts-ttf-arabic-kacst
-    LOCALES"ar" || LOCALES"fa" || LOCALES"ur" fonts-ttf-arabic-farsi
-    LOCALES"as" || LOCALES"bn" fonts-ttf-bengali
-    LOCALES"el" fonts-type1-greek
-    LOCALES"he" || LOCALES"yi" fonts-hebrew-elmar fonts-type1-hebrew
-    LOCALES"hy" fonts-ttf-armenian
-    LOCALES"ja" fonts-ttf-japanese
-    LOCALES"kn" fonts-ttf-kannada
-    LOCALES"ko" fonts-ttf-korean
-    LOCALES"ta" fonts-ttf-tamil fonts-ttf-tscii fonts-bitmap-tscii 
-    LOCALES"th" fonts-ttf-thai
-    LOCALES"zh" fonts-ttf-chinese 
-    LOCALES"zh_CN" fonts-ttf-gb2312
-    LOCALES"zh_TW" taipeifonts fonts-ttf-big5
-  4 META_CLASS"download" mandriva-theme
-  4 META_CLASS"desktop" mandriva-theme-Discovery 
-      CAT_KDE discovery-icons-theme
-  4 META_CLASS"server" mandriva-theme-Powerpack+
-  4 META_CLASS"powerpack" mandriva-theme-Powerpack
-
-DOCS
-  5 man info man-pages
-
-CAT_SYSTEM
-  5 at eject ldetect harddrake udev s2u sharutils
-    locales iputils urpmi cpio msec tmpwatch gnupg
-
-  5 dmidecode setarch
-
-  5 HIGH_SECURITY libsafe kernel-secure lads
-
-  5 PCMCIA pcmcia-cs
-
-  5 HW"HighPoint Technologies Inc.\|HPT37|Promise Technology.*FastTrak" || DRIVER"ata_piix|i2o_block|megaraid|sata_sil" mdadm dmraid
-  5 HW"American Power Conversion\|Back-UPS Pro 500|MGE UPS Systems\|" nut-server
-  5 HW"iKey 3000 Token" rnboifd
-  5 HW_CAT"network/slmodem" slmodem
-  5 DRIVER"^LT:|slamr|slusb|^Hcf:|^Hsf:" ppp
-      CAT_KDE kdenetwork-kppp
-  5 DRIVER"^LT:" ltmodem
-  5 HW"OmniKey Cardman" cm2020
-     SMP cm2020-smp
-     HIGH_SECURITY cm2020-secure
-     BIGMEM cm2020-enterprise
-  5 DRIVER"a320raid" || HW"HostRAID" a320raid-kernel
-     SMP a320raid-kernelsmp
-  5 HW"\|SynPS/2 Synaptics TouchPad|\|AlpsPS/2 ALPS TouchPad" synaptics
-  5 HW"\|SynPS/2 Synaptics TouchPad|\|AlpsPS/2 ALPS TouchPad" CAT_KDE ksynaptics
-
-  5 CAT_KDE || CAT_GNOME gnome-volume-manager
-
-  5 DRIVER"slamr|slusb" slmodem-kernel
-  5 HW"DAC960|cpqarray" cpqarrayd
-  5 DRIVER"^ISDN:" ibod isdn4net isdn4k-utils
-  5 DRIVER"eagle-usb" eagle-usb
-  5 HW_CAT"input/joystick" joystick
-  5 HW_CAT"multimedia/radio" CAT_KDE kradio qtradio
-  5 HW_CAT"multimedia/radio" CAT_GNOME gnomeradio
-  5 HW_CAT"multimedia/dvb" dvb-apps dvbsnoop dvbstream dvbtune
-  5 CAT_KDE  HW_CAT"bus/bluetooth" kdebluetooth
-  5 !CAT_KDE || CAT_GNOME HW_CAT"bus/bluetooth" gnome-bluetooth
-  5 DRIVER"ipw2100" ipw2100-firmware
-  5 DRIVER"ipw2200" ipw2200-firmware
-  5 DRIVER"ath_pci" madwifi-kernel madwifi
-  5 DRIVER"prism54" prism54-firmware
-  5 DRIVER"^at76" atmel-firmware
-  5 DRIVER"speedtch" speedtouch speedtouch_mgmt
-  5 DRIVER"^Hcf:" hcfmodem
-  5 DRIVER"^Hsf:" hsfmodem
-
-  5 HW_CAT"bus/bluetooth" bluez-utils
-
-  5 CAT_KDE TYPE"wireless" kdenetwork-kwifimanager
-  5 TYPE"wireless" libiw27 wireless-tools
-
-
-  5 CAT_KDE TYPE"laptop" kdeutils-klaptop
-  5 !CAT_KDE TYPE"laptop" cpufreqd
-  5 TYPE"laptop" cpufreq apmd hotkeys laptop-mode-tools
-  3 evms evms-gui evms-cli evms-ncurses
-
-  4 ftp-client-krb5 hexedit strace sudo grub procmail hdparm coreutils-doc bc
-    lsof
-
-  4 TYPE"laptop" netprofile
-
-  2 sndconfig acpid adns audiofile freeswan fbset vlan-utils gpm
-  1 fdutils genromfs mailcap pinfo
-
-  CAT_BOOKS 
-    5 man-pages-cs man-pages-da man-pages-de man-pages-es man-pages-fr man-pages-hu man-pages-id man-pages-it man-pages-ja man-pages-ko man-pages-pl man-pages-pt_BR man-pages-ru man-pages-zh
-    4 grub-doc lilo-doc
-      howto-html-de howto-html-el howto-html-en howto-html-es howto-html-fi howto-html-fr howto-html-hu howto-html-id howto-html-it howto-html-ja howto-html-ko howto-html-nl howto-html-pl howto-html-ro howto-html-sl howto-html-sv howto-html-zh
-
-  4 CAT_NIS yp-tools
-  3 TYPE"laptop" irda-utils
-  3 USB usbutils
-
-  4 LOCALES"ar" || LOCALES"fa" || LOCALES"he" || LOCALES"yi" acon
-  3 LOCALES"zh" zh-autoconvert
-
-CAT_EMULATORS
-  3 wine
-
-CAT_PRINTER
-  4 xpp nmap printer-testpages scli net-tools foomatic-db-engine
-    foomatic-filters foomatic-db foomatic-db-hpijs ImageMagick
-    ghostscript printer-filters printer-utils mpage 
-    a2ps ppdfilt groff lesstif
-    libsnmp0 
-    hplip-hpijs postscript-ppds
-    gutenprint-ijs gutenprint-foomatic gutenprint-escputil
-    gutenprint-gimp2
-
-INSTALL
-  NOCOPY
-    5 kernel-2.6.12.17mdk kernel kernel-smp-2.6.12.17mdk kernel-smp kernel-i686-up-4GB-2.6.12.17mdk kernel-i686-up-4GB
-      mdadm lvm2 reiserfsprogs jfsprogs xfsprogs 
-      alsa-utils xorg-x11 xorg-x11-server 
-      ik8utils toshutils
-    4 brltty
-
-  5 pptp-linux dhcpcd dhcpxd dhcp-client rp-pppoe pump  
-    ppp nfs-utils-clients ppp-pppoe ppp-pppoatm
-    autologin ntp samba-server ncpfs ucd-snmp libptal0
-    shorewall iptables samba-client perl-Net-DNS mandi-ifw
-    ipchains nc sndconfig curl
-    mtools mtoolsfm numlock usbutils
-    ypbind
-    autofs pam_ldap pam_krb5 libsasl2-plug-gssapi nss_ldap openldap-clients samba-winbind
-    tmdns zcip acpi acpid
-    ibod isdn4net isdn-light isdn4k-utils kernel-2.4
-    eagle-usb
-    speedtouch speedtouch_mgmt
-    kdenetwork-kppp-provider
-    synaptics dkms-minimal
-    prism2-utils wpa_supplicant
-
-  5 cups cups-drivers hpoj libhpojip0 gutenprint-cups
-    xojpanel libsane-hpoj1
-    sane-backends sane-frontends scanner-gui xsane
-
-  4 xorg-x11-glide-module Glide_V3-DRI Glide_V5 Mesa
-    hplip libsane-hpaio1 libhpip0
diff --git a/live/One/2006.0/files/defaultspooler b/live/One/2006.0/files/defaultspooler
deleted file mode 100644
index 462d36c28..000000000
--- a/live/One/2006.0/files/defaultspooler
+++ /dev/null
@@ -1 +0,0 @@
-cups
diff --git a/live/One/2006.0/files/finish-install b/live/One/2006.0/files/finish-install
deleted file mode 100644
index 699de55c8..000000000
--- a/live/One/2006.0/files/finish-install
+++ /dev/null
@@ -1,4 +0,0 @@
-FINISH_INSTALL=yes
-NETWORK=no
-AUTHENTICATION=no
-USERS=no
diff --git a/live/One/2006.0/files/firstboot b/live/One/2006.0/files/firstboot
deleted file mode 100644
index a842497f7..000000000
--- a/live/One/2006.0/files/firstboot
+++ /dev/null
@@ -1 +0,0 @@
-FIRSTBOOT=no
diff --git a/live/One/2006.0/files/halt.local b/live/One/2006.0/files/halt.local
deleted file mode 100644
index b39f97581..000000000
--- a/live/One/2006.0/files/halt.local
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use MDK::Common;
-use detect_devices;
-use c;
-
-system("mount -t proc none /proc");
-my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!;
-system("umount /proc");
-$device or exit;
-
-# try to put halt/reboot in cache, if not called directly from them
-system("$_ --help 2>/dev/null") foreach qw(halt reboot);
-
-my $f = detect_devices::tryOpen($device);
-# see openCdromTray() and unlockCdrom(), from install_any
-ioctl($f, c::CDROM_LOCKDOOR(), 0);
-ioctl($f, c::CDROMEJECT(), 0);
-
-print "\n\nPlease press <Enter> once the medium is removed.\n";
-<STDIN>;
-
-ioctl($f, 0x5319, 0); # CDROMCLOSETRAY
diff --git a/live/One/2006.0/files/kbluetoothdrc b/live/One/2006.0/files/kbluetoothdrc
deleted file mode 100644
index 13147822b..000000000
--- a/live/One/2006.0/files/kbluetoothdrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-[Notification Messages]
-kbluepinLocInfo-usr-lib-kdebluetooth=false
-[General]
-AutoStart=false
diff --git a/live/One/2006.0/files/kside238-ONE.png b/live/One/2006.0/files/kside238-ONE.png
deleted file mode 100644
index 606b9d344..000000000
--- a/live/One/2006.0/files/kside238-ONE.png
+++ /dev/null
diff --git a/live/One/2006.0/patches/Cards+.legacy.patch b/live/One/2006.0/patches/Cards+.legacy.patch
deleted file mode 100644
index 12316bc47..000000000
--- a/live/One/2006.0/patches/Cards+.legacy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr/share/ldetect-lst/Cards+.legacy	2006-03-07 12:42:06.000000000 -0500
-+++ usr/share/ldetect-lst/Cards+	2006-03-07 12:42:40.000000000 -0500
-@@ -1931,7 +1931,7 @@
- SEE NVIDIA Legacy
- 
- NAME NVIDIA GeForce3 (generic)
--SEE NVIDIA GeForce
-+SEE NVIDIA Legacy
- 
- NAME NVIDIA GeForce3 (xbox)
- DRIVER nvxbox
-@@ -1939,7 +1939,7 @@
- LINE Option "HWCursor" "0"
- 
- NAME NVIDIA GeForce4 (generic)
--SEE NVIDIA GeForce
-+SEE NVIDIA Legacy
- 
- NAME NVIDIA GeForce FX (generic)
- SEE NVIDIA GeForce
diff --git a/live/One/2006.0/patches/halt.loopfs.patch b/live/One/2006.0/patches/halt.loopfs.patch
deleted file mode 100644
index 2ea4829a6..000000000
--- a/live/One/2006.0/patches/halt.loopfs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- etc/init.d/halt.loopfs	2005-12-27 22:13:48.000000000 +0100
-+++ etc/init.d/halt	2005-12-27 22:14:28.000000000 +0100
-@@ -23,7 +23,7 @@
- }
- 
- halt_get_remaining() {
--	awk '$2 ~ /^\/$|^\/proc|^\/sys|^\/dev/{next}
-+	awk '$2 ~ /^\/$|^\/proc|^\/sys|^\/dev|^\/live/{next}
- 	     $3 == "tmpfs" || $3 == "proc" {print $2 ; next}
- 	     /(^#|loopfs|autofs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next}
- 	     {print $2}' /proc/mounts
-@@ -139,7 +139,7 @@
- # Unmount loopback stuff first
- remaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts`
- devremaining=`awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
--[ -n "$remaining" ] && {
-+/bin/false && [ -n "$remaining" ] && {
- 	sig=
- 	retry=3
- 	while [ -n "$remaining" -a "$retry" -gt 0 ]
diff --git a/live/One/2006.0/patches/lp.script.start.patch b/live/One/2006.0/patches/lp.script.start.patch
deleted file mode 100644
index 6a2b36b23..000000000
--- a/live/One/2006.0/patches/lp.script.start.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/dynamic/scripts/lp.script.start	2006-03-03 10:15:52.000000000 -0500
-+++ etc/dynamic/scripts/lp.script	2006-03-03 10:59:14.000000000 -0500
-@@ -78,6 +78,8 @@
- 	    # not already running
- 	    ps auxwww | grep 'perl /usr/sbin/autosetupprintqueues' | grep -vq grep && return
- 	    ps auxwww | grep 'perl /usr/sbin/printerdrake' | grep -vq grep && return
-+	    chkconfig --add cups
-+	    service cups status >/dev/null || service cups start
- 	    autosetupprintqueues --$AUTO_SETUP_QUEUES_MODE &
- 	fi
-     fi
diff --git a/live/One/2006.0/patches/netfs.loopfs.patch b/live/One/2006.0/patches/netfs.loopfs.patch
deleted file mode 100644
index a2b32902a..000000000
--- a/live/One/2006.0/patches/netfs.loopfs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/init.d/netfs.loopfs	2005-09-19 17:34:31.000000000 +0200
-+++ etc/init.d/netfs	2005-12-27 19:23:39.000000000 +0100
-@@ -50,7 +50,7 @@
-         # Unmount loopback stuff first
- 	remaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $2}' /proc/mounts`
- 	devremaining=`LC_ALL=C awk '!/^#/ && $1 ~ /^\/dev\/loop/ && $2 != "/" {print $1}' /proc/mounts`
--	[ -n "$remaining" ] && {
-+	/bin/false && [ -n "$remaining" ] && {
- 	        sig=
- 		retry=3
- 		while [ -n "$remaining" -a "$retry" -gt 0 ]