restore previous commit (due to SVN issue)

7 files changed, 34 insertions, 25 deletions

diff --git a/images/Makefile b/images/Makefile
index 850b7b83b..420191f9c 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
 include ../Makefile.config
 
-VERSION=1.50
+VERSION=1.51
 PRODUCT=drakx-installer-images
 KERNELS=$(shell rpm -qf /lib/modules/2.*)
 
diff --git a/images/make_boot_img b/images/make_boot_img
index 87c333a1f..deceb07a8 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -3,6 +3,8 @@
 use Config;
 use FileHandle;
 use MDK::Common;
+use POSIX;
+
 Config->import;
 my ($arch) = $Config{archname} =~ /(.*?)-/;
 
@@ -281,10 +283,12 @@ sub boot_img_i386 {
     _ "cp -f $rdz $tmp_mnt/$short_type.rdz";
     unlink $rdz;
 
-    my $size = max(chomp_(`du -s -k $tmp_mnt`) + 50, 1440);
+    # mtools wants the image to be a power of 32
+    my $size = max((ceil(chomp_(`du -s -k $tmp_mnt`) / 32) * 32) + 64, 1440);
     _ "dd if=/dev/zero of=$img bs=1k count=$size";
 
-    _ "mkdosfs-with-dir $tmp_mnt $img";
+    _ "/sbin/mkdosfs $img";
+    _ "mcopy -i $img $tmp_mnt/* ::";
     _ "syslinux $img";
     _ "rm -rf $tmp_mnt";
 }
@@ -775,9 +779,11 @@ sub hd_grub {
 
     my ($grub_dir) = glob("/lib/grub/*-*");
     my @grub_files = map { "$grub_dir/$_" } qw(stage1 stage2);
-    my $size = 40_000 + sum(map { -s $_ } @grub_files);
 
-    _ "dd if=/dev/zero of=$img bs=1 count=$size";
+    # mtools wants the image to be a power of 32
+    my $size = ceil((40_000 + sum(map { -s $_ } @grub_files)) / 32 / 1024) * 32;
+
+    _ "dd if=/dev/zero of=$img bs=1k count=$size";
 
     _ "rm -rf $tmp_mnt"; mkdir $tmp_mnt;
     _ "cp @grub_files $tmp_mnt";
@@ -810,7 +816,8 @@ pause .
 pause HELP END
 EOF
 
-    _ "mkdosfs-with-dir $tmp_mnt $img";
+    _ "/sbin/mkdosfs $img";
+    _ "mcopy -i $img $tmp_mnt/* ::";
     _ "rm -rf $tmp_mnt";
 
     output($mapfile, "(fd0) $img\n");
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 603c2d880..ae5c5f908 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -20,7 +20,7 @@ our %l = (
       if_(arch() !~ /alpha|sparc/,
         qw(3c501 3c503 3c505 3c507 3c509 3c515 3c990 3c990fx),
         qw(82596 ac3200 acenic aironet4500_card amd8111e at1700 atl2 atp),
-        qw(bcm4400 cassini cs89x0 de600 de620),
+        qw(bcm4400 cassini cs89x0 cx82310_eth de600 de620),
         qw(depca dmfe e2100 eepro eexpress enic eth16i),
         qw(ewrk3 hp hp-plus hp100),
         qw(iph5526), #- fibre channel
@@ -41,8 +41,8 @@ our %l = (
     ],
     firewire => [ qw(eth1394 pcilynx) ],
     gigabit => [
-      qw(atl1 atl1c atl1e be2net bnx2 bnx2x cxgb cxgb3 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe myri_sbus netxen_nic ns83820 qla3xxx r8169 s2io sfc sxg_nic
-      sis190 sk98lin skge sky2 slicoss spidernet tehuti tg3 via-velocity virtio_net vxge yellowfin),
+      qw(atl1 atl1c atl1e be2net bna bnx2 bnx2x cxgb cxgb3 dl2k e1000 e1000e et131x igb ipg ixgb ixgbe myri_sbus netxen_nic ns83820 pch_gbe qla3xxx r8169 s2io sfc sxg_nic
+      sis190 sk98lin skge sky2 slicoss spidernet stmmac tehuti tg3 via-velocity virtio_net vxge yellowfin),
       qw(bcm5820 bcm5700), #- encrypted
     ],
 
@@ -62,14 +62,14 @@ our %l = (
     ],
     wireless => [
       qw(acx-pci acx-usb adm8211 agnx airo airo_cs aironet4500_cs),
-      qw(aironet_cs ar9170usb arlan arusb_lnx at76_usb ath5k ath9k),
-      qw(ath_pci atmel_cs atmel_pci b43 b43legacy bcm43xx com20020_cs),
+      qw(aironet_cs ar9170usb arlan arusb_lnx at76_usb ath5k ath6kl ath9k),
+      qw(ath_pci atmel_cs atmel_pci b43 b43legacy bcm43xx bcm_wimax brcm80211 carl9170 com20020_cs),
       qw(dyc_ar5 hostap_cs hostap_pci hostap_plx i2400m-usb ipw2100),
       qw(ipw2200 ipw3945 iwl3945 iwl4965 iwlagn iwlwifi madwifi_pci),
       qw(mwl8k ndiswrapper netwave_cs orinoco orinoco_cs),
       qw(orinoco_nortel orinoco_pci orinoco_plx orinoco_tmd p54pci),
       qw(p54usb prism2_cs prism2_pci prism2_usb prism54 r8180),
-      qw(r8187se r8192_pci r8192s_usb r8192u_usb ray_cs rndis_wlan rt2400 rt2400pci rt2500),
+      qw(r8187se r8192_pci r8192s_usb r8192u_usb r8712u ray_cs rndis_wlan rt2400 rt2400pci rt2500),
       qw(rt2500pci rt2500usb rt2570 rt2800pci rt2800usb rt2860 rt2860sta rt2870),
       qw(rt2870sta rt3070sta rt61 rt61pci rt73 rt73usb rtl8180),
       qw(rtl8187se rtusb spectrum_cs usbvnet_rfmd vt6655_stage vt6656_stage vt_ar5k w35und),
@@ -85,7 +85,7 @@ our %l = (
       qw(hso nozomi option sierra),
     ],
     modem => [
-      qw(ltmodem mwave sm56),
+      qw(ltmodem mwave sm56 ft1000),
     ],
     slmodem => [
       qw(slamr slusb snd-ali5451 snd-atiixp-modem snd-intel8x0m snd-via82xx-modem),
@@ -153,7 +153,7 @@ our %l = (
     virtual => [ qw(xenblk virtio_blk) ],
     pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs pata_pcmcia sym53c500_cs) ],
     raw => [ qw(ide-gd_mod sd_mod) ],
-    usb => [ qw(usb-storage) ],
+    usb => [ qw(usb-storage keucr uas) ],
     firewire => [ qw(sbp2) ],
     cdrom => [ qw(ide-cd_mod sr_mod) ],
     card_reader => [ qw(sdhci tifm_sd tifm_7xx1) ],
@@ -275,8 +275,10 @@ our %l = (
   # just here for classification, unused categories (nor auto-detect, nor load_thiskind)
   {
     raid => [
-      qw(dm-crypt dm-mirror dm-mod dm-zero linear lvm-mod multipath raid0 raid1 raid10 raid456 raid5 raid6),
-      qw(dm-delay dm-log dm-mem-cache dm-message dm-raid4-5 dm-region_hash faulty md-mod),
+      qw(dm-crypt dm-log dm-log-userspace dm-mirror dm-mod dm-multipath dm-queue-length dm-raid dm-region-hash dm-round-robin),
+      qw(dm-service-time dm-snapshot dm-zero faulty linear lvm-mod md-mod multipath md-mod raid0 raid10 raid1 raid456),
+      # needed by raid456 and dm-raid 456 target
+      qw(async_memcpy async_pq async_raid6_recov async_tx async_xor raid6_pq xor),
     ],
     mouse => [
       qw(atixlmouse busmouse generic_serial inport ioc3_serial logibm logibusmouse msbusmouse pcips2 qpmouse synclinkmp),
diff --git a/mdk-stage1/ppp/pppd/tdb.c b/mdk-stage1/ppp/pppd/tdb.c
index 7fd58291e..fd8ce6082 100644
--- a/mdk-stage1/ppp/pppd/tdb.c
+++ b/mdk-stage1/ppp/pppd/tdb.c
@@ -482,7 +482,7 @@ static tdb_off tdb_allocate(TDB_CONTEXT *tdb, tdb_len length)
 static int tdb_new_database(TDB_CONTEXT *tdb, int hash_size)
 {
 	struct tdb_header header;
-	tdb_off offset;
+//	tdb_off offset;
 	int i, size = 0;
 	tdb_off buf[16];
 
@@ -501,7 +501,7 @@ static int tdb_new_database(TDB_CONTEXT *tdb, int hash_size)
         } else size += sizeof(header);
 	
         /* the freelist and hash pointers */
-        offset = 0;
+//        offset = 0;
         memset(buf, 0, sizeof(buf));
 
         for (i=0;(hash_size+1)-i >= 16; i += 16) {
diff --git a/mdk-stage1/ppp/pppd/utils.c b/mdk-stage1/ppp/pppd/utils.c
index 5861d8980..8605ff201 100644
--- a/mdk-stage1/ppp/pppd/utils.c
+++ b/mdk-stage1/ppp/pppd/utils.c
@@ -616,10 +616,9 @@ logit(level, fmt, args)
     char *fmt;
     va_list args;
 {
-    int n;
     char buf[1024];
 
-    n = vslprintf(buf, sizeof(buf), fmt, args);
+//    int n = vslprintf(buf, sizeof(buf), fmt, args);
     log_write(level, buf);
 }
 
diff --git a/rescue/devices.pl b/rescue/devices.pl
index 0d4a8f77f..c80366a1e 100644
--- a/rescue/devices.pl
+++ b/rescue/devices.pl
@@ -14,7 +14,7 @@ foreach (<DATA>) {
 	    }
 	};
 	foreach (@l2) {
-	    my $cmd = "mknod-m600 $_ $typ $maj " . $min++;
+	    my $cmd = "fakeroot mknod-m600 $_ $typ $maj " . $min++;
 	    system($cmd) == 0 or die "$cmd failed\n";
 	}
     }
diff --git a/rescue/list.xml b/rescue/list.xml
index 20f4ee266..90d2dc3b2 100644
--- a/rescue/list.xml
+++ b/rescue/list.xml
@@ -30,6 +30,7 @@
   rsync
   ssh scp
   telnet
+  tcpdump
   host
 
   date
@@ -105,8 +106,9 @@
   lspci lspcidrake
 
   rpm
-  rpm2cpio rpmdb
-  rpmquery rpmverify
+  db51_verify
+  db51_archive
+  rpm2cpio
 
   vim-minimal hexedit
 
@@ -190,9 +192,8 @@
 
 <from dir="/usr/lib/rpm" expand="glob">
   <mode copy="keep-links">
-    rpmrc
     macros
-    rpmpopt-*
+    rpmpopt
   </mode>
 </from>