Changeset 244 for trunk


Ignore:
Timestamp:
Dec 20, 2005, 10:38:54 AM (13 years ago)
Author:
bcornec
Message:

merge -r239:243 $SVN_M/branches/2.05

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/install.sh

    r238 r244  
    2828
    2929MINDIVER=`cat VERSION`
    30 echo "mindi $MINDIVER will be installed under $local"
     30MINDIREV=`cat REVISION`
     31echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
     32
     33if [ "_$DOCDIR" = "_" ]; then
     34    DOCDIR=$local/share/doc/mindi-$MINDIVER
     35fi
    3136
    3237echo "Creating target directories ..."
    33 install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $local/share/doc/mindi-$MINDIVER
     38install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $DOCDIR
    3439
    3540echo "Copying files ..."
     
    4348
    4449if [ "$RPMBUILDMINDI" = "true" ]; then
    45     sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=/usr~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=/etc/mindi~" mindi > $local/sbin/mindi
     50    sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=/usr~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=/etc/mindi~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" mindi > $local/sbin/mindi
    4651else
    47     sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$local~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$conf~" mindi > $local/sbin/mindi
     52    sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$local~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$conf~" -e "s~^MINDI_VER=VVV~MINDI_VER=$MINDIVER~" -e "s~^MINDI_REV=RRR~MINDI_REV=$MINDIREV~" mindi > $local/sbin/mindi
    4853fi
    4954chmod 755 $local/sbin/mindi
     
    5156
    5257install -m 644 mindi.8 $local/share/man/man8
    53 install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $local/share/doc/mindi-$MINDIVER
     58install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
    5459
    5560ARCH=`/bin/arch`
     
    98103
    99104if [ "$RPMBUILDMINDI" != "true" ]; then
    100     chown -R root:root $local/lib/mindi $conf/mindi $conf $local/share/doc/mindi-$MINDIVER
     105    chown -R root:root $local/lib/mindi $conf/mindi $conf $DOCDIR
    101106    chown root:root $local/sbin/mindi $local/share/man/man8/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl
    102107    if [ "$ARCH" = "ia64" ] ; then
  • trunk/mindi/mindi

    r238 r244  
    2626    # run this command.
    2727
    28 MINDI_REV=`echo '$Rev$' | awk '{print $2}'`
    29 MINDI_VER=`cat VERSION`
     28MINDI_REV=RRR
     29MINDI_VER=VVV
    3030
    3131MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
     
    5959FLOPPY_MODS="ide-floppy floppy"
    6060TAPE_MODS="ht st osst ide-tape ide_tape"
    61 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"
     61SCSI_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"
    6262
    6363# ide-probe-mod
     
    6666USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
    6767CDROM_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"
    68 NET_MODS="sunrpc nfs nfsacl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32"
     68NET_MODS="sunrpc nfs nfsacl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32 vmxnet"
    6969EXTRA_MODS="$CDROM_MODS vfat fat loop linear raid0 raid1 raid5 lvm-mod dm-mod jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfsd lockd sunrpc jbd"
    7070LOGFILE=/var/log/mindi.log
  • trunk/mindi/mindi.spec

    r238 r244  
    1111%define version VVV
    1212%define mrel    1
     13%define docname     %{name}-%{version}
     14%define src     %{name}-%{version}.tgz
    1315
    1416%if %is_redhat
    15 %define src     %{name}-%{version}.tgz
    1617Group:          Applications/Archiving
    1718Autoreq:    0
     
    3132
    3233%if %is_suse
    33 %define src     %{name}-%{version}.tgz
    3434Group:          Archiving/Backup
     35%define docname     %{name}
    3536%endif
    3637
     
    7172export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
    7273export RPMBUILDMINDI="true"
     74export DOCDIR=${RPM_BUILD_ROOT}${RPM_DOC_DIR}/%{docname}
    7375
    7476./install.sh
     
    7880
    7981%post
    80 %{__chmod} 755 %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/*
     82for i in %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/* ; do
     83    if [ ! -h $i ]; then
     84        %{__chmod} 755 $i
     85    fi
     86done
    8187if [ -f /usr/local/sbin/mindi ]; then
    8288    echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
  • trunk/mindi/rootfs/sbin/init

    r236 r244  
    256256    cd $GROOVY
    257257    [ "$1" != "" ] && tapedev=$1
    258     [ ! "$tapedev" ] && tapedev=`cat /tmp/mondo-restore.cfg | grep media-dev | tr -s ' ' ' ' | cut -d' ' -f2`
     258    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
    259259#    tar -zxf $tapedev
    260260    dd if=$tapedev bs=32k count=1024 | tar -zx
    261261    res=$?
    262262    if [ "$res" -eq "0" ] ; then
    263     cat /tmp/mondo-restore.cfg | grep -v media-dev > /tmp/mr.cfg
     263    grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
    264264    echo "media-dev $tapedev" >> /tmp/mr.cfg
    265265        cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
     
    442442        vgscan
    443443    fi
    444         cat /tmp/i-want-my-lvm | grep -E "^#.*vgchange" | sed s/#// > /tmp/start-lvm
     444        grep -E "^#.*vgchange" /tmp/i-want-my-lvm | sed s/#// > /tmp/start-lvm
    445445        chmod +x /tmp/start-lvm
    446446        echo -en "Starting LVM's..."
     
    476476StartRaids() {
    477477    local raid_devices i
    478     raid_devices=`cat /tmp/mountlist.txt | grep /dev/md | cut -d' ' -f1`
     478    raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
    479479    for i in $raid_devices ; do
    480         if cat /proc/mdstat | grep `basename $i` > /dev/null 2> /dev/null ; then
     480        if grep `basename $i` /proc/mdstat > /dev/null 2> /dev/null ; then
    481481            LogIt "$i is started already; no need to run 'raidstart $i'" 1
    482482        else
     
    503503    local res
    504504    mount | grep /mnt/cdrom && return 0
    505     [ "`cat /tmp/mondo-restore.cfg | grep "backup_media_type" | grep "cdstream"`" ] && return
     505    [ "`grep "backup_media_type" /tmp/mondo-restore.cfg | grep "cdstream"`" ] && return
    506506    LogIt "Trying to mount CD-ROM a 2nd time..."
    507507    find-and-mount-cdrom --second-try
     
    626626else
    627627    if [ -e "/sbin/start-nfs" ]; then
    628         if [ "`cat /proc/cmdline | grep -i pxe`" ]; then
     628        if [ "`grep -i pxe /proc/cmdline`" ]; then
    629629            LogIt "PXE boot found"
    630630        fi
     
    633633            imgname="mondorescue"
    634634        fi
    635         if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
     635        if [ "`grep -i prefix /proc/cmdline`" ] ; then
    636636            for i in `cat /proc/cmdline` ; do
    637637                if [ "`echo $i | grep -i prefix`" ] ; then
     
    678678sleep 2
    679679#clear
    680 if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`cat /tmp/mountlist.txt | grep /dev/md/`" != "" ] ; then
     680if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`grep /dev/md/ /tmp/mountlist.txt`" != "" ] ; then
    681681    LogIt "Creating /dev/md/* softlinks just in case." 1
    682682    mkdir -p /dev/md
     
    690690[ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
    691691
    692 if ! [ "`cat /proc/cmdline | grep -i "pxe"`" ] ; then
     692if ! [ "`grep -i "pxe" /proc/cmdline`" ] ; then
    693693    res="`cat /mnt/cdrom/archives/THIS-CD-NUMBER 2> /dev/null`"
    694694    [ "$res" != "1" ] && [ "$res" != "" ] && Die "This is CD #$res in the series. Please insert CD #1."
     
    705705
    706706lsmod > /tmp/ramdisk-lsmod.txt 2> /dev/null
    707 cat /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | cut -d' ' -f1 | sort | uniq -d > /tmp/missing-modules.txt
     707cut -d' ' -f1 /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | sort | uniq -d > /tmp/missing-modules.txt
    708708echo "Warning - these modules did not make it onto the ramdisk" >> $LOGFILE
    709709cat /tmp/missing-modules.txt >> $LOGFILE
  • trunk/mondo/mondo.spec

    r238 r244  
    5151Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
    5252%else
    53 Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
     53Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, buffer
    5454%endif
    5555
Note: See TracChangeset for help on using the changeset viewer.