Changeset 448


Ignore:
Timestamp:
Mar 20, 2006, 10:24:29 PM (14 years ago)
Author:
bcornec
Message:

merge -r435:447 $SVN_M/branches/stable

Location:
trunk
Files:
8 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi

    r426 r448  
    6767FLOPPY_MODS="ide-floppy floppy"
    6868TAPE_MODS="ht st osst ide-tape ide_tape"
    69 SCSI_MODS="3c59x 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 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 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"
     69SCSI_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 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 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"
    7070
    7171# ide-probe-mod
     
    7474USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
    7575CDROM_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"
    76 NET_MODS="sunrpc nfs nfs_acl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32 vmxnet"
     76NET_MODS="sunrpc nfs nfs_acl lockd loop mii 3c59x e100 bcm5700 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 vmxnet"
    7777EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd"
    7878LOGFILE=/var/log/mindi.log
     
    13401340    partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | grep -w "$current_partition" | grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
    13411341    redhat_label=""
    1342     if [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
     1342    if [ "`echo "$current_partition" | fgrep -i "LABEL=SWAP"`" != "" ] ; then
     1343            redhat_label=`echo "$current_partition" | cut -d'=' -f2`
     1344            actual_dev="/dev/`echo "$redhat_label" | cut -d '-' -f2`"
     1345            current_partition=$actual_dev
     1346    elif [ "`echo "$current_partition" | fgrep -i "LABEL="`" != "" ] ; then
    13431347        str_to_find_fmt_with=$current_partition
    13441348        redhat_label=`echo "$current_partition" | cut -d'=' -f2`
  • trunk/mondo/distributions/rpm/mondo.spec

    r426 r448  
    1010%define src     SSS
    1111%define grp     GRP
    12 %define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
     12%define addreqb mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
    1313%define rel     %{mrel}
    1414
  • trunk/tools/livwww

    r422 r448  
    9999        DESTDIR=$MONDODIR
    100100    fi
     101    echo "Delivering to $DESTDIR on ${DESTMACH}"
    101102fi
    102103tar cfz /tmp/mondo-www.tgz .
    103 ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR}"
    104104scp /tmp/mondo-www.tgz ${DESTUSER}@${DESTMACH}:/tmp
    105105rm -f /tmp/mondo-www.tgz
    106 ssh ${DESTUSER}@${DESTMACH} "cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
     106ssh ${DESTUSER}@${DESTMACH} "rm -rf ${DESTDIR} ; mkdir ${DESTDIR} ; cd ${DESTDIR} ; tar xfz /tmp/mondo-www.tgz"
  • trunk/tools/mkdeliv

    r404 r448  
    88# BerliOS FTP/SSH setup
    99ACCOUNT=bruno@ftp.mondorescue.org
    10 DSTDIR=/
     10DSTDIR=/mondo/ftp
    1111FTPSERV="ftp.berlios.de"
    1212FTPDIR="/incoming"
  • trunk/tools/mkspec

    r394 r448  
    1212if [ -f ${dir}/../$ddir/spec.m4 ]; then
    1313    inc=${dir}/../$ddir/spec.m4
    14 elif [ -f ${dir}/../$ddmir/spec.m4 ]; then
    15     inc=${dir}/../$ddmir/spec.m4
     14elif [ -f ${dir}/../$dfam/spec.m4 ]; then
     15    inc=${dir}/../$dfam/spec.m4
    1616else
    1717    echo "Unable to build RPM for this distro. Please report to authors"
  • trunk/tools/rpm-env

    r394 r448  
    5757        export ddir="redhat"
    5858        dver=`awk '{print $5}' /etc/redhat-release`
     59        export dver=`echo ${dver} | sed "s/\.//"`
    5960        export suf=".rh${dver}"
    60         export dver=`echo ${dver} | sed "s/\.//"`
    6161    fi
    6262elif [ -e /etc/SuSE-release ]; then
  • trunk/website/about.shtml

    r397 r448  
    9090      <P ALIGN=CENTER>
    9191       <I>Michael Clark</I><BR>
    92        original DPF docs</P>
     92       original PDF docs</P>
    9393  <div class="h2-5">
    9494          <h2>The Mondo Rescue Community</h2>
  • trunk/website/mondorescue.org.conf

    r394 r448  
    22# Apache Virtual Host Configuration File
    33#
    4 NameVirtualHost *:80
     4NameVirtualHost *
    55
    6 <VirtualHost *:80>
     6<VirtualHost *>
    77    ServerName www.mondorescue.org
     8    #ServerAlias mondorescue.org
    89    ServerAdmin webmaster@mondorescue.org
    910    DocumentRoot /mondo/www/html/mondo
    1011    CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
    1112    Errorlog /var/log/httpd/www.mondorescue.org/error_log
     13    RewriteEngine On
     14    RewriteRule     ^/index\.html$  /index.shtml
     15    RewriteRule     ^/$  /index.shtml
    1216    <Directory "/mondo/www/html/mondo">
     17    DirectoryIndex index.shtml
    1318        Options -Indexes MultiViews FollowSymLinks +Includes
    1419        AllowOverride None
     
    1823</VirtualHost>
    1924
    20 <VirtualHost *:80>
     25<VirtualHost *>
     26    ServerName oldwww.mondorescue.org
     27    ServerAdmin webmaster@mondorescue.org
     28    DocumentRoot /mondo/www/html/oldwww
     29    CustomLog /var/log/httpd/oldwww.mondorescue.org/access_log combined
     30    Errorlog /var/log/httpd/oldwww.mondorescue.org/error_log
     31    <Directory "/mondo/www/html/oldwww">
     32        Options -Indexes MultiViews FollowSymLinks +Includes
     33        AllowOverride None
     34        Order allow,deny
     35        Allow from all
     36    </Directory>
     37</VirtualHost>
     38
     39<VirtualHost *>
    2140    ServerName www1.mondorescue.org
    2241    ServerAdmin webmaster@mondorescue.org
     
    3150    </Directory>
    3251</VirtualHost>
     52
     53<VirtualHost *>
     54    ServerName www.mondorescue.com
     55    ServerAdmin webmaster@mondorescue.com
     56    DocumentRoot /mondo/www/html/mondo
     57    CustomLog /var/log/httpd/www.mondorescue.com/access_log combined
     58    Errorlog /var/log/httpd/www.mondorescue.com/error_log
     59    <Directory "/mondo/www/html/mondo">
     60    DirectoryIndex index.shtml
     61        Options -Indexes MultiViews FollowSymLinks +Includes
     62        AllowOverride None
     63        Order allow,deny
     64        Allow from all
     65    </Directory>
     66</VirtualHost>
Note: See TracChangeset for help on using the changeset viewer.