Changeset 241 in MondoRescue for branches

Timestamp:

Dec 20, 2005, 2:17:23 AM (18 years ago)

Author:

bcornec

Message:

• Fix bug in post for mindi (no chmod needed on symlinks) (Sébastien Aperghis-Tramoni)
• sles9 adaptations for mindi (DOCDIR) (Bruno Cornec)
• remove useless cat in init (Sébastien Aperghis-Tramoni)
• remove dependency on cdrecord for mondo RPMS (Bruno Cornec)

Location:

branches/2.05

Files:

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

branches/2.05/mindi/install.sh

@@ -30 +30 @@
 echo "mindi $MINDIVER will be installed under $local"
 
+# sles9 needs that
+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 ..."
@@ -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

branches/2.05/mindi/mindi.spec

@@ -78 +78 @@
 
 %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 !"

branches/2.05/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

branches/2.05/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