Changeset 1842 in MondoRescue for branches

Timestamp:

Dec 15, 2007, 2:24:34 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix lack of /etc/raidtab at restore rime in the right place
• Adds support for nls_utf8 and pata_serverworks Patches from Dirk Husung (husung_at_tu-harburg.de)
• Add efibootmgr to deplist.txt in order to be able to modify EFI menu at restore time on ia64
• Usage of the new testver param of pb 0.8.12 to deliver 2.2.5 packages in a test dir.
• Update pbcl files for upcoming delivery of 2.2.5
• Fix an issue on parted output (K instead of KB) in parted2fdisk at restore time
• Adds support for alb/aft types of bonding on Intel cards (Mark Pinkerton <Mark.Pinkerton_at_emageon.com>)
• Escape variables in a perl script like mindi-bkphw
• Better Proliant support at restore time now.
• Fix a label bug where the variable label should also be re-initialized at each loop
• start-nfs should NOT do exit => kernel panix as init exits
• some other fixes for init on denymods
• Adds boot options denymods (for udev) and forcemods (if not udev)
• kqemu is denied. Probably should also be done for kvm stuff
• Fix again the bug on modules link at root of the initrd. Hopefully for good.
• Wait more around the USB CD emulated by iLO as it takes up to 5 seconds to come up
• Attempt to fix udev support for RHEL 5.1
• Better support for automatic iLO Virtual Media with udev
• Some VMWare support improvements (however, it seems that VMWare support won't be possible anytime soon)
• during init at restore time, copy all static evices availble for udev, as some distro implementation are no

t yet supported correctly for udev. Not very elegant, but should solve our current issues

• Fedora 8 now supported as a build target for pb
• svn.log removed.
• dependencies reviewd for rhel_3
• Attempt to fix the lack of modules loaded at restore time - especially fs device drivers
• removes bkphw dir before potential creation
• render mount command more vebose at restore time
• Should fix #217
• Increase BOOT_SIZE and EXTRA_SIZE to support features such as HW recovery
• Handles udev.files files which could be symlinks
• Improve udev support for distro with compressed modules (mdv e.g.)
• Fix modules.dep copy
• /sbin/pam_console_apply is needed by mdv udev conf
• Adds support for nohw boot option to avoid re-setuping the HW conf
• Improved support for Proliant on cpqacuxe
• RstHW should be called after driver initialization
• For debian/ubuntu mindi dpends on mindi-busybox
• Update mindi-busybox pbcl for correct debian changelog generation, and up2date infos
• Should fix #215
• Fix #214 (Thanks to xdelaruelle)
• Fix again svn.log not used anymore with new pb version
• Adaptation of build process to upcoming 0.8.12 version of pb
• Remove MONOTONIC clock to continue to support 2.4 kernels (RHEL 3 e.g. or ESX)
• Attempt to solve ia64 BMC access through the serial port
• parted2fdisk binary no more generated
• do not require perl modules (strict.pm) at restore time
• try to avoid modprobe messages at restore time
• on ia64 now use the perl script parted2fdisk at retore time also
• Also modprobe modules for udev after decompressing the additional ones
• replace gzip -v9 by gzip -c9. Fix a bug at least on ia64
• For all modules supported, create symlinks under the mountpoint and extract dev files as some are not automat ically created at the moment
• Support /vmfs/volumes for ESX
• Finally do not use vdf for ESX. Only creates issues.
• Avoids continuing hw support if no product name found
• Improves ia64 support for bootable image build
• Fix a potential problem with ramdisk_blocksize param
• MAKEDEV should also be included in deplist.txt
• More fixes for udev support for Debian
• Do not mount /boot if it's already mounted - avoids ESX hang
• Fix NICs renumbering on Debian at least
• Udev startup improvement to support iLO + NFS so modprobing all modules seems required as of now
• Update to version 1.7.3 of busybox for pb
• Load USB earlier in order to support KBD such as with iLO
• Do busybox ldd first in order to create a potential /lib64 link correctly and then use it later in the image
• Use variable DF in mindi to be able to support the ESX vdf
• Fix mindi for Debian x86_64 where /lib64 is a link
• Fix issue at restore time for ext2fs params not reused (Fix from Klaus Ade Johnstad <klaus_at_skolelinux.no>)
• Do not copy udev files if they do not exist In udev case do not insert modules at all (udev should do it alone) May avoid the issue with rhel4.5 kernel ? To be tested
• Update dependencies for rpm base build as well
• And also perl is a debian/ubuntu dep
• Better debian/ubuntu dependecies requirements (mtools)
• Fix modes on mindi-bkphw (Thanks Phil Walker phil.walker_at_hp.com)
• Complete rev [1771] for upper case RESTORE cli with syslinux as well
• Update mindi-busybox to 1.7.3
• Use RESTORE consistently across mondo to restore without interaction (report from Takeshi Shoji t.shoji_at_tripodw.jp)

(merge -r1769:1841 $SVN_M/branches/2.2.5)

Location:

branches/stable

Files:

• mindi-busybox/.config (modified) (2 diffs)
• mindi-busybox/ChangeLog (deleted)
• mindi-busybox/Makefile (modified) (1 diff)
• mindi-busybox/coreutils/tail.c (modified) (2 diffs)
• mindi-busybox/include/libbb.h (modified) (1 diff)
• mindi-busybox/networking/httpd.c (modified) (1 diff)
• mindi-busybox/networking/inetd.c (modified) (2 diffs)
• mindi-busybox/networking/libiproute/iptunnel.c (modified) (1 diff)
• mindi-busybox/shell/ash.c (modified) (2 diffs)
• mindi-busybox/sysklogd/logger.c (modified) (2 diffs)
• mindi/ChangeLog (deleted)
• mindi/Makefile.parted2fdisk (deleted)
• mindi/README.bkphw (modified) (1 diff)
• mindi/deplist.txt (modified) (1 diff)
• mindi/distributions/conf/mindi.conf.dist (modified) (3 diffs)
• mindi/install.sh (modified) (3 diffs)
• mindi/isolinux-H.cfg (modified) (1 diff)
• mindi/mindi (modified) (26 diffs)
• mindi/mindi-bkphw (modified) (5 diffs)
• mindi/parted2fdisk.pl (modified) (10 diffs)
• mindi/proliant.files (modified) (1 diff)
• mindi/rootfs/etc/udev-links.conf (modified) (1 diff)
• mindi/rootfs/sbin/find-and-mount-cdrom (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (18 diffs)
• mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)
• mindi/rootfs/sbin/parted2fdisk-ia64 (deleted)
• mindi/rootfs/sbin/start-nfs (modified) (1 diff)
• mindi/rootfs/sbin/start-usb (modified) (1 diff)
• mindi/syslinux-H.cfg (modified) (1 diff)
• mindi/udev.files (modified) (1 diff)
• mondo-doc/ChangeLog (deleted)
• mondo/ChangeLog (deleted)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-restore-EXT.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (9 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)
• pbconf/mindi-busybox/deb/docs (modified) (1 diff)
• pbconf/mindi-busybox/deb/rules (modified) (1 diff)
• pbconf/mindi-busybox/pbcl (copied) (copied from branches/2.2.5/pbconf/mindi-busybox/pbcl )
• pbconf/mindi-busybox/rpm/mindi-busybox.spec (modified) (1 diff)
• pbconf/mindi/deb/control (modified) (1 diff)
• pbconf/mindi/deb/docs (modified) (1 diff)
• pbconf/mindi/deb/mindi.docs (modified) (1 diff)
• pbconf/mindi/pbcl (copied) (copied from branches/2.2.5/pbconf/mindi/pbcl )
• pbconf/mindi/pbfilter/rhel_3.pbf (copied) (copied from branches/2.2.5/pbconf/mindi/pbfilter/rhel_3.pbf )
• pbconf/mindi/rpm/mindi.spec (modified) (2 diffs)
• pbconf/mondo-doc/pbcl (copied) (copied from branches/2.2.5/pbconf/mondo-doc/pbcl )
• pbconf/mondo/deb/mondo.docs (modified) (1 diff)
• pbconf/mondo/pbcl (copied) (copied from branches/2.2.5/pbconf/mondo/pbcl )
• pbconf/mondo/rpm/mondo.spec (modified) (1 diff)
• pbconf/mondorescue.pb (modified) (3 diffs)
• pbconf/pbauthors (copied) (copied from branches/2.2.5/pbconf/pbauthors )
• website/announces3.sql (modified) ( previous)

branches/stable/mindi-busybox/.config

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.7.2rPBREV
-# Sun Nov  4 01:53:17 2007
+# Busybox version: 1.7.3-rPBREV
+# Thu Nov 15 17:11:06 2007
 #
 CONFIG_HAVE_DOT_CONFIG=y
@@ -81 +81 @@
 # CONFIG_FEATURE_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
-CONFIG_MONOTONIC_SYSCALL=y
+# CONFIG_MONOTONIC_SYSCALL is not set
 CONFIG_IOCTL_HEX2STR_ERROR=y
 

branches/stable/mindi-busybox/Makefile

@@ -1 +1 @@
 VERSION = 1
 PATCHLEVEL = 7
-SUBLEVEL = 2
+SUBLEVEL = 3
 EXTRAVERSION = -rPBREV
 NAME = Unnamed

branches/stable/mindi-busybox/coreutils/tail.c

@@ -48 +48 @@
 {
     ssize_t r;
-    off_t current, end;
+    off_t current;
     struct stat sbuf;
 
-    end = current = lseek(fd, 0, SEEK_CUR);
-    if (!fstat(fd, &sbuf))
-        end = sbuf.st_size;
-    lseek(fd, end < current ? 0 : current, SEEK_SET);
+    /* (A good comment is missing here) */
+    current = lseek(fd, 0, SEEK_CUR);
+    /* /proc files report zero st_size, don't lseek them. */
+    if (fstat(fd, &sbuf) == 0 && sbuf.st_size)
+        if (sbuf.st_size < current)
+            lseek(fd, 0, SEEK_SET);
+
     r = safe_read(fd, buf, count);
     if (r < 0) {
@@ -68 +71 @@
 static unsigned eat_num(const char *p)
 {
-    if (*p == '-') p++;
-    else if (*p == '+') { p++; G.status = EXIT_FAILURE; }
+    if (*p == '-')
+        p++;
+    else if (*p == '+') {
+        p++;
+        G.status = EXIT_FAILURE;
+    }
     return xatou_sfx(p, tail_suffixes);
 }

branches/stable/mindi-busybox/include/libbb.h

@@ -777 +777 @@
 extern void change_identity(const struct passwd *pw);
 extern const char *change_identity_e2str(const struct passwd *pw);
-extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args);
+extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) ATTRIBUTE_NORETURN;
 #if ENABLE_SELINUX
 extern void renew_current_security_context(void);

branches/stable/mindi-busybox/networking/httpd.c

@@ -1186 +1186 @@
      * and send it to the peer. So please no SIGPIPEs! */
     signal(SIGPIPE, SIG_IGN);
+
+    /* Accound for POSTDATA already in hdr_buf */
+    bodyLen -= hdr_cnt;
 
     /* This loop still looks messy. What is an exit criteria?

branches/stable/mindi-busybox/networking/inetd.c

@@ -735 +735 @@
     /* goto more; */
 
-    sep->se_server = xxstrdup(skip(&cp));
+    arg = skip(&cp);
+    sep->se_server = xxstrdup(arg);
     if (strcmp(sep->se_server, "internal") == 0) {
 #ifdef INETD_FEATURE_ENABLED
@@ -760 +761 @@
 #endif
     argc = 0;
-    for (arg = skip(&cp); cp; arg = skip(&cp)) {
+    for (; cp; arg = skip(&cp)) {
         if (argc < MAXARGV)
             sep->se_argv[argc++] = xxstrdup(arg);

branches/stable/mindi-busybox/networking/libiproute/iptunnel.c

@@ -242 +242 @@
             NEXT_ARG();
             key = index_in_strings(keywords, *argv);
-            if (key == ARG_any)
+            if (key != ARG_any)
                 p->iph.daddr = get_addr32(*argv);
         } else if (key == ARG_local) {
             NEXT_ARG();
             key = index_in_strings(keywords, *argv);
-            if (key == ARG_any)
+            if (key != ARG_any)
                 p->iph.saddr = get_addr32(*argv);
         } else if (key == ARG_dev) {

branches/stable/mindi-busybox/shell/ash.c

@@ -4380 +4380 @@
 /* Lives far away from here, needed for forkchild */
 static void closescript(void);
+
 /* Called after fork(), in child */
 static void
@@ -4424 +4425 @@
         setsignal(SIGTERM);
     }
-#if JOBS
-    /* For "jobs | cat" to work like in bash, we must retain list of jobs
-     * in child, but we do need to remove ourself */
-    if (jp)
-        freejob(jp);
-#else
     for (jp = curjob; jp; jp = jp->prev_job)
         freejob(jp);
-#endif
     jobless = 0;
 }

branches/stable/mindi-busybox/sysklogd/logger.c

@@ -108 +108 @@
     if (!argc) {
 #define strbuf bb_common_bufsiz1
-        while (fgets(strbuf, BUFSIZ, stdin)) {
+        while (fgets(strbuf, COMMON_BUFSIZE, stdin)) {
             if (strbuf[0]
              && NOT_LONE_CHAR(strbuf, '\n')
@@ -118 +118 @@
     } else {
         char *message = NULL;
-        int len = 1; /* for NUL */
+        int len = 0;
         int pos = 0;
         do {
             len += strlen(*argv) + 1;
-            message = xrealloc(message, len);
+            message = xrealloc(message, len + 1);
             sprintf(message + pos, " %s", *argv),
             pos = len;

branches/stable/mindi/README.bkphw

@@ -27 +27 @@
 echo /usr/local/lib >> /etc/ld.so.conf
 ldconfig
-perl -pi -e 's~^HOME=.*~HOME="/usr/local/bin"~' /usr/local/bin/cpqacuxe
-sed -i -e '/LD_LIBRARY_PATH/d' /usr/local/bin/cpqacuxe
 
-You also may have to remove the LD_ASSUME_KERNEL line in that script.
+You're now ready to check your configuration by running:
+mindi-bkphw /var/cache/mindi /etc/mindi
+[First parameter is the directory where files will be generated,
+ Second parameter is the directory of the file proliant.files is located]
 
-You're now ready to check your configuration by running mindi-bkphw.
+For these tools to work you may have to install additional packages such as hpasm and hprsm from the HP Web site, as well as some libstdc++ compatibility packages (compat-libstdc++-33 and compat-libstdc++-296 on RHEL 5 e.g.)
 
 In order to have a working hponcfg binary you also need to install the hprsm/hpasm packages from HP Web site. Refer to http://welcome.hp.com/country/us/en/support.html?pageDisplay=drivers

branches/stable/mindi/deplist.txt

@@ -32 +32 @@
 /usr/bin/strace
 
+# For udev
+/sbin/MAKEDEV
+
 # For file command
 /usr/share/misc/file/magic /usr/share/file/magic
 
-# For swap uuid support and probably then more in the future
+# For swap uuid support, ia64 and probably then more in the future
 /usr/bin/perl
+# For menu management on ia64
+efibootmgr
 
 # For Debug  mode

branches/stable/mindi/distributions/conf/mindi.conf.dist

@@ -16 +16 @@
 # Extra space for Ram disk
 #
-mindi_extra_space=24576
+mindi_extra_space=32768
 
 #
@@ -97 +97 @@
 #
 mindi_scsi_mods="3w-xxxx 3w_xxxx 3w-9xxx 3w_9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid megaraid_mm megaraid_mbox megaraid_sas mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod scsi_transport_sas scsi_transport_spi sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
-mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell"
-mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev"
+mindi_ide_mods="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
+mindi_usb_mods="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual"
 mindi_pcmcia_mods="pcmcia_core ds yenta_socket"
-mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate"
+mindi_cdrom_mods="cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 nls_utf8 sg sr_mod zlib_inflate"
 mindi_tape_mods="ht st osst ide-tape ide_tape"
 mindi_net_mods="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet"
@@ -108 +108 @@
 # created for recovery time
 #
-mindi_deny_mods=""
+mindi_deny_mods="kqemu"
 # Replace with that line for HP OCMP e.g.
-#mindi_deny_mods="MPS_Driver_Mapper mps octtldrv tscttl streams"
+#mindi_deny_mods="kqemu MPS_Driver_Mapper mps octtldrv tscttl streams"
 #
 # Modules that SHOULD be part of the mini distribution 

branches/stable/mindi/install.sh

@@ -128 +128 @@
 sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$sublocal~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$subconf~" -e "s~^MINDI_LIB=LLL~MINDI_LIB=$sublocallib~" mindi > $local/sbin/mindi
 sed -e "s~= "YYY"~= "$subconf"~" mindi-bkphw > $local/sbin/mindi-bkphw
-sed -e "s~^my \$mindiconf=YYY~my \$mindiconf=\"$subconf\";~" mindi-bkphw > $local/sbin/mindi-bkphw
-chmod 755 $local/sbin/mindi $local/sbin/mindi-bkphw
 install -m 755 parted2fdisk.pl $local/sbin
 
@@ -142 +140 @@
 if [ "$ARCH" = "ia64" ] ; then
     (cd $local/sbin && ln -sf parted2fdisk.pl parted2fdisk)
-    make -f Makefile.parted2fdisk DEST=$locallib/mindi install
-    if [ -f $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH ]; then
-        echo "Installing parted2fdisk ..."
-        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $locallib/mindi/rootfs/sbin/parted2fdisk
-        install -s -m 755 $locallib/mindi/rootfs/sbin/parted2fdisk-$ARCH $local/sbin/parted2fdisk
-    else
-        echo "WARNING: no parted2fdisk found, mindi will not work on this arch ($ARCH)"
-    fi
+    install -s -m 755 $local/sbin/parted2fdisk.pl $locallib/mindi/rootfs/sbin/parted2fdisk
+    # Try to avoid the need ot additional perl modules at the moment
+    perl -pi -e 's/use strict;//' $locallib/mindi/rootfs/sbin/parted2fdisk
 else
     # FHS requires fdisk under /sbin
@@ -156 +149 @@
     ( cd $locallib/mindi/rootfs/sbin && ln -sf fdisk parted2fdisk)
 fi
-# Remove left parted2fdisk
-rm -f $locallib/mindi/rootfs/sbin/parted2fdisk-*
 
 if [ "$PKGBUILDMINDI" != "true" ]; then

branches/stable/mindi/isolinux-H.cfg

@@ -5 +5 @@
 label RESTORE
   kernel vmlinuz
-  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=24000 rw root=/dev/ram nuke restore
+  append initrd=initrd.img load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=24000 rw root=/dev/ram nuke RESTORE
 label expert
   kernel vmlinuz

branches/stable/mindi/mindi

@@ -428 +428 @@
     rmdir $mountpoint || LogIt "Cannot rmdir (CODI)"
 }
+
 
 # Last function called before exiting
@@ -659 +660 @@
     fi
     modpaths=`find $1 -name $2.*o -type f`
-    [ "$?" -ne "0" ] && Die "find $1 -name $2.o -type f --- failed"
+    #[ "$?" -ne "0" ] && Die "find $1 -name $2.o -type f --- failed"
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.o.gz -type f`
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.ko.gz -type f`
@@ -956 +957 @@
     grep -vx " *#.*" $MY_FSTAB | grep -vx " *none.*" | $AWK '/^\/dev\/[imhs]d||^LABEL=\/|^UUID=/ && !/fdd|cdr|zip|floppy/ {print $1}'
     [ -e "/etc/raidtab" ] && $AWK '/^ *device/ {print $2}' /etc/raidtab
+    if [ -e "/vmfs/volumes" ]; then
+        # For VMWare ESX 3 get the device names of these volumes
+        vdf -P | grep -E '/vmfs/volumes' | awk '{print $1}'
+    fi
     return
 }
@@ -1003 +1008 @@
 }
 
-
+#
+# Critical function which computes all dependencies (dyn. lib.) 
+# for a list of binaries
+#
 LocateDeps() {
     local incoming fname deps
@@ -1042 +1050 @@
     fi
     if [ -h "$d" ]; then
-        echo "$link $d"
+        echo "$link"
+        echo "$d"
     else
         echo "$link"
@@ -1212 +1221 @@
         [ "$c_p" = "none" ] && continue
         redhat_label=""
+        label=""
         uuid=""
         absolute_partition=`readlink -f $c_p`
@@ -1617 +1627 @@
         LogIt "Failed to create ISO image."
     else
-        echo "Created bootable ISO image at $MINDI_CACHE/mindi.iso" >> $LOGFILE
+        echo "Created bootable ISO image at $MINDI_CACHE/mindi.iso" | tee -a $LOGFILE
     fi
     rm -f $MINDI_TMP/mkisofs.log
@@ -1627 +1637 @@
     local i old_pwd
     if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
-        echo "Shall I make a bootable USB image ? (y/[n] "
+        echo -n "Shall I make a bootable USB image ? (y/[n]) "
         read i
         [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
@@ -1898 +1908 @@
         el=`find /boot/efi -name elilo.efi`
         cp $el $mountpoint
-        cp $liloconf $mountpoint/elilo.efi $mountpoint/efi/boot
+        cp $liloconf $mountpoint
         if [ $mountefi -eq 1 ]; then
             umount /boot/efi 2>&1 > /dev/null
@@ -1947 +1957 @@
     echo "Free space left on image = $free_space KB" >> $LOGFILE
     echo "Max kernel size on $BOOT_SIZE KB image (est'd) = $max_kernel_size K" >> $LOGFILE
-# make it bootable
+    # make it bootable
     rm -f $mountpoint/zero
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
@@ -1953 +1963 @@
         if [ "$ARCH" != "ia64" ] ; then
             $LILO_EXE -r $mountpoint >> $LOGFILE 2>> $LOGFILE
+        else
+            /bin/true
         fi
     else
@@ -2120 +2132 @@
         done
         for i in $EXTRA_MODS ; do
-            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o 2> /dev/null`
-            [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o" >> $LOGFILE
+            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o.gz 2> /dev/null`
+            [ ! "$j" ] && echo "WARNING - cannot find failsafe module $i.o.gz" >> $LOGFILE
             for k in $j ; do
                 if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
@@ -2210 +2222 @@
 
 ProcessLDD() {
-    local incoming f
+    local incoming f d nd bd bnd
     read incoming
-    while [ "$incoming" != "" ] ; do
+    while [ "$incoming" != "" ]; do
         # We take the full path name of the dyn. lib. we want
         incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
         for f in $incoming ; do
+            # echo modified file name if one of the parent dir is a link
+            # by replacing the original dirname by the destination of the link
+            d="`dirname $f`"
+            found="false"
+            while [ "$d" != "/" ]; do
+                if [ -h "$d" ]; then
+                    nd=`readlink -f $d`
+                    bd=`basename $d`
+                    bnd=`basename $nd`
+                    f=`echo $f | sed "s~/$bd/~/$bnd/~"`
+                    echo $d
+                fi
+                d="`dirname $d`"
+            done
+
             echo "$f"
             echo "`ReadAllLink $f`"
@@ -2590 +2617 @@
     [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
 
+    # Handle the case where busybox is dynamically linked
+    # Should be done first so that if /lib64 is a link, it's
+    # created first like that, instead of as a real dir later on
+    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
+    if [ $? -eq 0 ]; then
+        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
+        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
+        rm -f $MINDI_TMP/busy.lis
+    fi
+
     # Management of udev (which includes modprobe in rules)
     ps auxww | grep -v grep | grep -qw udevd
@@ -2596 +2633 @@
         LogIt "udev device manager found"
         cp --parents -Rdf /etc/udev . 2> /dev/null
+        # This avoids NIC remapping if on another machine at restore time on Debian at least
+        rm -f ./etc/udev/rules.d/z25_persistent-net.rules
         cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
         if [ -x /sbin/udevd ]; then
-            lis=`grep -Ev '^#' $MINDI_CONF/udev.files` 
+            lis2=`grep -Ev '^#' $MINDI_CONF/udev.files` 
+            lis=""
+            # Get only the files which exist in that list
+            # and potentially their symlink structure
+            for i in $lis2; do
+                if [ -h $i ]; then
+                    j=$i
+                    while [ -h $j ]; do
+                        lis="$lis $j"
+                        j=`readlink $j`
+                    done
+                    lis="$lis $j"
+                elif [ -f $i ]; then
+                    lis="$lis $i"
+                fi
+            done
+            # And their deps
             LocateDeps $lis > $MINDI_TMP/udev.lis
             for i in $lis; do
@@ -2614 +2669 @@
         fi
     fi
+
     # Management of potential HW info (Proliant only at the moment)
+    rm -rf $MINDI_CACHE/bkphw
     mindi-bkphw $MINDI_CACHE $MINDI_CONF | tee -a $LOGFILE
     if [ -d $MINDI_CACHE/bkphw ]; then
@@ -2641 +2698 @@
     cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
 
-    # Handle the case where busybox is dynamically linked
-    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
-    if [ $? -eq 0 ]; then
-        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
-        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        rm -f $MINDI_TMP/busy.lis
-    fi
     cd $old_pwd
     echo -en "..."
@@ -2689 +2739 @@
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
         cp --parents -pdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
-        if [ "`echo "$i" | grep -F ".gz"`" ]; then
+        # Uncompress modules if not useing udev and native modprobe
+        if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
+            if [ "`echo "$i" | grep -F ".gz"`" ]; then
                 gunzip -f $mountpoint/$i
-                i=`echo $i | sed 's/.gz//'`
-        fi
+                #i=`echo $i | sed 's/.gz//'`
+            fi
+        fi
+    done
+
+    # Also copy modules.dep in case of udev so that normal modprobe works
+    cp --parents -pdf /$floppy_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
+
+    # For all modules supported, create symlinks under the mountpoint
+    for i in $EXTRA_MODS $NET_MODS $SCSI_MODS; do 
+        all_modules="$all_modules `FindSpecificModuleInPath $mountpoint $i | sed 's~^$mountpoint/~~g'`"
+    done
+    for i in $all_modules; do
         (cd $mountpoint ; ln -s $i . 2>/dev/null)
-        [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
-    done
-    # Also copy modules.dep in case of udev so that normal modprobe works
-    p=`echo $i | cut -d/ -f1-3`
-    cp -df $p/modules.dep $mountpoint/$p 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
+    done
     if [ ! -e "/sbin/devfsd" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
@@ -2724 +2783 @@
     "ext2fs")
         # say what will be used
-        echo "Creating an ext2 initrd image..." >> $LOGFILE
+        echo "Creating an ext2 initrd image..." >> $LOGFILE
         # kernel expects linuxrc in ext2 filesystem
         ( cd $mountpoint && ln -sf sbin/init linuxrc )
@@ -2730 +2789 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
-        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2`
+        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
         ADDITIONAL_BOOT_PARAMS="$ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
-        gzip -v9 ${rdz_fname}.tmp > $rdz_fname 2> /dev/null
+        gzip -c9 ${rdz_fname}.tmp > $rdz_fname
         rm -f ${rdz_fname}.tmp
         # log that we are done
-        echo "...done." >> $LOGFILE
+        echo "...done." >> $LOGFILE
     ;;
     "initramfs")
         # say what will be used
-        echo "Creating a gzip'ed cpio (AKA initramfs) initrd image..." >> $LOGFILE
+        echo "Creating a gzip'ed cpio (AKA initramfs) initrd image..." >> $LOGFILE
         # make sure that cpio is there
         which cpio &> /dev/null; [ $? -eq 0 ] || Die "cpio not found. Please install package cpio and try again."
@@ -2973 +3032 @@
 echo "LVM set to $LVM" >> $LOGFILE
 echo "----------" >> $LOGFILE
-echo "df result:" >> $LOGFILE
-echo "----------" >> $LOGFILE
-df -T >> $LOGFILE
-echo "-------------" >> $LOGFILE
 echo "mount result:" >> $LOGFILE
 echo "-------------" >> $LOGFILE
@@ -2997 +3052 @@
 MODULES="`cat /proc/modules | awk '{print $1}'`"
 if [ -x /usr/sbin/esxcfg-module ]; then
+    echo "-------------" >> $LOGFILE
     echo "VMWare ESX server detected - Enabling dedicated support" >> $LOGFILE
     echo "-------------" >> $LOGFILE
@@ -3005 +3061 @@
 fi
 echo "-------------" >> $LOGFILE
+echo "df result:" >> $LOGFILE
+echo "----------" >> $LOGFILE
+df -T >> $LOGFILE
+echo "-------------" >> $LOGFILE
 echo "Liste of extra modules is:" >> $LOGFILE
 echo "$EXTRA_MODS" >> $LOGFILE
@@ -3010 +3070 @@
 
 # Compute libata version
-laver=`modinfo libata | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g'`
+laver=`modinfo libata | grep -Ei '^Version:' | cut -d: -f2 | cut -d. -f1 | sed 's/  *//g' 2> /dev/null`
 # If libata v2 is used then remove ide-generic as it will perturbate boot
 if [ "`echo $MODULES | grep libata`" ]; then
@@ -3079 +3139 @@
         [ ! "$2" ] && Die "Please specify the binary to look at"
         LocateDeps $2
+        # Avoids logfile content for mondo
+        export MONDO_SHARE=""
+        MindiExit $?
+    elif [ "$1" = "--readalllink" ] ; then
+        [ ! "$2" ] && Die "Please specify the binary to look at"
+        ReadAllLink $2
         # Avoids logfile content for mondo
         export MONDO_SHARE=""
@@ -3215 +3281 @@
     if [ _"$MONDO_SHARE" != _"" ]; then
         Die "Please use -k <path> to specify kernel."
+    else
+        USE_OWN_KERNEL="no"
     fi
     if [ "$INTERACTIVE" = "yes" ]; then

branches/stable/mindi/mindi-bkphw

@@ -1 +1 @@
 #!/usr/bin/perl -w
+#
+# $Id$
 #
 # Backup the hardware configuration on machine supporting it
@@ -13 +15 @@
 my $confdir = "$ARGV[1]";
 
-my $tool = "";
-my $tooldir = "";
-my $ret = 0;
-
 mkdir $bkpdir,0755 if (! -d $bkpdir) ;
-open(SYSTEM,"dmidecode -s 'system-product-name' |") || die "You need dmidecode for mindi hardware support";
+open(SYSTEM,"/usr/sbin/dmidecode -s 'system-product-name' |") || die "You need /usr/sbin/dmidecode for mindi hardware support";
 my $productname = <SYSTEM>;
 close(SYSTEM);
 
+die "No product name found for Hardware support\n" if (not defined $productname);
+
 chomp($productname);
 if ($productname =~ /proliant/i) {
-    print "Detected an HP Hardware. Nice. Continue to support my job :-)\n";
+    print "Detected a $productname. Nice. Continue to support my job :-)\n";
     print "Activating Proliant support for mindi\n";
     open(PROLIANT,"$confdir/proliant.files") || die "Unable to open $confdir/proliant.files";
     open(TOOLS,"> $bkpdir/../tools.files") || die "Unable to open $bkpdir/../tools.files";
     open(SCRIPT,"> $bkpdir/../mindi-rsthw") || die "Unable to open $bkpdir/../mindi-rsthw";
-    print SCRIPT  << "EOF";
+    print SCRIPT  << 'EOF';
 #!/bin/bash
 #
@@ -38 +38 @@
 # may have an impact on you restoration process
 #
+# put dynamic libraries at an accessible place
+for l in /usr/local/lib/*; do
+    ln -sf $l /usr/lib
+done
 EOF
     while($tool = <PROLIANT>) {
@@ -52 +56 @@
         }
         if ($tool =~ /\/conrep$/) {
-            $ret = system("(cd $tooldir ; $tool -s -f$bkpdir/conrep.dat)");
-            print SCRIPT "(cd $tooldir ; $tool -s -f$bkpdir/conrep.dat)");
+            $ret = system("cd $tooldir ; $tool -s -f$bkpdir/conrep.dat");
+            print SCRIPT "(cd $tooldir ; $tool -l -f$bkpdir/conrep.dat)\n";
             print TOOLS "$tool.xml\n";
         }
-        if ($tool =~ /\/cpqacuxe$/) {
-            $ret = system("$tool -c $bkpdir/cpqacuxe.dat");
-            print SCRIPT "$tool -r $bkpdir/cpqacuxe.dat");
+        if ($tool =~ /\/.acuxebin$/) {
+            my $dir=basename($tool);
+            $ret = system("export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -c $bkpdir/cpqacuxe.dat");
+            print SCRIPT "export ACUXE_BIN_INSTALLATION_DIR=$dir ; export IM_CFGFILE_PATH=$dir ; export ACUXE_LOCK_FILES_DIR=$dir/locks ; $tool -i $bkpdir/cpqacuxe.dat\n";
             print TOOLS "$tooldir/bld\n";
         }
         if ($tool =~ /\/hponcfg$/) {
             $ret = system("$tool -w $bkpdir/hponcfg.dat");
-            print SCRIPT "$tool -r $bkpdir/hponcfg.dat");
+            print SCRIPT "$tool -r $bkpdir/hponcfg.dat\n";
         }
         if ($tool =~ /\.scexe$/) {
-            print SCRIPT "$tool");
+            print SCRIPT "$tool\n";
         }
         if ($ret != 0) {
@@ -77 +82 @@
 } else {
     print "No Hardware support for $productname\n";
-    print "Ask your manufacturer to contribute to the mindi project\n";
+    print "You may ask your manufacturer to contribute to the mindi project\n";
 }
 rmdir $bkpdir if (-d $bkpdir) ;

branches/stable/mindi/parted2fdisk.pl

@@ -38 +38 @@
 my $arch;
 my $fake = 0;
+my $mega = 1048576;
 
 # Determine on which arch we're running
@@ -165 +166 @@
                         if (defined $start{$part-1}) {
                             # in MB => cyl
-                            $cylstart = sprintf("%d",$end{$part-1}*1048576/$un + 1);
+                            $cylstart = sprintf("%d",$end{$part-1}*$mega/$un + 1);
                             print FLOG "no start cyl given for creation... assuming the following $cylstart\n";
                         } else {
@@ -179 +180 @@
                         $start = 0.01;
                     } else {
-                        $start = $cylstart* $un / 1048576 +0.001;
+                        $start = $cylstart* $un / $mega + 0.001;
                     }
                     # this is a size in B/KB/MB/GB
@@ -205 +206 @@
                     print FLOG "end cyl : $cylend\n";
                     # parted needs MB
-                    $end = $cylend * $un / 1048576;
+                    $end = $cylend * $un / $mega;
                     print FLOG "n $l $part $cylstart $cylend => mkpart primary $start $end\n";
                     system "$parted -s $device mkpart primary ext2 $start $end\n" if ($fake == 0);
@@ -388 +389 @@
     # start and end are in cylinder in fdisk format
     # so return in MB * 1MB / what represents 1 cyl in B
-    $mstart = sprintf("%d",$$start{$n}*1048576/$un);
+    $mstart = sprintf("%d",$$start{$n}*$mega/$un);
     $mstart = 1 if ($mstart < 1);
     $mstart = $endmax if ($mstart > $endmax);
-    $mend = sprintf("%d",$$end{$n}*1048576/$un - 1);
+    $mend = sprintf("%d",$$end{$n}*$mega/$un - 1);
     $mend = $endmax if ($mend > $endmax);
     $mend = 1 if ($mend < 1);
@@ -497 +498 @@
 my $mode;
 my $size;
+my $unit;
 
 open (PARTED, "$parted -v |") || die "Unable to read from $parted";
@@ -514 +516 @@
     $mode=1;
 } else {
-    # RHEL 3 parted <= 1.6.3
+    # RHEL 3 parted 1.6.3
+    # RHEL 4 parted 1.6.19
     $mode=0;
 }
@@ -528 +531 @@
     if ($mode == 0) {
         ($$start{$n},$$end{$n},$$type{$n},$void) = split(/ /,$d);
+        $unit = 1;
     } elsif ($mode == 1) {
         ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d);
+        $unit = $mega;
     } else {
         die "Undefined mode $mode";
@@ -537 +542 @@
     $$type{$n} = "" if (not defined $$type{$n});
     # Handles potential suffixes in latest parted version. Return MB
-    $ret = decode_Bsuf($$start{$n},1048576);
+    $ret = decode_Bsuf($$start{$n},$unit);
     $$start{$n} = $ret;
-    $ret = decode_Bsuf($$end{$n},1048576);
+    $ret = decode_Bsuf($$end{$n},$unit);
     $$end{$n} = $ret;
     print FLOG "$n      $$start{$n}      $$end{$n}     $$type{$n}\n";
@@ -553 +558 @@
 
 #print FLOG "decode_Bsuf input: $size / $unit ";
-if ($size =~ /KB$/i) {
-    $size =~ s/KB$//i;
+if ($size =~ /K[B]*$/i) {
+    $size =~ s/K[B]*$//i;
     $size *= 1024;
-} elsif ($size =~ /MB$/i) {
-    $size =~ s/MB$//i;
+} elsif ($size =~ /M[B]*$/i) {
+    $size =~ s/M[B]*$//i;
     $size *= 1048576;
-} elsif ($size =~ /GB$/i) {
-    $size =~ s/GB$//i;
+} elsif ($size =~ /G[B]*$/i) {
+    $size =~ s/G[B]*$//i;
     $size *= 1073741824;
-} elsif ($size =~ /TB$/i) {
-    $size =~ s/TB$//i;
+} elsif ($size =~ /T[B]*$/i) {
+    $size =~ s/T[B]*$//i;
     $size *= 1099511627776;
 } else {

branches/stable/mindi/proliant.files

@@ -1 +1 @@
 /usr/local/bin/hponcfg
 /usr/local/bin/conrep
-/usr/local/bin/cpqacuxe/cpqacuxe 
+/opt/compaq/cpqacuxe/bld/.acuxebin
+/usr/local/bin/bld/.acuxebin

branches/stable/mindi/rootfs/etc/udev-links.conf

@@ -50 +50 @@
 M tty7      c 4 7
 M tty8      c 4 8
+M ttyS0     c 4 64
+M ttyS1     c 4 65
 L console   /dev/tty0
 L tty       /dev/tty0

branches/stable/mindi/rootfs/sbin/find-and-mount-cdrom

@@ -41 +41 @@
     fi
         LogIt "CD-ROM found at $device"
-    mount /mnt/cdrom
+        mount /mnt/cdrom
         if [ "$?" -ne "0" ] ; then
             LogIt "Cannot mount /dev/cdrom (type $format) (dev=$device)"

branches/stable/mindi/rootfs/sbin/init

@@ -78 +78 @@
     openvt 6 /bin/sh
     openvt 7 /bin/sh /sbin/wait-for-petris
+    openvt 8 /usr/bin/tail -f $LOGFILE
 }
 
@@ -155 +156 @@
 
 HHandleCDROM() {
+    # Just in case we have an iLO ensure we will map it correctly
+    echo "$DENY_MODS" | grep -q "usb-storage "
+    if [ $? -eq 0 ]; then
+        return
+    fi
+    echo "Activating a potential USB Storage device"
+    if [ -f usb-storage.ko ] || [ -f usb-storage.ko.gz ]; then
+        if [ -e "/tmp/USE-UDEV" ] ; then
+            modprobe -q usb-storage
+        else
+            insmod usb-storage.ko*
+        fi
+    fi
+    for i in 1 2 3 4 5 6 7 8 9 10 ; do
+        sleep 1
+        echo -en "."
+    done
+
     find-and-mount-cdrom
     res=$?
@@ -171 +190 @@
         CD_MOUNTED_OK=""
     else
-        LogIt "OK, I am unable to go on. You seem to be missing a driver" 3
-        LogIt "Your archives are probably fine but" 3
-        LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
+        LogIt "OK, I am falling back to floppy mode." 3
+        LogIt "(You may not have the right drivers" 3
+        LogIt "to support the hardware on which we are running)" 3
+        LogIt "That means you'll have to copy the data disk images from" 3
+        LogIt "the CD/hard disk/whatever to physical 1.44MB disks and" 3
+        LogIt "insert them, one after the other. Please see the manual." 3
+        LogIt "The images are in /images on the CD, or /root/images/mindi" 3
+        LogIt "on your hard disk. Your archives are probably fine but" 3
+        LogIt "your tape streamer and/or CD-ROM drive are eccentric. :-)" 3
         CD_MOUNTED_OK=""
     fi
@@ -189 +214 @@
 #   Load the VIA IDE module first thing if it exists (requires ide-core).
 #   This is to ensure that DMA is working for VIA chipsets with 2.6 kernels.
-    for module in /ide-core.ko /via82cxxx.ko; do
+    for module in /ide-core.ko* /via82cxxx.ko*; do
         [ -f "$module" ] && MyInsmod $module > /dev/null 2> /dev/null
     done
@@ -264 +289 @@
 }
 
+create_dev_makedev() {
+  if [ -e /sbin/MAKEDEV ]; then
+    ln -sf /sbin/MAKEDEV /dev/MAKEDEV
+  else
+    ln -sf /bin/true /dev/MAKEDEV
+  fi
+}
 
 RunUdevd() {
@@ -274 +306 @@
     mount -n -t devpts -o mode=620 none /dev/pts
     mount -n -t tmpfs  none /dev/shm
+    if [ -e /proc/sys/kernel/hotplug ]; then
+        echo > /proc/sys/kernel/hotplug
+    fi
     PKLVL=`cut -f1 /proc/sys/kernel/printk`
     echo 0 > /proc/sys/kernel/printk
@@ -282 +317 @@
     /sbin/udevd --daemon &
     sleep 2
-    echo $PKLVL > /proc/sys/kernel/printk
+    mkdir -p /dev/.udev/queue/
+    if [ -x /sbin/udevtrigger ]; then
+        /sbin/udevtrigger
+    fi
+    create_dev_makedev
     # May avoid shell error messages
     chmod 644 /dev/tty*
+    if [ -x /sbin/udevsettle ]; then
+        /sbin/udevsettle
+    fi
+    # It seems we need to have more static devs on some distro were
+    # udev as some other requirements to be covered later on.
+    # So in the mean time:
+    for d in `ls /dev.static`; do
+        if [ ! -e /dev/$d ]; then
+            mv /dev.static/$d /dev
+        fi
+    done
+    echo $PKLVL > /proc/sys/kernel/printk
 }
 
@@ -292 +343 @@
     answer="NO"
 
+    grep -q nohw /proc/cmdline
+    if [ "$?" -eq 0 ]; then
+        return
+    fi
     if [ -x ./mindi-rsthw ]; then
         grep -q RESTORE /proc/cmdline
         if [ "$?" -ne 0 ]; then
-            clear
+            #clear
             echo "*********************************************************************"
             echo "Do you want to restore the HW configuration of the original machine ?"
@@ -333 +388 @@
     fi
     rm -f /tmp/FLF
+}
+
+StartUSBKbd() {
+# Prepare minimal USB env in case we have USB kbd such as with iLO
+[ -d /proc/bus/usb ] && ! grep -q /proc/bus/usb /proc/mounts && mount -t usbfs none /proc/bus/usb
+echo "$DENY_MODS" | grep -Eq 'uhcd_hci |usbhid |usbcore '
+if [ $? -eq 0 ]; then
+    return
+fi
+if [ -e "/tmp/USE-UDEV" ] ; then
+    if [ -f uhcd_hci.ko ] || [ -f uhcd_hci.ko.gz ]; then
+        modprobe -q uhcd_hci
+    fi
+    if [ -f usbhid.ko ] || [ -f usbhid.ko.gz ]; then
+        modprobe -q usbhid
+    fi
+else
+    if [ -f uhcd_hci.ko ]; then
+        insmod uhcd_hci.ko
+    fi
+    if [ -f usbhid.ko ]; then
+        insmod usbcore.ko
+        insmod usbhid.ko
+    fi
+fi
 }
 
@@ -468 +548 @@
 WelcomeMessage()
 {
+    export ARCH=`uname -m`
+
     echo "********************************************************************"
     echo "MINDI-LINUX by Mondo Dev Team - web site: http://www.mondorescue.org"
@@ -490 +572 @@
 }
 
+ModprobeAllModules() {
+
+    for m in `find /lib/modules -name '*.ko*'`; do
+        j=`basename $m | sed 's/\.ko.*$//'`
+        echo "$DENY_MODS" | grep -q "$j "
+        if [ $? -eq 0 ]; then
+            echo "Denying $j..."
+            continue
+        fi
+        echo "Probing $j..."
+        modprobe -q $j
+    done
+}
 
 ExtractDataDisksAndLoadModules() {
     echo "Installing additional tools ..."
     install-additional-tools
-    echo "Inserting modules ..."
     # Keep the kernel silent again
     PKLVL=`cut -f1 /proc/sys/kernel/printk`
     echo 0 > /proc/sys/kernel/printk
-    insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
+    if [ ! -e "/tmp/USE-UDEV" ] ; then
+        echo "Inserting modules ..."
+        insert-all-my-modules >> $LOGFILE 2>> $LOGFILE
+        for i in $FORCE_MODS; do
+            MyInsmod $i
+        done
+    else
+        ModprobeAllModules
+    fi
     echo $PKLVL > /proc/sys/kernel/printk
 }
@@ -524 +626 @@
 mkdir /sys 2> /dev/null
 mount /sys/ /sys -v -t sysfs 2>> $LOGFILE
+# For ESX 3
+[ -d /proc/vmware ] && ! grep -q /vmfs /proc/mounts && mount -t vmfs /vmfs /vmfs
 rm -f /foozero
+
+if [ "`grep -i denymods /proc/cmdline`" ]; then
+    export DENY_MODS="`cat /proc/cmdline | sed 's~.*denymods=\"\(.*\)\".*~\1~'` mondonone"
+else
+    export DENY_MODS=" "
+fi
+
+if [ "`grep -i forcemods /proc/cmdline`" ]; then
+    export FORCE_MODS="`cat /proc/cmdline | sed 's~.*forcemods=\"\(.*\)\".*~\1~'` mondonone"
+else
+    export FORCE_MODS=" "
+fi
+
+echo "Activating a potential USB keyboard/mouse"
+StartUSBKbd
 
 if [ -f /proc/sys/kernel/exec-shield ]; then
@@ -536 +655 @@
 if [ -e "/tmp/USE-UDEV" ] ; then
     RunUdevd
-else
-    ExtractDevTarballs
-fi
+fi
+ExtractDevTarballs
 LaunchTerminals
 
@@ -544 +662 @@
 PKLVL=`cut -f1 /proc/sys/kernel/printk`
 echo 0 > /proc/sys/kernel/printk
-InsertEssentialModules
+if [ ! -e "/tmp/USE-UDEV" ] ; then
+    InsertEssentialModules
+else
+    ModprobeAllModules
+fi
 echo $PKLVL > /proc/sys/kernel/printk
 
 EnableCcissIfAppropriate
-RstHW
 #-------------------------------
 #WHOLIVESINAPINEAPPLEUNDERTHESEA#;# --- don't touch this :)
@@ -590 +711 @@
     RunDevfsd
 fi
+LoadKeymap
+WelcomeMessage
+RstHW
 echo "Starting potential Raid/LVMs ..."
 PauseForRaids
@@ -595 +719 @@
 StartLvms
 CopyBootDevEntry
-LoadKeymap
 mkdir -p /tmp/tmpfs
 sleep 2
@@ -606 +729 @@
     cp -af /dev/md2 /dev/md/2 2> /dev/null
 fi
-export ARCH=`uname -m`
-WelcomeMessage
 # SpaceTests; # Mandrake Linux 8.1 doesn't like this
 [ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
@@ -619 +740 @@
 fi
 hack-cfg-if-necessary || LogIt "Cannot find hack-cfg-if-necessary"
-openvt 8 /usr/bin/tail -f $LOGFILE
 
 # Log some useful info
-LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV}"
+LogIt "init (from mindi v$MINDI_VER-r${MINDI_REV})"
 LogIt "/proc/cmdline is:"
 cat /proc/cmdline  >> $LOGFILE

branches/stable/mindi/rootfs/sbin/install-additional-tools

@@ -78 +78 @@
 cd $mountdir
 if [ -f etc/fstab ]; then
-    mv etc/fstab /tmp
+    cp etc/fstab /tmp
 fi
 if [ -f etc/raidtab ]; then
-    mv etc/raidtab /tmp
+    cp etc/raidtab /tmp
 fi
 

branches/stable/mindi/rootfs/sbin/start-nfs

@@ -35 +35 @@
 done
 
-if [ "$ipdev" = "" ] && [ "$ipconf" = "" ]; then
-    # No network configuration neither stored during archive
-    # nor on cmdline so no network wanted => exiting
-    exit 0
-else
+if [ "$ipdev" != "" ] || [ "$ipconf" != "" ]; then
+    # Network configuration stored during archive
+    # or on cmdline so network wanted => starting it
     LogIt "Starting Network..."
+
+    # Activate loobback
+    ifconfig lo 127.0.0.1
+
+    echo "$ipconf" | grep -q "dhcp"
+    if [ $? -eq 0 ]; then
+        ipdev=`echo $ipconf | cut -d: -f1`
+        LogIt "Making DHCP request on $ipdev"
+        udhcpc -i $ipdev
+    else
+        if [ "$ipconf" != "" ]; then
+            ipdev=`echo $ipconf | cut -d: -f1`
+            ipaddress=`echo $ipconf | cut -d: -f2`
+            ipnetmask=`echo $ipconf | cut -d: -f3`
+            ipbroadcast=`echo $ipconf | cut -d: -f4`
+            ipgateway=`echo $ipconf | cut -d: -f5`
+        fi
+        LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
+        ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
+        route add default gw $ipgateway
+    fi
+
+    # ping server helps waking interface up
+    LogIt "Pinging NFS server..."
+    nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`
+    ping -c $ipcount $nfs_server_ipaddr 
+
+    # Finally mounts the NFS share
+    LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
+    mount -t nfs -o nolock $nfsmount /tmp/isodir
+    
+    LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+    mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
 fi
-
-# Activate loobback
-ifconfig lo 127.0.0.1
-
-echo "$ipconf" | grep -q "dhcp"
-if [ $? -eq 0 ]; then
-    ipdev=`echo $ipconf | cut -d: -f1`
-    LogIt "Making DHCP request on $ipdev"
-    udhcpc -i $ipdev
-else
-    if [ "$ipconf" != "" ]; then
-        ipdev=`echo $ipconf | cut -d: -f1`
-        ipaddress=`echo $ipconf | cut -d: -f2`
-        ipnetmask=`echo $ipconf | cut -d: -f3`
-        ipbroadcast=`echo $ipconf | cut -d: -f4`
-        ipgateway=`echo $ipconf | cut -d: -f5`
-    fi
-    LogIt "Configuring $ipdev statically ($ipaddress/$ipnetmask)"
-    ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast
-    route add default gw $ipgateway
-fi
-
-# ping server helps waking interface up
-LogIt "Pinging NFS server..."
-nfs_server_ipaddr=`echo $nfsmount | cut -d: -f1`
-ping -c $ipcount $nfs_server_ipaddr 
-
-# Finally mounts the NFS share
-LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
-mount -t nfs -o nolock $nfsmount /tmp/isodir
-
-LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
-mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom

branches/stable/mindi/rootfs/sbin/start-usb

@@ -20 +20 @@
 fi
 
-[ -d /proc/bus/usb ] && ! grep -q /proc/bus/usb /proc/mounts && mount -t usbfs none /proc/bus/usb
-
 echo -en "Mounting USB device (${usbdev}1) on /mnt/cdrom..."
 /sbin/modprobe usb-storage

branches/stable/mindi/syslinux-H.cfg

@@ -5 +5 @@
 label RESTORE
   kernel vmlinuz
-  append initrd=initrd.img ramdisk_size=24000 rw root=/dev/ram0 nuke restore
+  append initrd=initrd.img ramdisk_size=24000 rw root=/dev/ram0 nuke RESTORE
 label expert
   kernel vmlinuz

branches/stable/mindi/udev.files

@@ -12 +12 @@
 /sbin/udevstart
 /sbin/udevcontrol
+/sbin/udevtrigger
+/sbin/pam_console_apply
+/bin/bash

branches/stable/mondo/src/common/libmondo-devices.c

@@ -1871 +1871 @@
             mr_asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount,
                     bkpinfo->isodir);
-            run_program_and_log_output(tmp, 5);
+            run_program_and_log_output(tmp, 3);
             mr_free(tmp);
             malloc_string(g_selfmounted_isodir);

branches/stable/mondo/src/common/libmondo-files.c

@@ -1107 +1107 @@
     * networking will not start during an NFS restore.
     *
-    * If the NFS device in nfs_dev begins with the word "bond", 
+    * If the NFS device in nfs_dev begins with the word "bond", or alb or aft
     * look for the corresponding slave ethN device and copy it to nfs_dev.
     * Using the common MAC address
     ********/
-    if (!strncmp(nfs_dev, "bond", 4)) {
+    if (!strncmp(nfs_dev, "bond", 4) || !strncmp(nfs_dev, "alb", 3) || !strncmp(nfs_dev, "aft", 3)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
         mr_asprintf(&command,

branches/stable/mondo/src/common/libmondo-fork.c

@@ -19 +19 @@
 //static char cvsid[] = "$Id$";
 
-extern char *g_tmpfs_mountpt;
 extern t_bkptype g_backup_media_type;
 extern bool g_text_mode;

branches/stable/mondo/src/common/libmondo-tools.c

@@ -1105 +1105 @@
     if (tmp[0]) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
-        if ((strstr(tmp, "LABEL=") || strstr(tmp,"UUID="))) {
-            if (!run_program_and_log_output("mount /boot", 5)) {
-                strcpy(g_boot_mountpt, "/boot");
-                mr_msg(1, "Mounted /boot");
+        mr_asprintf(&command, "mount | grep -Ew '/boot'");
+        mr_asprintf(&tmp1, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+        if (!strcmp(tmp1,"")) {
+            if ((strstr(tmp1, "LABEL=") || strstr(tmp1,"UUID="))) {
+                if (!run_program_and_log_output("mount /boot", 5)) {
+                    strcpy(g_boot_mountpt, "/boot");
+                    log_msg(1, "Mounted /boot");
+                }
             } else {
                 log_it("...ignored cos it's a label or uuid :-)");
             }
+            mr_free(tmp1);
         } else {
+            mr_free(tmp1);
             mr_asprintf(&command, "mount | grep -E '^%s'", tmp);
             mr_msg(3, "command = %s", command);
@@ -1133 +1140 @@
                         mr_msg(1,
                                 "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
+                        }
                     }
                 }

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -25 +25 @@
 extern bool g_text_mode;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
-extern char g_tmpfs_mountpt[MAX_STR_LEN];
 extern bool g_sigpipe;
 

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -43 +43 @@
 extern char *g_boot_mountpt;
 extern bool g_remount_cdrom_at_end, g_remount_floppy_at_end;
-extern char *g_tmpfs_mountpt;
 extern char *g_cdrw_drive_is_here;
 extern double g_kernel_version;

branches/stable/mondo/src/mondorestore/mondo-prep.c

@@ -1925 +1925 @@
     } else if (strcmp(format, "minix") == 0) {
         mr_asprintf(&partcode, "81");
-    } else if (strcmp(format, "vmfs") == 0) {
+    } else if (strcmp(format, "vmfs3") == 0) {
         strcpy(partcode, "fb");
+    } else if (strcmp(format, "vmkcore") == 0) {
+        strcpy(partcode, "fc");
     } else if (strcmp(format, "raid") == 0) {
         mr_asprintf(&partcode, "fd");

branches/stable/mondo/src/mondorestore/mondo-restore-EXT.h

@@ -8 +8 @@
 extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
-extern char *g_tmpfs_mountpt;
 extern char *g_isodir_device;
 extern char *g_isodir_format;

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -458 +458 @@
                 mr_msg(1,
                         "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
+            } else {
+                log_to_screen("Unable to mount device %s at %s", device,
+                    mountdir);
             }
         }
@@ -475 +478 @@
 /**************************************************************************
  *END_MOUNT_DEVICE                                                        *
- **************************************************************************/
+**************************************************************************/
 
 
@@ -500 +503 @@
            sizeof(struct mountlist_itself));
     sort_mountlist_by_mountpoint(mountlist, 0);
+
 
     mvaddstr_and_log_it(g_currentY, 0, _("Mounting devices         "));
@@ -545 +549 @@
     }
     close_progress_form();
-    run_program_and_log_output("df -m", TRUE);
     if (retval) {
         if (g_partition_table_locked_up > 0) {
             log_to_screen
-                (_
-                 ("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to"));
-            log_to_screen(_
-                          ("lock up the partition table. You might have to reboot and use Interactive Mode to"));
-            log_to_screen(_
-                          ("format and restore *without* partitioning first. Sorry for the inconvenience."));
+                (_("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to"));
+            log_to_screen
+                (_("lock up the partition table. You might have to reboot and use Interactive Mode to"));
+            log_to_screen
+                (_("format and restore *without* partitioning first. Sorry for the inconvenience."));
         }
         mr_asprintf(&tmp, _("Could not mount devices %s- shall I abort?"),
@@ -563 +565 @@
             retval = 0;
             log_to_screen
-                (_
-                 ("Continuing, although some devices failed to be mounted"));
+                (_("Continuing, although some devices failed to be mounted"));
             mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         } else {
@@ -580 +581 @@
     return (retval);
 }
- /**************************************************************************
-  *END_MOUNT_ALL_DEVICES                                                   *
-  **************************************************************************/
-
-
-/*
+/**************************************************************************
+*END_MOUNT_ALL_DEVICES                                                   *
+**************************************************************************/
+
+
+/**
 * Mount the CD-ROM or USB device at /mnt/cdrom.
 * @param bkpinfo The backup information structure. Fields used: 
@@ -594 +595 @@
 * @return 0 for success, nonzero for failure.
 */
-int mount_media()
 {
     char *mount_cmd = NULL;
@@ -655 +655 @@
     } else if (bkpinfo->backup_media_type == usb) {
         mr_asprintf(&mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
-    } else if (strstr(bkpinfo->media_device, "/dev/"))
+    } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-    {
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
                 MNT_CDROM);
-    }
 #else
-    {
         mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
                 bkpinfo->media_device, MNT_CDROM);
-    }
 #endif
-
-    else {
+    } else {
         if (bkpinfo->disaster_recovery
             && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
@@ -704 +699 @@
         mr_msg(2, "Mounted media OK");
     }
+
     return (res);
 }

branches/stable/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -33 +33 @@
         elif [ "$format" = "swap" ] ; then
             if [ "$opttun" = "-U" ]; then
-                LogIt "Creating uuid $label on swap partition $label"
+                LogIt "Creating uuid $label on swap partition $mountpt"
                 echo -n "$label" | perl -ne 's/-//g;chomp;print pack "H*",$_' | dd conv=notrunc "of=$mountpt" obs=1 seek=1036
             else

branches/stable/pbconf/mindi-busybox/deb/docs

@@ -1 +1 @@
 README
 INSTALL
-svn.log

branches/stable/pbconf/mindi-busybox/deb/rules

@@ -58 +58 @@
     # - copy doc
     mkdir -p debian/doc-temp
-    cp -a ChangeLog INSTALL LICENSE AUTHORS README TODO svn.log debian/doc-temp
+    cp -a ChangeLog INSTALL LICENSE AUTHORS README TODO NEWS debian/doc-temp #svn.log 
 
     dh_install -s

branches/stable/pbconf/mindi-busybox/rpm/mindi-busybox.spec

@@ -35 +35 @@
 %files
 %defattr(-,root,root)
-%doc ChangeLog INSTALL LICENSE AUTHORS README TODO svn.log
+%doc ChangeLog INSTALL LICENSE AUTHORS README TODO NEWS 
+#svn.log
 %{_libdir}/mindi
 

branches/stable/pbconf/mindi/deb/control

@@ -8 +8 @@
 Package: PBPKG
 Architecture: amd64 i386 ia64
-Depends: binutils, bzip2, dosfstools, mkisofs, module-init-tools, syslinux, gawk, parted, ms-sys, file, nano
-Recommends: cpio, mdadm, ntfsprogs
+Depends: binutils, bzip2, dosfstools, mkisofs, module-init-tools, syslinux, gawk, parted, file, mtools, perl, mindi-busybox
+Recommends: cpio, mdadm, ntfsprogs, nano, ms-sys
 Suggests: eject, less, acl, attr, lilo
 Description: creates boot/root disks based on your system

branches/stable/pbconf/mindi/deb/docs

@@ -5 +5 @@
 TODO
 INSTALL
-svn.log

branches/stable/pbconf/mindi/deb/mindi.docs

@@ -6 +6 @@
 README.pxe
 README.bkphw
-svn.log
+NEWS
+AUTHORS

branches/stable/pbconf/mindi/rpm/mindi.spec

@@ -13 +13 @@
 # BuildArch:    noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, mindi-busybox, parted, PBDEP
+Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, mindi-busybox, parted, perl, mtools, PBDEP
 PBOBS
 # Not on all systems
@@ -50 +50 @@
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/%{name}
-%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox README.proliant README.bkphw svn.log
+%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox README.proliant README.bkphw NEWS 
+#svn.log
 %{_mandir}/man8/*
 %{_libdir}/%{name}

branches/stable/pbconf/mondo/deb/mondo.docs

@@ -2 +2 @@
 TODO
 README
-svn.log
+AUTHORS

branches/stable/pbconf/mondo/rpm/mondo.spec

@@ -75 +75 @@
 %config %{_sysconfdir}/%{name}/%{name}.conf.dist
 %config %{_sysconfdir}/%{name}/%{name}.conf.dist.md5
-%doc ChangeLog svn.log
+%doc ChangeLog 
+#svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS
 %doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf

branches/stable/pbconf/mondorescue.pb

@@ -35 +35 @@
 # a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
 #
-vmlist mondorescue = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,rhel_2.1,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10,gentoo_nover,slackware_10.2,slackware_11.0,freebsd_5.5
+vmlist mondorescue = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,fedora_8,rhel_2.1,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10,gentoo_nover,slackware_10.2,slackware_11.0,freebsd_5.5
 
 #
@@ -56 +56 @@
 vmpath mondorescue = /users/qemu
 
+testver mondorescue = true
+projver mondorescue = stable
+projtag mondorescue = 1
 
 # Hash of default package/package directory
@@ -61 +64 @@
 defpkgdir mindi = mindi
 
-pkgver mindi = 2.0.0
-pkgver mindi-busybox = 1.7.2
+pkgver mindi = stable
+pkgver mindi-busybox = stable
 #pkgtag mindi-busybox = 2