← Back to branch summary

~vcs-imports/debian-cd/trunk

« back to all changes in this revision

Viewing changes to tools/boot/squeeze/boot-x86

  • Committer: 93sam
  • Date: 2013-04-19 14:52:21 UTC
  • Revision ID: svn-v4:c860693b-58d1-0310-82f9-f716279a4817:trunk:2544
Add further support for missing win32-loader.ini. Closes: #705594

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/boot/squeeze/boot-x86
285
285
                sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
286
286
        done
287
287
 
288
 
        # Modify win32-loader.ini to also cover the "other" arch
289
 
        if [ "$ARCH" = i386 ]; then
290
 
                sed -i -e "/^arch=/d
291
 
                                   /^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
292
 
                                       boot$N/win32-loader.ini
293
 
        else
294
 
                sed -i -e "/^arch=/d
295
 
                                   /^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
296
 
                                       boot$N/win32-loader.ini
 
288
        if [ -e boot$N/win32-loader.ini ]; then
 
289
                # Modify win32-loader.ini to also cover the "other" arch
 
290
                if [ "$ARCH" = i386 ]; then
 
291
                        sed -i -e "/^arch=/d
 
292
                                           /^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
 
293
                                               boot$N/win32-loader.ini
 
294
                else
 
295
                        sed -i -e "/^arch=/d
 
296
                                           /^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
 
297
                                               boot$N/win32-loader.ini
 
298
                fi
297
299
        fi
298
300
 
299
301
        # Apply workaround for #505243