Changeset 1043 in MondoRescue


Ignore:
Timestamp:
Jan 8, 2007, 11:31:22 PM (17 years ago)
Author:
Bruno Cornec
Message:

merge -r978:1042 $SVN_M/branches/stable

Location:
trunk
Files:
45 edited
8 copied

Legend:

Unmodified
Added
Removed

  • trunk/mindi-busybox/ChangeLog

    r956 r1043  
    33MINDI-BUSYBOX CHANGES
    44
    5 1.2.2 (2006-11-17)
     51.2.2 (2006-12-23)
     6- mindi-busybox version is now extended with the SVN revision (Bruno Cornec)
     7- Fix a known bug for busybox where -gc-section in makefile + static for link crea tes a buggy busybox with glibc (Bruno Cornec)
    68- Updated based on busybox 1.2.2 (Bruno Cornec)
    79- Handles modules back again (Bruno Cornec)
     10- Fix bug #88 around install conflicts (Bruno Cornec)
    811
    9121.2.1 (2006-10-04)

  • trunk/mindi-busybox/Rules.mak

    r904 r1043  
    266266    CFLAGS +=-DNDEBUG
    267267    CHECKED_LDFLAGS += $(call check_ld,$(LD),--sort-common,)
     268ifneq ($(strip $(CONFIG_STATIC)),y)
    268269    CHECKED_LDFLAGS += $(call check_ld,$(LD),--gc-sections,)
     270endif
    269271endif
    270272

  • trunk/mindi-busybox/distributions/debian/control

    r823 r1043  
    88Package: mindi-busybox
    99Architecture: amd64 i386 ia64
    10 Depends: binutils, bzip2, module-init-tools
    1110Description: creates a busybox version suited for mindi
    1211 Mindi is a script to create boot/root disks based on your system. It uses

  • trunk/mindi-busybox/distributions/debian/rules

    r823 r1043  
    99PACKAGE_NAME = mindi-busybox
    1010
    11 configure:
    12 # Nothing to configure in this package.
     11# Don't set any compiler flags - busybox does that just fine
    1312
    14 build:
    15 # Nothing to build in this package.
     13configure: configure-stamp
     14
     15configure-stamp:
     16    dh_testdir
     17    touch configure-stamp
     18
     19# Build both architecture dependent and independent
     20build: build-stamp
     21
     22build-stamp: configure-stamp
     23    dh_testdir
     24
     25    # Compile the package.
     26    mv .config .config.sav
     27    $(MAKE) distclean
     28    mv .config.sav .config
     29    $(MAKE) oldconfig
     30    $(MAKE) busybox
     31
     32    touch build-stamp
    1633
    1734clean:
    1835    dh_testdir
    1936    dh_testroot
     37    rm -f build-stamp configure-stamp
     38    # Clean temporary document directory
     39    rm -rf debian/doc-temp
     40    # Clean up.
     41    -mv .config .config.sav
     42    -$(MAKE) distclean
     43    -mv .config.sav .config
     44    -rm -f busybox
     45
    2046    dh_clean
    2147
    22 install:
     48# Install architecture dependent and independent
     49install: build
    2350    dh_testdir
    2451    dh_testroot
    2552    dh_clean -k
    2653    dh_installdirs
    27     # Build the installation tree:
    28     ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
    2954
    30 # Build architecture-independent files here.
    31 binary-indep: install
    32 # We have nothing to do by default.
     55    # Install the package files into build directory:
     56    # - start with upstream make install
     57    $(MAKE) install PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr/lib/mindi/rootfs
     58    # - copy doc
     59    mkdir -p debian/doc-temp
     60    cp -a ChangeLog INSTALL LICENSE AUTHORS README TODO changelog svn.log debian/doc-temp
    3361
    34 # Build architecture-dependent files here.
    35 binary-arch: install
     62    dh_install -s
     63
     64# Build architecture independant packages using the common target.
     65binary-indep: build install
     66    # None
     67
     68# Build architecture dependant packages using the common target.
     69binary-arch: build install
    3670    dh_testdir
    3771    dh_testroot
    38     dh_installchangelogs ChangeLog
    3972    dh_installdocs
    40     dh_installexamples
    41     dh_link
    4273    dh_strip
    4374    dh_compress
    … …  
    4879    dh_builddeb
    4980
    50 binary: binary-indep binary-arch
     81binary: binary-arch binary-indep
    5182.PHONY: build clean binary-indep binary-arch binary install configure

  • trunk/mindi-busybox/distributions/gentoo/mindi-busybox.ebuild

    r932 r1043  
    2727src_install() {
    2828    # bundle up the symlink files for use later
    29     emake PREFIX="/usr/share/mindi/rootfs/bin" install || die
    30     rm _install/bin/busybox
    31     tar cf busybox-links.tar -C _install . || die
    32     insinto /usr/share/mindi
    33     doins busybox-links.tar || die
     29    emake PREFIX="${D}/usr/share/mindi/rootfs" install || die
    3430}
    35 
    36 pkg_preinst() {
    37     mv "${D}"/usr/share/mindi/busybox-links.tar "${T}"/ || die
    38 }
    39 
    40 pkg_postinst() {
    41     cd "${T}" || die
    42     mkdir _install
    43     tar xf busybox-links.tar -C _install || die
    44     cp -vpPR _install/* /usr/share/mindi/rootfs/bin || die "copying links for ${x} failed"
    45 
    46     echo
    47 }

  • trunk/mindi/ChangeLog

    r903 r1043  
    22
    33MINDI CHANGES
     4
     51.2.1 (2006-12-23)
     6- mindi now supports a configuration file (Bruno Cornec)
     7- Fix again support for LABEL on swap partitions (Bruno Cornec)
     8- mindi now prints mindi-busybox version (Bruno Cornec)
     9- mindi now supports gzip compression format (#113) (Bruno Cornec)
     10- Inline code of some useless functions for readability (Bruno Cornec)
     11- Add support for nvidia and ahci drivers (Bruno Cornec)
     12- Remove wrong full path name for cut (Matija Nalis/Bruno Cornec)
     13- UUID support (Bruno Cornec)
     14- Cleaner messages generated on screen (with defaults) and in logs (Bruno Cornec)
     15- First use of a configuration file with mindi to permit variable to be overwritten (Bruno Cornec)
     16- All temporary files are now under MINDI_TMP, unique dir under /tmp by default and not removed when called by mondo (Bruno Cornec)
     17- All generated files are now under CACHE_LOC, /var/cache/mindi by default (Bruno Cornec)
     18- Fix bug #100 where the temporary dir could be removed and be /home (Matija Nalis/Bruno Cornec)
     19- Should now work correctly under x86_64 distributions (Bruno Cornec)
     20- Fix a blocking bug in mindi where a " was misplaced (Bruno Cornec)
     21- New MindiExit function called everywhere (Bruno Cornec)
     22- TAG is now per package (Bruno Cornec)
     23- Add CentOS build support (Andy Wright/Bruno Cornec)
     24- Removal of grep -w|-x during restore as not supported by busybox fixes bug #101 (Alfred Chua/Bruno Cornec)
     25- init now reports the mindi version when executed (Bruno Cornec)
    426
    5271.2.0 (2006-10-04)

  • trunk/mindi/distributions/debian/rules

    r939 r1043  
    2626    dh_installdirs
    2727    # Build the installation tree:
    28     ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
     28    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
    2929
    3030# Build architecture-independent files here.

  • trunk/mindi/mindi

    r979 r1043  
    9393TAPE_MODS="ht st osst ide-tape ide_tape"
    9494SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid 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 mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
    95 IDE_MODS="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core libata edd paride ata_piix libata via82cxxx generic"
     95IDE_MODS="ide ide-generic ide-detect ide-mod ide-disk ide-cd ide_cd ide-cs ide-core ide_core libata edd paride ata_piix libata via82cxxx generic nvidia ahci"
    9696PCMCIA_MODS="pcmcia_core ds yenta_socket"
    9797USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd usbhid"
    9898CDROM_MODS="$TAPE_MODS $FLOPPY_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_cp437 sg sr_mod zlib_inflate $USB_MODS $PCMCIA_MODS"
    99 NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
    100 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
     99NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
     100NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet vmnet"
     101EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 lvm-mod dm-mod dm-snapshot dm-zero dm-mirror jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
    101102
    102103BOOT_MEDIA_MESSAGE="$mindi_boot_msg"
    … …  
    139140        echo -en "label memtest\n  kernel memdisk\n  append initrd=memtest.img\n\n"
    140141    fi
    141 }
    142 
    143 
    144 AbortIfYourDistroIsAPieceOfStercus() {
    145     which which > /dev/null 2> /dev/null || Die "Please install 'which'."
    146     which strings > /dev/null 2> /dev/null || Die "Please install binutils and libbinutils; you have no 'strings' executable."
    147     which gawk > /dev/null 2> /dev/null || Die "Gawk is missing from your computer. Please install gawk. You may find the package on Debian's website. How did I know you're running Debian? Because only Debian would be stupid enough not to include gawk in your distribution."
    148     which gawk > /dev/null 2> /dev/null && AWK=`which gawk 2>/dev/null` || AWK="`which awk 2>/dev/null`"
    149     if which awk &> /dev/null ; then
    150         if ! which gawk &> /dev/null ; then
    151             LogIt "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
    152         fi
    153     fi
    154     which mke2fs > /dev/null 2> /dev/null || Die "Please put mke2fs in system path"
    155     [ ! -e "$FDISK" ] && Die "Cannot find (s)fdisk"
    156 }
    157 
    158 
    159 AbortIfMkfsVfatMissing() {
    160     #if grep -F "vfat" /etc/fstab &> /dev/null ; then
    161         if ! which mkfs.vfat &> /dev/null ; then
    162             Die "mkfs.vfat missing from your filesystem - please install your dosfstools RPM or DEB package. Perhaps your PATH environmental variable is broken, too?"
    163         fi
    164     #fi
    165142}
    166143
    … …  
    610587
    611588
    612 FindHomeOfMindiAndMondo() {
    613     [ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
    614     echo "MINDI_LIB = $MINDI_LIB" >> $LOGFILE
    615     echo "MINDI_SBIN = $MINDI_SBIN" >> $LOGFILE
    616     [ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
    617     echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
    618     echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
    619 }
    620 
    621 
    622589FindIsolinuxBinary() {
    623590    ISOLINUX=/usr/lib/isolinux.bin
    … …  
    642609    else
    643610        LILO_EXE=`which false`
    644     fi
    645 }
    646 
    647 
    648 FindELiloBinary() {
    649     if which elilo &> /dev/null ; then
    650         LILO_EXE=elilo
    651     else
    652         LILO_EXE=`which false`
    653     fi
    654 }
    655 
    656 
    657 FixPathIfBroken() {
    658     if [ -e "/sbin/mkfs" ] && ! which mkfs &> /dev/null ; then
    659         PATH=$PATH:/sbin:/usr/sbin
    660         export PATH
    661         echo "Your PATH did not include /sbin or /usr/sbin. I have fixed that, temporarily." >> $LOGFILE
    662         echo "However, you may wish to ask your vendor to provide a permanent fix..." >> $LOGFILE
    663         echo "You might like to call 'su -' instead of 'su', for example." >> $LOGFILE
    664611    fi
    665612}
    … …  
    1010957    fi
    1011958
    1012     link=`readlink $file`
     959    link=`readlink -f $file`
    1013960    d=`dirname $file`
    1014961    if [ ! -e "$link" -a ! -e "$d/$link" ]; then
    … …  
    10761023    [ "$INTERNAL_TAPE_BLOCK_SIZE" ] && echo "internal-tape-block-size $INTERNAL_TAPE_BLOCK_SIZE" >> $outfile
    10771024    use_lzo=$USE_LZO; [ "$use_lzo" = "" ] && use_lzo="no"
     1025    use_gzip=$USE_GZIP; [ "$use_gzip" = "" ] && use_gzip="no"
    10781026    use_comp=$USE_COMP; [ "$use_comp" = "" ] && use_comp="yes"
    10791027    use_star=$USE_STAR; [ "$use_star" = "" ] && use_star="no"
    10801028    echo "use-lzo $use_lzo" >> $outfile
     1029    echo "use-gzip $use_gzip" >> $outfile
    10811030    echo "use-star $use_star" >> $outfile
    10821031    echo "use-comp $use_comp" >> $outfile
    … …  
    12391188        if [ "`echo "$current_partition" | /bin/grep -i "LABEL="`" != "" ]; then
    12401189            str_to_find_fmt_with=$current_partition
    1241             redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
     1190            redhat_label=`echo "$current_partition" | cut -d'=' -f2`
    12421191            actual_dev=""
    12431192
    … …  
    12491198            # 2nd try : blkid, the good way for all LABEL except swap
    12501199            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
    1251                 actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | /bin/cut -d':' -f1`
     1200                actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | cut -d':' -f1`
    12521201                # For LVM FS it will give a /dev/dm-# which should then be converted
    12531202                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
    … …  
    12681217            # For LVM gives a /dev/mapper entry
    12691218            if [ "x$actual_dev" = "x" ]; then
    1270                 actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | /bin/cut -d' ' -f1`
     1219                actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | cut -d' ' -f1`
    12711220            fi
    12721221   
    … …  
    12921241                    do
    12931242                        # Location of the swap label for kernel 2.6
    1294                         try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev &> /dev/null`
     1243                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
    12951244                        if [ "x$try_dev_label" = "x$redhat_label" ]; then
    12961245                            actual_dev=$try_dev
    … …  
    12981247                    done
    12991248            fi
    1300         fi
    1301 
     1249
     1250            # Check if one of all those tries has known success
     1251            if [ "x$actual_dev" != "x" ]; then
     1252                current_partition=$actual_dev
     1253            else
     1254                Die "Your system uses a LABEL partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id"
     1255            fi
    13021256        # This part tries to retrieve the correct device from a UUID line in /etc/fstab
    13031257        # current_partition contains only first column of /etc/fstab
    1304         if [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
     1258        elif [ "`echo "$current_partition" | /bin/grep -i "UUID="`" != "" ]; then
    13051259            str_to_find_fmt_with=$current_partition
    1306             uuid=`echo "$current_partition" | /bin/cut -d'=' -f2`
     1260            uuid=`echo "$current_partition" | cut -d'=' -f2`
    13071261            actual_dev=""
    13081262
    … …  
    13141268            # 2nd try : blkid, the good way for all LABEL except swap
    13151269            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
    1316                 actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | /bin/cut -d':' -f1`
     1270                actual_dev=`/sbin/blkid | /bin/grep "$uuid" | grep UUID= | cut -d':' -f1`
    13171271                # For LVM FS it will give a /dev/dm-# which should then be converted
    13181272                if [ $LVM = "v2" ] && [ "`echo $actual_dev | grep '/dev/dm'`" ]; then
    … …  
    15901544    old_pwd=`pwd`
    15911545    cd $MINDI_TMP/iso
    1592     mkdir -p $MONDO_ROOT/iso/isolinux
    15931546    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
    15941547    for i in memdisk memtest.bin memtest.img ; do
    … …  
    16031556    done
    16041557    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
    1605     cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/isolinux/vmlinuz). Did you run out of disk space?"
     1558    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
     1559    cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
    16061560    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
    1607     cp $MINDI_TMP/mindi.rdz $CACHE_LOC/initrd.img 2>> $LOGFILE
     1561    cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE
    16081562    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
    16091563    cd $MINDI_TMP/iso/isolinux
    … …  
    26432597        echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
    26442598        [ "$USE_LZO" = "yes" ] && echo -en "Pras 4 Pres 2004" >> $mountpoint/tmp/USING-LZO
     2599        [ "$USE_GZIP" = "yes" ] && echo -en "YES" >> $mountpoint/tmp/USING-GZIP
    26452600        [ "$USE_COMP" = "yes" ] && echo -en "Compression, yep" >> $mountpoint/tmp/USING-COMP
    26462601        [ "$USE_STAR" = "yes" ] && echo -en "Using star. Hooray." >> $mountpoint/tmp/USING-STAR
    … …  
    27122667
    27132668##############################################################################
    2714 #----------------------------------- main -----------------------------------#
     2669#----------------------------------- Main -----------------------------------#
    27152670##############################################################################
    27162671
    … …  
    27372692[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && ln -sf /sbin/mkdosfs /sbin/mkfs.vfat
    27382693
    2739 FindHomeOfMindiAndMondo
     2694# Log some capital variables
     2695[ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
     2696echo "MINDI_LIB = $MINDI_LIB" >> $LOGFILE
     2697echo "MINDI_SBIN = $MINDI_SBIN" >> $LOGFILE
     2698[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
     2699echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
     2700echo "MONDO_SHARE = $MONDO_SHARE" >> $LOGFILE
     2701
    27402702trap AbortHere SIGTERM SIGHUP SIGQUIT SIGKILL SIGABRT SIGINT
    2741 AbortIfYourDistroIsAPieceOfStercus
     2703
     2704# Sanity checks
     2705which which > /dev/null 2> /dev/null || Die "Please install 'which'."
     2706which strings > /dev/null 2> /dev/null || Die "Please install binutils and libbinutils; you have no 'strings' executable."
     2707which gawk > /dev/null 2> /dev/null || Die "Gawk is missing from your computer. Please install gawk. You may find the package on Debian's website. How did I know you're running Debian? Because only Debian would be stupid enough not to include gawk in your distribution."
     2708which gawk > /dev/null 2> /dev/null && AWK=`which gawk 2>/dev/null` || AWK="`which awk 2>/dev/null`"
     2709if which awk &> /dev/null ; then
     2710    if ! which gawk &> /dev/null ; then
     2711        LogIt "You have awk but not gawk.\nPlease note that mindi works fine with a _sane_ awk binary.\nIf your awk binary misbehaves then please contact your vendor\nor distribution's mailing list for technical support.\n"
     2712    fi
     2713fi
     2714which mke2fs > /dev/null 2> /dev/null || Die "Please put mke2fs in system path"
     2715[ ! -e "$FDISK" ] && Die "Cannot find (s)fdisk"
     2716
    27422717[ "`uname -r | grep "2.4.[0-6]" | grep -v "2.4.[0-9][0-9]"`" != "" ] &&  echo "WARNING! Your kernel may have buggy loopfs code. Consider upgrading to 2.4.7"
    27432718# If we have a 2.6 kernel, the system uses module-init-tools which means that we
    … …  
    27552730    [ ! -e "/etc/modules.conf" ] && Die "/etc/modules.conf not found; you may have to create a softlink from /etc/conf.modules to /etc/modules.conf; of course, all good distros use modules.conf anyway..."
    27562731fi
    2757 FixPathIfBroken
     2732
     2733# Update the PATH variable if incomplete
     2734if [ -e "/sbin/mkfs" ] && ! which mkfs &> /dev/null ; then
     2735    PATH=$PATH:/sbin:/usr/sbin
     2736    export PATH
     2737    echo "Your PATH did not include /sbin or /usr/sbin. I have fixed that, temporarily." >> $LOGFILE
     2738    echo "However, you may wish to ask your vendor to provide a permanent fix..." >> $LOGFILE
     2739    echo " Or you might like to call 'su -' instead of 'su', for example." >> $LOGFILE
     2740fi
     2741
    27582742[ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
    2759 AbortIfMkfsVfatMissing
     2743
     2744if ! which mkfs.vfat &> /dev/null ; then
     2745    Die "mkfs.vfat missing from your filesystem - please install your dosfstools RPM or DEB package. Perhaps your PATH environmental variable is broken, too?"
     2746fi
     2747
    27602748### BERLIOS
    27612749### Fix as it's not mandatory on ia64
    27622750if [ "$ARCH" = "ia64" ] ; then
    2763     FindELiloBinary
     2751    if which elilo &> /dev/null ; then
     2752        LILO_EXE=elilo
     2753    else
     2754        LILO_EXE=`which false`
     2755    fi
    27642756else
    27652757    FindIsolinuxBinary
    … …  
    27742766MAX_COMPRESSED_SIZE=1300
    27752767kernelpath=""
    2776 MONDO_ROOT=$TMPMONDO/mondo-root
     2768MONDO_ROOT=/var/cache/mondo
    27772769mkdir -p $MONDO_ROOT
    27782770
    … …  
    27882780    LVM="false"
    27892781fi
     2782echo "LVM set to $LVM" >> $LOGFILE
     2783echo "----------" >> $LOGFILE
     2784echo "df result:" >> $LOGFILE
     2785echo "----------" >> $LOGFILE
     2786df -T >> $LOGFILE
     2787echo "-------------" >> $LOGFILE
     2788echo "lsmod result:" >> $LOGFILE
     2789echo "-------------" >> $LOGFILE
     2790lsmod >> $LOGFILE
     2791echo "-------------" >> $LOGFILE
    27902792
    27912793if [ "$#" -ge "2" ] ; then
    … …  
    28242826        # Change MINDI_TMP for the one provided by mondo
    28252827        # So that it can get back the built files
    2826         rm -rf $MINDI_TMP
     2828        mv $MINDI_TMP/* $MINDI_TMP/.??* $MONDO_TMP 2> /dev/null
     2829        rmdir $MINDI_TMP
    28272830        MINDI_TMP=$MONDO_TMP
    28282831        mkdir -p $MINDI_TMP
     2832        # This is the scratch dir in mondo
    28292833        CACHE_LOC=$3
    28302834        if [ _"$CACHE_LOC" != _"" ]; then
    … …  
    28732877        INTERNAL_TAPE_BLOCK_SIZE="${18}"
    28742878        DIFFERENTIAL="${19}"
    2875         NOT_BOOT="${20}"
     2879        USE_GZIP="${20}"
     2880        NOT_BOOT="${21}"
    28762881        [ "$USE_COMP" = "" ] && USE_COMP=yes
     2882        [ "$USE_GZIP" = "" ] && USE_GZIP=no
    28772883        [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
    28782884        [ "$TAPEDEV" ] && LogIt "This is a tape-based backup. Fine."
    … …  
    29172923else
    29182924    echo "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks" >> /var/log/mondo-archive.log
     2925fi
     2926if [ -f $MINDI_LIB/rootfs/bin/busybox ]; then
     2927    LogIt "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
     2928else
     2929    LogIt "Unable to find mindi-busybox, please install it"
     2930    MindiExit -1
    29192931fi
    29202932

  • trunk/mindi/rootfs/README

    r295 r1043  
     1# $Id$
     2#
    13README              MINDI LINUX / MONDO RESCUE            February 7th, 2002
    24
    … …  
    2426accordingly.
    2527
    26 Before you e-mail me, please read the FAQ, the manual, the log and preferably
     28Before you e-mail us, please read the FAQ, the manual, the log and preferably
    2729the mailing list.
    2830
    29                                            - Hugo Rabson <hugo@firstlinux.net>
     31                                           - Dev Team
    3032
    3133

  • trunk/mondo-doc/distributions/debian/rules

    r764 r1043  
    6464    dh_testdir
    6565    dh_testroot
    66     dh_installchangelogs ChangeLog
    6766    dh_installdocs
    6867    dh_installman

  • trunk/mondo-doc/mondoarchive.8

    r956 r1043  
    256256
    257257.TP
     258.BI "-G "
     259Use gzip, the standard and quicker Linux compression engine, instead of bzip2.
     260
     261.TP
    258262.BI "-R "
    259263EXPERIMENTAL. Do not use in mission-critical environments. Star is an alternative to afio. Mondo now supports POSIX ACLs and extended attributes, so -R is essentially redundant for now.

  • trunk/mondo/ChangeLog

    r923 r1043  
    77- asprintf used instead of malloc_string + sprintf/strcpy/strcat without verifications. Optimisations on memory consumption (allocate only size needed + remove memory leaks) (Bruno Cornec)
    88- Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
     9
     102.2.1 (2006-12-23)
     11- Fix a memory allocation bug in gen_aux_list (Klaus Ade Johnstad/Andree Leidenfrost)
     12- fedora core 6 and suse 10.2 support added in build process (Bruno Cornec)
     13- Fix a bug where grub.conf was a symlink (Bruno Cornec)
     14- mondo now supports gzip compression format (-G option) (#113) (Bruno Cornec)
     15- ACL and XATTR are now NOT backed up anymore by default. Should increase mondoarchive speed. To handle them as before, please use the -z option. Fix Bug #63 (Bruno Cornec)
     16- Fix a bug in libmondo-fifo.c where potentially no buffer content could let mondo runni ng forever in case of an exception (Bruno Cornec)
     17- Fix a bug where ps (busybox) and ps (system) do not give PID in the same column (Bruno Cornec)
     18- TAG is now per package (Bruno Cornec)
     19- Add CentOS build support (Andy Wright/Bruno Cornec)
     20- Fix bug #89 (env var were queried too early, and not ncessarily in PXE mode) (Bruno Cornec)
     21- fix #66 (setfacl not existing => no error) (Bruno Cornec)
     22- Removal of grep -w|-x during restore as not supported by busybox fixes bug #101 (Alfred Chua/Bruno Cornec)
     23- Fix a bug with DVD+RW format, when mondo asks for retry without success indifinitely (Mariano Aliaga)
     24- Fix Bug #90 mondoarchive fails when using space in the prefix (Bruno Cornec)
     25- Fix Bug #87 LABEL= swap does not come online after mondorestore (Bruno Cornec)
     26- Source directory for mondo is now src (compatibility with trunk) (Bruno Cornec)
    927
    10282.2.0 (2006-10-04)
    … …  
    2644- Fix for bug #21 prefix taken from PXE server first (Bruno Cornec)
    2745- Fix for bug #24 ps options (Bruno Cornec)
    28 >>>>>>> .merge-right.r888
    2946
    30472.0.9 (2006-08-04)

  • trunk/mondo/distributions/rpm/mondo.spec

    r904 r1043  
    1919ExcludeArch:    ppc
    2020OBS
    21 Requires:   mindi >= 1.2.0, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
     21Requires:   mindi >= 1.2.1, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
    2222%ifarch ia64
    2323Requires:   elilo, parted

  • trunk/mondo/src/common/libmondo-archive.c

    r962 r1043  
    546546    char *command = NULL;
    547547    char *use_lzo_sz = NULL;
     548    char *use_gzip_sz = NULL;
    548549    char *use_comp_sz = NULL;
    549550    char *use_star_sz = NULL;
    … …  
    607608    } else {
    608609        mr_asprintf(&use_lzo_sz, "no");
     610    }
     611    if (bkpinfo->use_gzip) {
     612        mr_asprintf(&use_gzip_sz, "yes");
     613    } else {
     614        mr_asprintf(&use_gzip_sz, "no");
    609615    }
    610616    if (bkpinfo->use_star) {
    … …  
    861867             "mindi --custom %s %s/images '%s' '%s' \
    862868'%s' %ld '%s' '%s' '%s' \
    863 '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d %s", bkpinfo->tmpdir,    // parameter #2
     869'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", bkpinfo->tmpdir,  // parameter #2
    864870             bkpinfo->scratchdir,   // parameter #3
    865871             bkpinfo->kernel_path,  // parameter #4
    … …  
    879885             bkpinfo->internal_tape_block_size, // parameter #18 (LONG)
    880886             bkpinfo->differential, // parameter #19 (INT)
     887             use_gzip_sz,       // parameter #20 (STRING)
    881888             tmp);
    882889    mr_free(tmp);
    … …  
    891898    mr_free(devs_to_exclude);
    892899    mr_free(use_lilo_sz);
     900    mr_free(use_gzip_sz);
    893901
    894902    log_msg(2, command);

  • trunk/mondo/src/common/libmondo-filelist.c

    r991 r1043  
    428428    char *syscall;
    429429    char *file_to_analyze = NULL;
     430    char *strtmp = NULL;
    430431    int i;
    431432    size_t n = 0;
    … …  
    452453        log_msg(8, "Analyzing %s", file_to_analyze);
    453454        /* BERLIOS : to be checked */
    454         mr_asprintf(&syscall, "%s %s 2>> /dev/null", syscall_sprintf,mr_stresc(file_to_analyze, "`$\\\"", '\\'));
     455        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
     456        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
     457        paranoid_free(strtmp);
    455458        call_exe_and_pipe_output_to_fd(syscall, pout);
    456459        mr_free(syscall);

  • trunk/mondo/src/common/libmondo-files.c

    r903 r1043  
    12051205    if (bkpinfo->use_lzo) {
    12061206        scratchLL = (scratchLL * 2) / 3;
     1207    } else if (bkpinfo->use_gzip) {
     1208        scratchLL = (scratchLL * 2) / 3;
    12071209    } else {
    12081210        scratchLL = scratchLL / 2;

  • trunk/mondo/src/common/libmondo-tools.c

    r1000 r1043  
    431431        mr_allocstr(bkpinfo->zip_exe, "lzop");
    432432        mr_allocstr(bkpinfo->zip_suffix, "lzo");
     433    } else if (bkpinfo->use_gzip) {
     434        strcpy(bkpinfo->zip_exe, "gzip");
     435        strcpy(bkpinfo->zip_suffix, "gz");
     436    } else if (bkpinfo->use_gzip) {
     437        strcpy(bkpinfo->zip_exe, "gzip");
     438        strcpy(bkpinfo->zip_suffix, "gz");
    433439    } else if (bkpinfo->compression_level != 0) {
    434440        mr_allocstr(bkpinfo->zip_exe, "bzip2");
    … …  
    753759    mr_free(bkpinfo->restore_path);
    754760    bkpinfo->use_lzo = FALSE;
     761    bkpinfo->use_gzip = FALSE;
     762    bkpinfo->do_not_compress_these[0] = '\0';
    755763    bkpinfo->verify_data = FALSE;
    756764    bkpinfo->backup_data = FALSE;
    … …  
    909917    }
    910918    retval += whine_if_not_found("bzip2");
     919    retval += whine_if_not_found("gzip");
    911920    retval += whine_if_not_found("awk");
    912921    retval += whine_if_not_found("md5sum");

  • trunk/mondo/src/common/libmondo-verify.c

    r956 r1043  
    238238        if (bkpinfo->use_lzo) {
    239239            mr_asprintf(&sz_exe, "lzop");
     240        else if (bkpinfo->use_gzip) {
     241            strcpy(sz_exe, "gzip");
     242        } else if (bkpinfo->use_gzip) {
     243            strcpy(sz_exe, "gzip");
    240244        } else {
    241245            mr_asprintf(&sz_exe, "bzip2");
    … …  
    409413        mr_allocstr(bkpinfo->zip_suffix, "lzo");
    410414        bkpinfo->use_lzo = TRUE;
     415        bkpinfo->use_gzip = FALSE;
     416    }
     417    if (strstr(tarball_fname, ".gz")
     418        && strcmp(bkpinfo->zip_suffix, "gz")) {
     419        log_msg(2, "OK, I'm going to start using gzip.");
     420        strcpy(bkpinfo->zip_exe, "gzip");
     421        strcpy(bkpinfo->zip_suffix, "gz");
     422        bkpinfo->use_lzo = FALSE;
     423        bkpinfo->use_gzip = TRUE;
    411424    }
    412425    if (strstr(tarball_fname, ".bz2")
    … …  
    416429        mr_allocstr(bkpinfo->zip_suffix, "bz2");
    417430        bkpinfo->use_lzo = FALSE;
     431        bkpinfo->use_gzip = FALSE;
    418432    }
    419433    unlink(outlog);

  • trunk/mondo/src/common/mondostructures.h

    r900 r1043  
    387387   */
    388388    bool use_lzo;
     389
     390  /**
     391   * If TRUE, then use @c gzip to compress data.
     392   * This is used mainly in estimates. The backup/restore may or may
     393   * not work if you do not set this. You should also set @p zip_exe
     394   * and @p zip_suffix.
     395   */
     396    bool use_gzip;
     397
     398  /**
     399   * A filename containing a list of extensions, one per line, to not
     400   * compress. If this is set to "", afio will still exclude a set of well-known
     401   * compressed files from compression, but biggiefiles that are compressed
     402   * will be recompressed again.
     403   */
     404    char do_not_compress_these[MAX_STR_LEN / 2];
    389405
    390406  /**

  • trunk/mondo/src/mondoarchive/mondo-cli.c

    r956 r1043  
    799799    }
    800800
     801    if (flag_set['G']) {
     802        bkpinfo->use_gzip = TRUE;
     803        if (run_program_and_log_output("which gzip", FALSE)) {
     804            retval++;
     805            log_to_screen
     806                ("Please install gzip. You can't use '-G' until you do.\n");
     807        }
     808    }
     809
    801810    if (!flag_set['o']
    802811        &&
    … …  
    893902    while ((opt =
    894903            getopt(argc, argv,
    895                    "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
     904                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
    896905           != -1) {
    897906        if (opt == '?') {

  • trunk/mondo/src/mondorestore/mondo-restore.c

    r973 r1043  
    10021002    char *outfile_fname = NULL;
    10031003    char *tmp = NULL;
     1004    char *tmp0 = NULL;
    10041005    char *tmp1 = NULL;
    10051006    char *tmp2 = NULL;
    … …  
    11571158    for (sliceno = 1, finished = FALSE; !finished;) {
    11581159        tmp = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "");
     1160        tmp0 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz");
    11591161        tmp1 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo");
    11601162        tmp2 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2");
    1161         if (!does_file_exist(tmp) && !does_file_exist(tmp1) &&
     1163        if (!does_file_exist(tmp) &&
     1164            !does_file_exist(tmp0) &&
     1165            !does_file_exist(tmp1) &&
    11621166            !does_file_exist(tmp2)) {
    11631167            log_msg(3,
    … …  
    11901194                if (does_file_exist(tmp1)) {
    11911195                    mr_asprintf(&bzip2_command, "lzop -dc %s 2>> %s",tmp1, MONDO_LOGFILE);
     1196                } else if (does_file_exist(tmp0)) {
     1197                    mr_asprintf(&bzip2_command, "gzip -dc %s 2>> %s",tmp0, MONDO_LOGFILE);
    11921198                } else if (does_file_exist(tmp2)) {
    11931199                        mr_asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
    … …  
    16161622        if (strstr(tarball_fname, ".bz2")) {
    16171623            mr_asprintf(&executable, "bzip2");
     1624        } else if (strstr(tarball_fname, ".gz")) {
     1625            strcpy(executable, "gzip");
     1626        } else if (strstr(tarball_fname, ".gz")) {
     1627            strcpy(executable, "gzip");
    16181628        } else if (strstr(tarball_fname, ".lzo")) {
    16191629            mr_asprintf(&executable, "lzop");

  • trunk/mondo/src/mondorestore/mondo-rstr-compare.c

    r900 r1043  
    241241    if (strstr(tarball_fname, ".bz2")) {
    242242        mr_asprintf(&compressor_exe, "bzip2");
     243    } else if (strstr(tarball_fname, ".gz")) {
     244        strcpy(compressor_exe, "gzip");
     245    } else if (strstr(tarball_fname, ".gz")) {
     246        strcpy(compressor_exe, "gzip");
    243247    } else if (strstr(tarball_fname, ".lzo")) {
    244248        mr_asprintf(&compressor_exe, "lzop");

  • trunk/mondo/src/mondorestore/mondo-rstr-tools.c

    r972 r1043  
    952952        mr_allocstr(bkpinfo->zip_exe, "lzop");
    953953        mr_allocstr(bkpinfo->zip_suffix, "lzo");
     954        bkpinfo->use_gzip = FALSE;
    954955    } else {
    955956        mr_free(value);
    956         read_cfg_var(cfg_file, "use-comp", value);
     957        read_cfg_var(cfg_file, "use-gzip", value);
    957958        if (strstr(value, "yes")) {
    958959            bkpinfo->use_lzo = FALSE;
    959             mr_allocstr(bkpinfo->zip_exe, "bzip2");
    960             mr_allocstr(bkpinfo->zip_suffix, "bz2");
     960            bkpinfo->use_gzip = TRUE;
     961            mr_allocstr(bkpinfo->zip_exe, "gzip");
     962            mr_allocstr(bkpinfo->zip_suffix, "gz");
    961963        } else {
    962             // Just to be sure
    963             bkpinfo->zip_exe = NULL;
    964             bkpinfo->zip_suffix = NULL;
     964            read_cfg_var(cfg_file, "use-comp", value);
     965            if (strstr(value, "yes")) {
     966                bkpinfo->use_lzo = FALSE;
     967                bkpinfo->use_gzip = FALSE;
     968                mr_allocstr(bkpinfo->zip_exe, "bzip2");
     969                mr_allocstr(bkpinfo->zip_suffix, "bz2");
     970            } else {
     971                // Just to be sure
     972                bkpinfo->zip_exe = NULL;
     973                bkpinfo->zip_suffix = NULL;
     974            }
    965975        }
    966976    }

  • trunk/mondo/src/restore-scripts/mondo/hack-fstab

    r588 r1043  
    11#!/bin/sh
    22#
     3# $Id$
    34#
    4 #
    5 #
    6 #
    7 # 2003/08/04
    8 # - added some logging
    9 #
    10 # mid-2002 --- created
    11 ################################################
    12 
    135
    146LogIt() {
    157    echo "$1" >> /dev/stderr
    168}
    17 
    18 
    199
    2010
    … …  
    3323#    echo "original_fstab_line = $original_fstab_line" >> /dev/stderr
    3424    if [ "`grep "LABEL=" $old_fstab`" != "" ] ; then
    35     if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
    36         device="LABEL=$mountpoint"
    37     fi
     25        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
     26            device="LABEL=$mountpoint"
     27        fi
    3828    fi
    3929
    … …  
    4434    if [ "$original_fstab_line" != "" ] ; then
    4535#   echo $original_fstab_line | gawk '{i=index($0,$4); print substr($0,i);}'
    46     echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
     36        echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
    4737    else
    48     echo -e "defaults 0 0"
     38        echo -e "defaults 0 0"
    4939    fi
    5040}
    51 
    5241
    5342

  • trunk/mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso

    r588 r1043  
    6363            if echo "$slicename" | grep "bz2" > /dev/null ; then
    6464                bzip2 -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
     65            elif echo "$slicename" | grep "gz" > /dev/null ; then
     66                gzip -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
    6567            elif echo "$slicename" | grep "lzo" > /dev/null ; then
    6668                lzop -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"

  • trunk/mondo/src/restore-scripts/mondo/stabgrub-me

    r839 r1043  
    3232        LogIt "No need for fstab search." 2
    3333#        fstab_list=/mnt/RESTORING/etc/fstab
    34     old_fstab=/mnt/RESTORING/etc/fstab
    35     old_grubconf=/mnt/RESTORING/etc/grub.conf
     34        old_fstab=/mnt/RESTORING/etc/fstab
     35        old_grubconf=/mnt/RESTORING/etc/grub.conf
    3636        # For some distros, e.g. Debian, /etc/grub.conf is a symbolic link
    37     # which we need to resolve and prepend with /mnt/RESTORING because
    38     # we run this outside the chroot.
    39     if [ -L "$old_grubconf" ] ; then
    40         old_grubconf=/mnt/RESTORING`readlink "$old_grubconf"`
    41     fi 
    42     return 0
     37        # which we need to resolve and prepend with /mnt/RESTORING because
     38        # we run this outside the chroot.
     39        if [ -L "$old_grubconf" ] ; then
     40            old_grubconf=/mnt/RESTORING/etc/`readlink "$old_grubconf"`
     41        fi 
     42        return 0
    4343    elif [ -f "/mnt/cdrom/archives/CUCKOO" ] ; then
    4444        LogIt "Because I'm cuckoo, I'll stop searching." 2

  • trunk/tools/DISTROS

    r839 r1043  
    77fedora_4
    88fedora_5
     9fedora_6
    910rhel_3
    1011rhel_4
    1112suse_10.0
    1213suse_10.1
     14suse_10.2
    1315sles_9
    1416sles_10
    … …  
    1618gentoo_1.6
    1719slackware_10.2
     20slackware_11.0
     21freebsd_5.5

  • trunk/tools/build2pkg

    r932 r1043  
    1111dname=`dirname $0`
    1212prem=`echo $dname |cut -c1`
    13 if [ ${prem} == "/" ]; then
     13if [ _${prem} = _"/" ]; then
    1414    export TOOLHOME=$dname
    1515else
    … …  
    115115            status=-1
    116116        fi
     117        export pkg="$pkg $p-${PVER}.ebuild"
    117118    elif [  _"$dtype" = _"deb" ]; then
    118119        cd $TOPBUILDDIR
    … …  
    122123        ln -s distributions/${ddir}-$dver debian
    123124        dpkg-buildpackage -us -uc -rfakeroot
     125        export pkg="$pkg $p-${PVER}.deb"
    124126        # Et voila !
     127    elif [  _"$dtype" = _"port" ]; then
     128        cd $TOPBUILDDIR
     129        tar xfz $src
     130        cd ${p}-${PVER}
     131        mv distributions/${ddir}-$dver/* $TOPBUILDDIR
     132        cd ..
     133        rm -rf ${p}-${PVER}
     134        make DISTDIR=$TOPBUILDDIR
     135    elif [  _"$dfam" = _"slackware" ]; then
     136        mkdir -p $TOPBUILDDIR/build-${p}/install
     137        cd $TOPBUILDDIR
     138        tar xfz $src
     139        cd ${p}-${PVER}
     140        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/build-${p}/install
     141        if [ -e distributions/${ddir}-$dver/doinst.sh ]; then
     142            mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/build-${p}/install
     143        fi
     144        if [ _"$p" = _"mindi-busybox" ]; then
     145            make oldconfig
     146            make busybox
     147            DESTDIR=$TOPBUILDDIR/build-${p}/usr/lib/mindi/rootfs
     148            make PREFIX=$DESTDIR install
     149        elif [ _"$p" = _"mindi" ]; then
     150            export DONT_RELINK=1
     151            export HEAD=$TOPBUILDDIR/build-${p}
     152            export PREFIX=/usr
     153            export CONFDIR=/etc
     154            export MANDIR=/usr/man
     155            export DOCDIR=/usr/doc
     156            export LIBDIR=/usr/lib
     157            export RPMBUILDMINDI="true"
     158            ./install.sh
     159        elif [ _"$p" = _"mondo" ]; then
     160            ./configure --prefix=/usr
     161            make VERSION=$PVER
     162            make DESTDIR=$TOPBUILDDIR/build-${p} install
     163        elif [ _"$p" = _"mondo-doc" ]; then
     164            make -f Makefile.man VERSION=$PVER
     165            make -f Makefile.howto VERSION=$PVER
     166            make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
     167            make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
     168        else
     169            echo "Package $p not configured for $dfam"
     170        fi
     171        cd $TOPBUILDDIR/build-${p}
     172        ar=`arch`
     173        pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz
     174        echo "Running sudo /sbin/makepkg -p -l y -c y $pkg1"
     175        sudo /sbin/makepkg -p -l y -c y $pkg1
     176        export pkg="$pkg $pkg1"
    125177    else
    126178        echo "Unknown"

  • trunk/tools/build2qemu

    r932 r1043  
    66#
    77
    8 #if [ _"$1" == _"" ]; then
     8#if [ _"$1" = _"" ]; then
    99    #echo "Syntax: build2qemu [version-tag [vm1]..|vmx]] )"
    1010    #exit -1
    1111#fi
    1212
    13 # Syntax: build2qemu [version-tag [vm1]..|vmx]]
     13# Syntax: build2qemu [version-tag [--pkg "pkg1...pkgn"] [vm1]..|vmx]]
    1414
    1515(
    1616dname=`dirname $0`
    1717prem=`echo $dname |cut -c1`
    18 if [ ${prem} == "/" ]; then
     18if [ _${prem} = _"/" ]; then
    1919    export TOOLHOME=$dname
    2020else
    … …  
    3636echo "Working on ${VER}-$TAG"
    3737
    38 if [ _"$1" == _"" ]; then
     38if [ _"$1" = _"--pkg" ]; then
     39    shift
     40    c=$1
     41    shift
     42fi
     43
     44if [ _"$1" = _"" ]; then
    3945    export VMS=`cat ${TOOLHOME}/DISTROS`
    4046    single=0
    … …  
    5258export TOOLHOME=$TOOLHOME
    5359
    54 $TOOLHOME/build2pkg $LAST < /dev/null
    55 $TOOLHOME/pkg2ftp $LAST
     60$TOOLHOME/build2pkg $LAST $c < /dev/null
     61$TOOLHOME/pkg2ftp $LAST $c
    5662EOF
    5763chmod 755 $MONDOTMP/mkmondo
    … …  
    6874
    6975for m in $VMS; do
     76    echo "Working on $m"
    7077    vmp=0
    7178    if [ ! -f /users/qemu/$m.qemu ]; then
    … …  
    8693    scp -P $sp $MONDOTMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
    8794    rdate=`date "+%m%d%H%M"`
    88     ssh -p $sp root@localhost "date $rdate"
    89     ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
     95    ssh -q -p $sp root@localhost "date $rdate"
     96    ssh -q -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
    9097    if [ $vmp -eq 1 ]; then
    91         ssh -p $sp root@localhost "halt -p"
     98        ssh -q -p $sp root@localhost "halt -p"
    9299        sleep 300
    93100        proces=`ps auxww | grep qemu | grep -v grep | grep /users/qemu/$m.qemu | awk '{print $2}'`

  • trunk/tools/distro-env

    r932 r1043  
    3939            export ddir="sles"
    4040            export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
     41        elif grep -q openSUSE /etc/SuSE-release ; then
     42            export ddir="suse"
     43            export dver=`head -1 /etc/SuSE-release | awk '{print $2}'`
    4144        else
    4245            export ddir="suse"
    4346            export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
    4447        fi
     48    elif [ -e /etc/slackware-version ]; then
     49        export ddir="slackware"
     50        export dver=`awk '{print $2}' /etc/slackware-version | cut -d. -f1-2`
    4551    elif [ -e /etc/gentoo-release ]; then
    4652        export ddir="gentoo"
    … …  
    5763        if [ $dver = "testing/unstable" ]; then
    5864            export dver = "sid"
     65        fi
     66    elif [ -e /etc/motd ]; then
     67        head -1 /etc/motd | grep -q FreeBSD
     68        if [ $? -eq 0 ]; then
     69            export ddir="freebsd"
     70            export dver=`head -1 /etc/motd | awk '{print $2}' /etc/motd | cut -d- -f1`
     71        else
     72            export ddir="unknown"
     73            export dver=""
    5974        fi
    6075    else
    … …  
    7792    suf=".${ddir}${dver1}"
    7893elif [ $ddir = "slackware" ]; then
    79     dfam="slack"
     94    dfam="slackware"
    8095    dtype="tgz"
    8196    suf=".${dfam}${dver}"
    … …  
    106121    dtype="rpm"
    107122    suf=".`echo $dver | sed 's/\.//'`mdv"
     123elif [ $ddir = "freebsd" ]; then
     124    dfam="freebsd"
     125    dtype="port"
     126    suf=".`echo $dver | sed 's/\.//'`fbsd"
    108127else
    109128    dfam="unknown"
    … …  
    124143
    125144if [ _"$dtype" = _"rpm" ]; then
    126     export TOPBUILDDIR=`rpmquery -E '%{_topdir}' 2> /dev/null`
     145    export TOPBUILDDIR=`rpmquery --eval '%{_topdir}' 2> /dev/null`
    127146    export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
    128147    mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
    … …  
    135154elif [ _"$dtype" = _"deb" ]; then
    136155    mkdir -p ${TOPBUILDDIR}
     156elif [ _"$dtype" = _"port" ]; then
     157    mkdir -p ${TOPBUILDDIR}
     158elif [ _"$dfam" = _"slackware" ]; then
     159    mkdir -p ${TOPBUILDDIR}/install
    137160elif [ _"$dtype" = _"ebuild" ]; then
    138161    mkdir -p ${TOPBUILDDIR}/portage

  • trunk/tools/file2ftp

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else

  • trunk/tools/livwww

    r932 r1043  
    3333dname=`dirname $0`
    3434prem=`echo $dname |cut -c1`
    35 if [ ${prem} == "/" ]; then
     35if [ ${prem} = "/" ]; then
    3636        export TOOLHOME=$dname
    3737else
    … …  
    9191$TOOLHOME/mknewshtml.pl $LOCALDIR
    9292
    93 if [ _"$1" == _"" ]; then
     93if [ _"$1" = _"" ]; then
    9494        exit 0
    9595else
    96     if [ _"$1" == _"test" ]; then
     96    if [ _"$1" = _"test" ]; then
    9797        DESTDIR=$TESTDIR
    9898    else
    … …  
    104104scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
    105105rm -f /tmp/mondo-www.tgz
    106 ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
     106ssh -q ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"

  • trunk/tools/mkannounce

    r900 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else
    … …  
    3636MondoRescue $VER is now available</p>
    3737
    38 <p>I'm happy to announce the availability of a newest version of mondoescue $VER. Enjoy it as usual!</p>
     38<p>I'm happy to announce the availability of a newest version of mondorescue $VER. Enjoy it as usual!</p>
    3939<p>
    4040Now available at <a href="ftp://ftp.mondorescue.org/">ftp://ftp.mondorescue.org/
    … …  
    4343<p>
    4444EOF
    45 ssh ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $MONDOTMP/announce.tmp
     45ssh -q ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $MONDOTMP/announce.tmp
    4646cat >> $MONDOTMP/announce.tmp << EOF
    4747</p>
    … …  
    5757$TOOLHOME/mkchangelog.pl announce mindi $MONDOTMP/mindi.ann
    5858$TOOLHOME/mkchangelog.pl announce mondo $MONDOTMP/mondo.ann
     59$TOOLHOME/mkchangelog.pl announce mindi-busybox $MONDOTMP/mindi-busybox.ann
    5960echo "<p>" >> $MONDOTMP/announce.tmp
    6061sed 's/$/<br>/' $MONDOTMP/mindi.ann >> $MONDOTMP/announce.tmp
    6162echo "</p><p>" >> $MONDOTMP/announce.tmp
    6263sed 's/$/<br>/' $MONDOTMP/mondo.ann >> $MONDOTMP/announce.tmp
     64echo "</p><p>" >> $MONDOTMP/announce.tmp
     65sed 's/$/<br>/' $MONDOTMP/mindi-busybox.ann >> $MONDOTMP/announce.tmp
    6366echo "</p>" >> $MONDOTMP/announce.tmp
    6467rm -f $MONDOTMP/mindi.ann $MONDOTMP/mondo.ann
    … …  
    8588cat $MONDOTMP/announce.hdr $MONDOTMP/announce.tmp $MONDOTMP/announce.ftr | w3m -dump -T text/html > $MONDOTMP/mondo.ann.txt
    8689export EMAIL="bruno@mondorescue.org"
    87 cat $MONDOTMP/mondo.ann.txt | mutt -s "`head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
     90cat $MONDOTMP/mondo.ann.txt | mutt -s "ANNOUNCE: `head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
    8891rm -rf $MONDOTMP

  • trunk/tools/mknewtag

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else

  • trunk/tools/mknewversion

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313    export TOOLHOME=$dname
    1414else
    … …  
    3737fi
    3838
    39 svn copy $SVN_M/branches/stable $SVN_M/branches/${VER}
     39echo "Copying the stable version to ${VER}"
     40svn copy $SVN_M/branches/stable $SVN_M/branches/${VER} -m "Creation of mondo ${VER} from stable"
    4041cd $TOOLHOME/../..
    4142svn co $SVN_M/branches/${VER} ${VER}
    … …  
    5354    echo "$v" > $p/VERSION
    5455done
    55 svn ci -m "Creation of mondo ${VER}-$TAG"
     56svn ci -m "VERSION and TAG update"
    5657svn up

  • trunk/tools/mkqemu

    r904 r1043  
    66#
    77
    8 if [ _"$1" == _"" ]; then
     8if [ _"$1" = _"" ]; then
    99    echo "Syntax: qemu vm"
    1010    exit -1
    … …  
    2020
    2121ARCH=`/bin/arch`
    22 if [ $ARCH == "x86_64" ]; then
     22if [ $ARCH = "x86_64" ]; then
    2323    qemucmd32=/usr//bin/qemu-system-i386
    2424    qemucmd64=/usr//bin/qemu

  • trunk/tools/pkg2fc

    r932 r1043  
    99dname=`dirname $0`
    1010prem=`echo $dname |cut -c1`
    11 if [ ${prem} == "/" ]; then
     11if [ _${prem} = _"/" ]; then
    1212        export TOOLHOME=$dname
    1313else
    … …  
    7878scp -p /tmp/mkmondo ${ACCOUNT}:
    7979echo "Packages rebuild on ${DSTNODE}"
    80 ssh ${ACCOUNT} ${DSTNODE} "./mkmondo"
     80ssh -q ${ACCOUNT} ${DSTNODE} "./mkmondo"
    8181) 2>&1 | tee /tmp/pk2mdv.log

  • trunk/tools/pkg2ftp

    r932 r1043  
    1010dname=`dirname $0`
    1111prem=`echo $dname |cut -c1`
    12 if [ ${prem} == "/" ]; then
     12if [ _${prem} = _"/" ]; then
    1313        export TOOLHOME=$dname
    1414else
    … …  
    5252    src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
    5353    pv=`basename $src .tar.gz`
    54     tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"`
     54    tar -xz -C $MONDOTMP -f $src $pv/TAG
     55    tag=`cat $MONDOTMP/$pv/TAG`
    5556    if [  _"$dtype" = _"rpm" ]; then
    5657        if [ _"$p" = _"mondo-doc" ]; then
    … …  
    6768        spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
    6869        pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
     70    elif [  _"$dfam" = _"slackware" ]; then
     71        pkg="$pkg ${TOPBUILDDIR}/build-$p/$pv-*-${tag}mr.tgz"
    6972    fi
    7073done
    7174
     75rm -rf $MONDOTMP
    7276echo "Packages delivery to ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}"
    73 ssh ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver}"
     77ssh -q ${ACCOUNT} "mkdir -p ${DSTDIR}/${ddir}/${dver} ; cd ${DSTDIR}/${ddir}/${dver} ; rm -f ${pkg} ${spkg}"
    7478scp ${pkg} ${spkg} ${ACCOUNT}:${DSTDIR}/${ddir}/${dver}
    7579) 2>&1 | tee /tmp/pkg2ftp.log

  • trunk/tools/pkg2mdv

    r932 r1043  
    99dname=`dirname $0`
    1010prem=`echo $dname |cut -c1`
    11 if [ ${prem} == "/" ]; then
     11if [ _${prem} = _"/" ]; then
    1212        export TOOLHOME=$dname
    1313else
    … …  
    1818. $TOOLHOME/distro-env
    1919. $TOOLHOME/mdv-env
     20
     21export LANGUAGE="C"
    2022
    2123# We need to get $VER and $TAG
    … …  
    4446    src=${TOPDIR}/${VER}-$TAG/$p-[1-9]*.tar.bz2
    4547    s=`basename $src`
    46     oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
    47     newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
     48    if [ _"$p" = _"mindi-busybox" ]; then
     49        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
     50        newver=$oldver
     51    else
     52        oldver=`echo $s | sed "s/$p-\([1-9][0-9.]*\).tar.bz2/\1/"`
     53        newver=`echo $oldver | sed 's/\([0-9]\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)/\1.\2\3/'`
     54    fi
    4855    distro=`ls -d ${TOPDIR}/${VER}-$TAG/$p-[1-9]*/distributions/mandriva-* | tail -1`
    4956    spec=${distro}/$p.spec
    … …  
    5158    cd $SVNMDV/$p
    5259    mkdir -p SOURCES SPECS
    53     echo "Modifying $oldver => $newver"
    5460    svn del --force SOURCES/$p-*.tar.bz2
    5561    cp -a $src SOURCES/$p-$newver.tar.bz2
    56     tar xfj SOURCES/$p-$newver.tar.bz2
    57     mv $p-$oldver $p-$newver
    58     perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
    59     tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
    60     rm -rf $p-$newver
     62    cp -a $spec SPECS
     63
     64    # Case when there is a version change
     65    if [ _"$oldver" != _"$newver" ]; then
     66        echo "Modifying $oldver => $newver"
     67        tar xfj SOURCES/$p-$newver.tar.bz2
     68        mv $p-$oldver $p-$newver
     69        perl -pi -e "s/$oldver/$newver/" $p-$newver/VERSION
     70        tar cfj SOURCES/$p-$newver.tar.bz2 $p-$newver
     71        rm -rf $p-$newver
     72        perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
     73    fi
    6174    svn add SOURCES/$p-$newver.tar.bz2
    62     cp -a $spec SPECS
    6375    # Use mkrel for mdv
    64     perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $tag/" SPECS/$p.spec
    65     perl -pi -e 's/^Version:[ \t]+([0-9])\.([0-9]+)\.([0-9]+)/Version:  $1.$2$3/' SPECS/$p.spec
     76    perl -pi -e "s/^Release:[ \t]+..*/Release:  %mkrel $TAG/" SPECS/$p.spec
     77    perl -pi -e "s/^Release:/Packager:  Bruno Cornec <bcornec\@mandriva.org>\nRelease:/" SPECS/$p.spec
    6678    perl -pi -e 's/mindi >= ..*,/mindi/' SPECS/$p.spec
    6779    $TOOLHOME/mdv-changelog.pl SPECS/$p.spec
    … …  
    7789            rm -f $MONDOTMP/cmt.spec
    7890            echo "Building on Mandriva's cluster"
    79             ssh $ACCOUNT $DSTNODE "yr $p"
     91            rev=`svn info | egrep "^Revision:" | cut -d: -f2`
     92            repsys submit svn+ssh://svn.mandriva.com/svn/packages/cooker/$p $rev
    8093        fi
    8194    fi

  • trunk/tools/qemu-vm.txt

    r932 r1043  
    22qemu-img create -f qcow image.qemu 3G
    33qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
     4
     5# Recent SUSE acpi=off
    46
    57# RPM based : urpmi, yum install, yast2
    … …  
    1416#Cf: http://wiki.xensource.com/xenwiki/QEMUGentoo
    1517emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue
     18
     19# Slackware
     20# Cf: http://www.linuxpackages.net/howto.php?page=package&title=Package+Howto
    1621
    1722#Changing CD during install:
    … …  
    6873rpmbuild -ba build/SPECS/buffer.spec
    6974chmod 644 build/RPMS/i386/*
    70 scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* ftp.mondorescue.org:/mondo/ftp/rhel/3/
     75scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
    7176
    7277
    7378root:
    7479rpm -ivh ~bruno/build/RPMS/i?86/afio-[0-9]* ~bruno/build/RPMS/i?86/buffer-[0-9]*
    75 # In case
    76 scp bruno@10.0.2.2:/usr/bin/man2dvi /usr/local/bin
    7780
    7881#for gentoo
    7982chown bruno /etc/make.conf
    8083bruno in portage group
     84
     85# for FreeBSD
     86ln -sf /usr/local/bin/bash /bin/bash

  • trunk/tools/svn2build

    r977 r1043  
    99dname=`dirname $0`
    1010prem=`echo $dname |cut -c1`
    11 if [ ${prem} == "/" ]; then
     11if [ _${prem} = _"/" ]; then
    1212        export TOOLHOME=$dname
    1313else
    … …  
    9292        elif [ "$dtype" = "ebuild" ]; then
    9393            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
     94        elif [ "$dtype" = "tgz" ]; then
     95            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/slack-desc
     96        elif [ "$dtype" = "port" ]; then
     97            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/Makefile > $dest/distributions/${ddir}-$dver/Makefile
    9498        elif [ "$dtype" = "deb" ]; then
    9599            cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
    … …  
    121125            exit -1
    122126        fi
     127        cd ..
     128    fi
     129    if [ _"`echo $p | grep 'busybox'`" != _"" ]; then
     130        cd $dest
     131        mv Rules.mak Rules.mak.orig
     132        cat Rules.mak.orig | sed "s/^EXTRAVERSION\([\t ]*\):=/EXTRAVERSION\1:=-$tag-r$REVISION/" > Rules.mak
    123133        cd ..
    124134    fi

  • trunk/trac/trac.ini

    r794 r1043  
    1 [header_logo]
    2 src = http://www.mondorescue.org/images/trac-logo.png
    3 height = 120
    4 width = 350
    5 link = http://www.mondorescue.org
    6 alt = Mondo Rescue
     1[project]
     2name = MondoRescue
     3descr = GPL disaster recovery solution
     4footer = The <a href="http://www.mondorescue.org">Mondo Rescue</a> project is hosted <br>by the <a href="http://www.hpintelco.net">HP Intel Solution Center</a> on a <a href="http://www.mandriva.com">Mandriva</a> system.
     5url = http://trac.mondorescue.org
     6icon = /mondo/www/html/mondo/favicon.ico
    77
    88[logging]
    … …  
    2727always_notify_reporter = true
    2828
    29 [project]
    30 name = MondoRescue
    31 descr = GPL disaster recovery solution
    32 footer = The <a href="http://www.mondorescue.org">Mondo Rescue</a> project is hosted <br>by the <a href="http://www.hpintelco.net">HP Intel Solution Center</a> on a <a href="http://www.mandriva.com">Mandriva</a> system.
    33 url = http://www.mondorescue.org
    34 icon = /mondo/www/html/mondo/favicon.ico
     29[header_logo]
     30src = http://www.mondorescue.org/images/trac-logo.png
     31height = 120
     32width = 350
     33link = http://www.mondorescue.org
     34alt = Mondo Rescue
    3535
    3636[mimeviewer]
    … …  
    4444webadmin.* = enabled
    4545acct_mgr.web_ui.registrationmodule = enabled
    46 acct_mgr.web_ui.accountmodule = enabled
     46acct_mgr.web_ui.loginmodule = enabled
    4747acct_mgr.htfile.htdigeststore = enabled
    4848acct_mgr.api.accountmanager = enabled
    49 acct_mgr.web_ui.loginmodule = enabled
     49acct_mgr.web_ui.accountmodule = enabled
    5050acct_mgr.htfile.htpasswdstore = enabled
    5151acct_mgr.htfile.abstractpasswordfilestore = enabled
    … …  
    5656[account-manager]
    5757password_format = htpasswd
    58 password_file = /etc/trac.htpasswd
     58password_file = /usr/local/etc/trac.htpasswd
    5959
    6060[diff]
    … …  
    6262
    6363[ticket]
    64 default_version = 2.0.9
     64default_version = 2.2.0
    6565default_component = mondo
    6666default_milestone = 2.0.9
    6767default_severity = normal
    6868default_priority = normal
    69 

  • trunk/website/downloads.shtml

    r932 r1043  
    2424    <p>We are interested in up to date mirrors for both the Web and FTP sites. Please contact us on the <a href="/support.shtml">mailing list</a>.
    2525    <ul>
    26         <li><b>Europe</b>:
     26        <li><b>Americas</b></li>:
     27        <ul>
     28            <li><i>USA</i>:</li>
     29            <ul>
     30                <li>muskokamug.org :
     31                    <a href="http://mondorescue.muskokamug.org/">Web site</a>,
     32                    <ul>
     33                            <li>Update times: Every 3 hours</li>
     34                    </ul>
     35                </li>
     36            </ul>
     37        </ul>
     38        <li><b>Europe</b></li>:
    2739        <ul>
    2840            <li><i>France</i>:</li>

  • trunk/website/index.shtml

    r932 r1043  
    1010
    1111        <h1>Mondo Rescue Home Page</h1>
    12   <div class="h2-5">
    13           <h2>Latest news</h2>
    14   </div>
    15 <!--#include virtual="/latest-news.html" -->
    16   <p> For more news look <a href="/news.shtml">here</a></p>
    17 
    1812  <div class="h2-1">
    1913          <h2>What is Mondo Rescue ?</h2>
    … …  
    3428  <a href="mailto:hugo_at_mondorescue.org">Hugo Rabson</a>: Creator of Mondo Rescue. The Mondo Rescue <a href="http://oldwww.mondorescue.org">original Web site</a> made by Hugo is also still available. Note that the paypal icon there is for rewarding Hugo's work, but has nothing to do with the current development of Mondo Rescue.<br>
    3529  </p>
     30
     31  <div class="h2-5">
     32          <h2>Latest news</h2>
     33  </div>
     34<!--#include virtual="/latest-news.html" -->
     35  <p> For more news look <a href="/news.shtml">here</a></p>
    3636
    3737
Note: See TracChangeset for help on using the changeset viewer.