Changeset 244 in MondoRescue

Timestamp:

Dec 20, 2005, 10:38:54 AM (18 years ago)

Author:

bcornec

Message:

merge -r239:243 $SVN_M/branches/2.05

Location:

trunk

Files:

• mindi/install.sh (modified) (4 diffs)
• mindi/mindi (modified) (3 diffs)
• mindi/mindi.spec (modified) (4 diffs)
• mindi/rootfs/sbin/init (modified) (9 diffs)
• mondo/mondo.spec (modified) (1 diff)

trunk/mindi/install.sh

@@ -28 +28 @@
 
 MINDIVER=`cat VERSION`
-echo "mindi $MINDIVER will be installed under $local"
+MINDIREV=`cat REVISION`
+echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
+
+if [ "_$DOCDIR" = "_" ]; then
+    DOCDIR=$local/share/doc/mindi-$MINDIVER
+fi
 
 echo "Creating target directories ..."
-install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $local/share/doc/mindi-$MINDIVER
+install -m 755 -d $conf $local/lib/mindi $local/share/man/man8 $local/sbin $DOCDIR
 
 echo "Copying files ..."
@@ -43 +48 @@
 
 if [ "$RPMBUILDMINDI" = "true" ]; then
-    sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=/usr~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=/etc/mindi~" mindi > $local/sbin/mindi
+    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
 else
-    sed -e "s~^MINDI_PREFIX=XXX~MINDI_PREFIX=$local~" -e "s~^MINDI_CONF=YYY~MINDI_CONF=$conf~" mindi > $local/sbin/mindi
+    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
 fi
 chmod 755 $local/sbin/mindi
@@ -51 +56 @@
 
 install -m 644 mindi.8 $local/share/man/man8
-install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $local/share/doc/mindi-$MINDIVER
+install -m 644 CHANGES COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
 
 ARCH=`/bin/arch`
@@ -98 +103 @@
 
 if [ "$RPMBUILDMINDI" != "true" ]; then
-    chown -R root:root $local/lib/mindi $conf/mindi $conf $local/share/doc/mindi-$MINDIVER
+    chown -R root:root $local/lib/mindi $conf/mindi $conf $DOCDIR
     chown root:root $local/sbin/mindi $local/share/man/man8/mindi.8 $local/sbin/analyze-my-lvm $local/sbin/parted2fdisk.pl 
     if [ "$ARCH" = "ia64" ] ; then

trunk/mindi/mindi

@@ -26 +26 @@
     # run this command.
 
-MINDI_REV=`echo '$Rev$' | awk '{print $2}'`
-MINDI_VER=`cat VERSION`
+MINDI_REV=RRR
+MINDI_VER=VVV
 
 MINDI_VERSION=${MINDI_VER}-r$MINDI_REV
@@ -59 +59 @@
 FLOPPY_MODS="ide-floppy floppy"
 TAPE_MODS="ht st osst ide-tape ide_tape"
-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"
+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"
 
 # ide-probe-mod
@@ -66 +66 @@
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd usbkbd"
 CDROM_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"
-NET_MODS="sunrpc nfs nfsacl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32"
+NET_MODS="sunrpc nfs nfsacl lockd loop mii e100 bcm5700 e1000 eepro100 tg3 pcnet32 vmxnet"
 EXTRA_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"
 LOGFILE=/var/log/mindi.log

trunk/mindi/mindi.spec

@@ -11 +11 @@
 %define version VVV
 %define mrel    1
+%define docname     %{name}-%{version}
+%define src     %{name}-%{version}.tgz
 
 %if %is_redhat
-%define src     %{name}-%{version}.tgz
 Group:          Applications/Archiving
 Autoreq:    0
@@ -31 +32 @@
 
 %if %is_suse
-%define src     %{name}-%{version}.tgz
 Group:          Archiving/Backup
+%define docname     %{name}
 %endif
 
@@ -71 +72 @@
 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
 export RPMBUILDMINDI="true"
+export DOCDIR=${RPM_BUILD_ROOT}${RPM_DOC_DIR}/%{docname}
 
 ./install.sh
@@ -78 +80 @@
 
 %post
-%{__chmod} 755 %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/*
+for i in %{_libdir}/mindi/aux-tools/sbin/* %{_libdir}/mindi/rootfs/bin/* %{_libdir}/mindi/rootfs/sbin/* ; do
+    if [ ! -h $i ]; then
+        %{__chmod} 755 $i
+    fi
+done
 if [ -f /usr/local/sbin/mindi ]; then
     echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"

trunk/mindi/rootfs/sbin/init

@@ -256 +256 @@
     cd $GROOVY
     [ "$1" != "" ] && tapedev=$1
-    [ ! "$tapedev" ] && tapedev=`cat /tmp/mondo-restore.cfg | grep media-dev | tr -s ' ' ' ' | cut -d' ' -f2`
+    [ ! "$tapedev" ] && tapedev=`grep media-dev /tmp/mondo-restore.cfg | tr -s ' ' ' ' | cut -d' ' -f2`
 #    tar -zxf $tapedev
     dd if=$tapedev bs=32k count=1024 | tar -zx
     res=$?
     if [ "$res" -eq "0" ] ; then
-    cat /tmp/mondo-restore.cfg | grep -v media-dev > /tmp/mr.cfg
+    grep -v media-dev /tmp/mondo-restore.cfg > /tmp/mr.cfg
     echo "media-dev $tapedev" >> /tmp/mr.cfg
         cp -f /tmp/mr.cfg /tmp/mondo-restore.cfg
@@ -442 +442 @@
         vgscan
     fi
-        cat /tmp/i-want-my-lvm | grep -E "^#.*vgchange" | sed s/#// > /tmp/start-lvm
+        grep -E "^#.*vgchange" /tmp/i-want-my-lvm | sed s/#// > /tmp/start-lvm
         chmod +x /tmp/start-lvm
         echo -en "Starting LVM's..."
@@ -476 +476 @@
 StartRaids() {
     local raid_devices i
-    raid_devices=`cat /tmp/mountlist.txt | grep /dev/md | cut -d' ' -f1`
+    raid_devices=`grep /dev/md /tmp/mountlist.txt | cut -d' ' -f1`
     for i in $raid_devices ; do
-        if cat /proc/mdstat | grep `basename $i` > /dev/null 2> /dev/null ; then
+        if grep `basename $i` /proc/mdstat > /dev/null 2> /dev/null ; then
             LogIt "$i is started already; no need to run 'raidstart $i'" 1
         else
@@ -503 +503 @@
     local res
     mount | grep /mnt/cdrom && return 0
-    [ "`cat /tmp/mondo-restore.cfg | grep "backup_media_type" | grep "cdstream"`" ] && return
+    [ "`grep "backup_media_type" /tmp/mondo-restore.cfg | grep "cdstream"`" ] && return
     LogIt "Trying to mount CD-ROM a 2nd time..."
     find-and-mount-cdrom --second-try
@@ -626 +626 @@
 else
     if [ -e "/sbin/start-nfs" ]; then
-        if [ "`cat /proc/cmdline | grep -i pxe`" ]; then
+        if [ "`grep -i pxe /proc/cmdline`" ]; then
             LogIt "PXE boot found"
         fi
@@ -633 +633 @@
             imgname="mondorescue"
         fi
-        if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
+        if [ "`grep -i prefix /proc/cmdline`" ] ; then
             for i in `cat /proc/cmdline` ; do
                 if [ "`echo $i | grep -i prefix`" ] ; then
@@ -678 +678 @@
 sleep 2
 #clear
-if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`cat /tmp/mountlist.txt | grep /dev/md/`" != "" ] ; then
+if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`grep /dev/md/ /tmp/mountlist.txt`" != "" ] ; then
     LogIt "Creating /dev/md/* softlinks just in case." 1
     mkdir -p /dev/md
@@ -690 +690 @@
 [ -e "/tmp/mountlist.txt" ] && cp -f /tmp/mountlist.txt /tmp/mountlist.original
 
-if ! [ "`cat /proc/cmdline | grep -i "pxe"`" ] ; then
+if ! [ "`grep -i "pxe" /proc/cmdline`" ] ; then
     res="`cat /mnt/cdrom/archives/THIS-CD-NUMBER 2> /dev/null`"
     [ "$res" != "1" ] && [ "$res" != "" ] && Die "This is CD #$res in the series. Please insert CD #1."
@@ -705 +705 @@
 
 lsmod > /tmp/ramdisk-lsmod.txt 2> /dev/null
-cat /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | cut -d' ' -f1 | sort | uniq -d > /tmp/missing-modules.txt
+cut -d' ' -f1 /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | sort | uniq -d > /tmp/missing-modules.txt
 echo "Warning - these modules did not make it onto the ramdisk" >> $LOGFILE
 cat /tmp/missing-modules.txt >> $LOGFILE

trunk/mondo/mondo.spec

@@ -51 +51 @@
 Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
 %else
-Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, cdrecord, buffer
+Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, buffer
 %endif