Merge "Revert "Temporary fix for PXE booting from the wrong NIC""

[fuel.git] / build / install / install.sh

diff --git a/build/install/install.sh b/build/install/install.sh
index 6155a41..c632419 100755 (executable)
--- a/build/install/install.sh
+++ b/build/install/install.sh
@@ -172,7 +172,7 @@ make_live() {
 prep_make_iso() {
     DEST=$TOP/newiso
     REPO=$DEST/ubuntu
-    echo "Making ISO..."
+    echo "Preparing ISO..."
     echo "Unpack of old ISO..."
     if [ -d newiso ]; then
         chmod -R 755 newiso
@@ -201,6 +201,7 @@ make_iso_image() {
         -no-emul-boot \
         -boot-load-size 4 -boot-info-table \
         --hide-rr-moved \
+        --joliet-long \
         -x "lost+found" -o $NEWISO .
 
     isoinfo -d -i $NEWISO
@@ -464,7 +465,7 @@ if [ $MODE = "iso" ]; then
     TMP_ISOPUPPET=`mktemp -d /tmp/XXXXXXX`
     ORIGISO=$2
     NEWISO=$3
-    VOLUMEID="$4 $5"
+    VOLUMEID="$4_$5"
     REPORTFILE="${NEWISO}.txt"
     echo "Opening reportfile at $REPORTFILE"
     touch $REPORTFILE