Add further support for missing win32-loader.ini. Closes: #705594
This commit is contained in:
parent
417d8fd591
commit
708240f580
|
@ -4,6 +4,7 @@ debian-cd (3.1.13) UNRELEASED; urgency=low
|
|||
* Use ARCHIVE_KEYRING_PACKAGE and ARCHIVE_KEYRING_FILE parameters to
|
||||
not hardcode debian-archive-keyring and let derivatives use their
|
||||
own keyring.
|
||||
* Add further support for missing win32-loader.ini. Closes: #705594
|
||||
|
||||
-- Raphaël Hertzog <hertzog@debian.org> Fri, 12 Apr 2013 10:32:56 +0200
|
||||
|
||||
|
|
|
@ -285,15 +285,17 @@ else
|
|||
sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
|
||||
done
|
||||
|
||||
# Modify win32-loader.ini to also cover the "other" arch
|
||||
if [ "$ARCH" = i386 ]; then
|
||||
sed -i -e "/^arch=/d
|
||||
/^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
|
||||
boot$N/win32-loader.ini
|
||||
else
|
||||
sed -i -e "/^arch=/d
|
||||
/^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
|
||||
boot$N/win32-loader.ini
|
||||
if [ -e boot$N/win32-loader.ini ]; then
|
||||
# Modify win32-loader.ini to also cover the "other" arch
|
||||
if [ "$ARCH" = i386 ]; then
|
||||
sed -i -e "/^arch=/d
|
||||
/^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
|
||||
boot$N/win32-loader.ini
|
||||
else
|
||||
sed -i -e "/^arch=/d
|
||||
/^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
|
||||
boot$N/win32-loader.ini
|
||||
fi
|
||||
fi
|
||||
|
||||
# Apply workaround for #505243
|
||||
|
|
|
@ -300,15 +300,17 @@ else
|
|||
sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
|
||||
done
|
||||
|
||||
# Modify win32-loader.ini to also cover the "other" arch
|
||||
if [ "$ARCH" = i386 ]; then
|
||||
sed -i -e "/^arch=/d
|
||||
/^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
|
||||
boot$N/win32-loader.ini
|
||||
else
|
||||
sed -i -e "/^arch=/d
|
||||
/^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
|
||||
boot$N/win32-loader.ini
|
||||
if [ -e boot$N/win32-loader.ini ]; then
|
||||
# Modify win32-loader.ini to also cover the "other" arch
|
||||
if [ "$ARCH" = i386 ]; then
|
||||
sed -i -e "/^arch=/d
|
||||
/^i386\//p; s/^i386/amd64/; s/=$INSTALLDIR_i386/=$INSTALLDIR_amd64/g" \
|
||||
boot$N/win32-loader.ini
|
||||
else
|
||||
sed -i -e "/^arch=/d
|
||||
/^amd64\//p; s/^amd64/i386/; s/=$INSTALLDIR_amd64/=$INSTALLDIR_i386/g" \
|
||||
boot$N/win32-loader.ini
|
||||
fi
|
||||
fi
|
||||
|
||||
# Apply workaround for #505243
|
||||
|
|
Loading…
Reference in New Issue