Changeset 591 in MondoRescue

Timestamp:

May 29, 2006, 1:15:35 PM (18 years ago)

Author:

bcornec

Message:

merge -r588:590 $SVN_M/branches/stable

Location:

branches/2.0.8/tools

Files:

• build2qemu (modified) (1 diff)
• distro-env (modified) (2 diffs)
• file2ftp (copied) (copied from branches/stable/tools/file2ftp )
• ftp-env (copied) (copied from branches/stable/tools/ftp-env )
• mkdeliv (deleted)
• pkg2ftp (copied) (copied from branches/stable/tools/pkg2ftp )

branches/2.0.8/tools/build2qemu

@@ -53 +53 @@
 
 $TOOLHOME/build2pkg $LAST
-#$TOOLHOME/mkdeliv
+$TOOLHOME/pkg2ftp
 EOF
 chmod 755 $TMP/mkmondo
 
+$TOOLHOME/files2ftp
 cd $TOOLHOME/..
 tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG

branches/2.0.8/tools/distro-env

@@ -29 +29 @@
         else
             export ddir="redhat"
-            export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
+            export dver=`awk '{print $5}' /etc/redhat-release`
         fi
     elif [ -e /etc/SuSE-release ]; then
@@ -37 +37 @@
             export dver=`head -1 /etc/SuSE-release | awk '{print $5}'`
         else
-                            export ddir="suse"
+            export ddir="suse"
             export dver=`head -1 /etc/SuSE-release | awk '{print $3}'`
         fi