[Fai-commit] r3079 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-21 21:02:36 +0000 (Mon, 21 Nov 2005)
New Revision: 3079

Modified:
   trunk/bin/make-fai-bootfloppy
   trunk/debian/changelog
Log:
fix code for -i when using a relative path (closes: #314551)


Modified: trunk/bin/make-fai-bootfloppy
===================================================================
--- trunk/bin/make-fai-bootfloppy	2005-11-21 20:41:20 UTC (rev 3078)
+++ trunk/bin/make-fai-bootfloppy	2005-11-21 21:02:36 UTC (rev 3079)
@@ -27,7 +27,7 @@
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 2.5.6, 22-april-2005"
+version="Version 2.5.7, 21-november-2005"
 set -e
 timeout=15
 mkimage=0
@@ -261,18 +261,16 @@
 	exit 5
     }
     echo "Creating the iso9660 cd image in $cddev from floppy image $floppydev."
-    cd /tmp
-    TMPDIR=`mktemp -d`
-    cd $TMPDIR || exit 7
-
+    TMPDIR=`mktemp -d` || exit 7
     mkdir $TMPDIR/boot
-    cp $floppydev ./boot/boot.img
+    cp $floppydev $TMPDIR/boot/boot.img
+    cd $TMPDIR
     mkisofs -V "FAI boot CDROM" -b boot/boot.img -c boot/boot.catalog -o bootcd.iso .
-    rm -rf $TMPDIR/boot
-
+    cd -
     mv $TMPDIR/bootcd.iso $cddev
     echo "ISO-Image created in $cddev"
 
+    rm -rf $TMPDIR/boot
     rmdir $TMPDIR
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-21 20:41:20 UTC (rev 3078)
+++ trunk/debian/changelog	2005-11-21 21:02:36 UTC (rev 3079)
@@ -26,8 +26,10 @@
   * make-fai-nfsroot: use --one-file-system instead of -l (closes: #308806),
     new test if ssh package is installed (closes: #322759) 
   * subroutines: test if hooks are executable (closes: #338524)
+  * make-fai-bootfloppy: fix code for -i when using a relative path
+    (closes: #314551)
   
- -- Thomas Lange <lange at debian.org>  Mon, 21 Nov 2005 21:39:11 +0100
+ -- Thomas Lange <lange at debian.org>  Mon, 21 Nov 2005 22:01:58 +0100
 
 fai (2.8.4) unstable; urgency=high