Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Applied patch from Robert Millan <rmh@aybabtu.com> to integrate 

win32-loader. Closes: #440220.
This commit is contained in:
Otavio Salvador 2007-09-10 17:47:16 +00:00
parent 12d15c1a2a
commit fbdb7b30fd
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,8 +1,13 @@
debian-cd (3.0.4) UNRELEASED; urgency=low
[ Frans Pop ]
* Disable debugging output in boot scripts.
-- Frans Pop <fjp@debian.org> Sun, 02 Sep 2007 19:17:38 +0200
[ Otavio Salvador ]
* Applied patch from Robert Millan <rmh@aybabtu.com> to integrate
win32-loader. Closes: #440220.
-- Otavio Salvador <otavio@ossystems.com.br> Mon, 10 Sep 2007 13:43:04 -0300
debian-cd (3.0.3) unstable; urgency=low

14
tools/boot/lenny/boot-x86
View File

@ -55,10 +55,13 @@ KTYPE[10]=""
THISTYPE=${KTYPE[$NN]}
INSTALLDIR_i386="install.386"
INSTALLDIR_amd64="install.amd"
if [ "$ARCH" = i386 ]; then
INSTALLDIR="install.386"
INSTALLDIR="$INSTALLDIR_i386"
else
INSTALLDIR="install.amd"
INSTALLDIR="$INSTALLDIR_amd64"
fi
BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
@ -168,6 +171,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
mkdir -p boot$N/$ISOLINUXDIR
# Isolinux setup including config and help files comes from d-i.
cat cdrom/debian-cd_info.tar.gz | (cd boot$N/$ISOLINUXDIR/; tar zx)
# Not everything in the tarball is isolinux stuff
mv boot$N/$ISOLINUXDIR/{g2ldr*,setup.exe,win32-loader.ini} boot$N/
if [ -e boot$N/$ISOLINUXDIR/f3.txt.withgtk ]; then
extra_image gtk/initrd.gz
mv boot$N/$ISOLINUXDIR/f3.txt.withgtk boot$N/$ISOLINUXDIR/f3.txt
@ -178,6 +183,8 @@ if [ "$THISTYPE" = "isolinux" ]; then
sed -i "s|/install/|/$INSTALLDIR/|" boot$N/$ISOLINUXDIR/isolinux.cfg
sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini
cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/$ISOLINUXDIR/
if [ -n "$KERNEL_PARAMS" ]; then
@ -207,6 +214,9 @@ if [ "$THISTYPE" = "isolinux" ]; then
/[Kk][Ee][Rr][Nn][Ee][Ll]/ { print $0 }
/[Aa][Pp][Pp][Ee][Nn][Dd]/ { print $0 }' >> boot$N/isolinux/isolinux.cfg
sed -i -e "/^arch=/d ; /^i386\//p; s/^i386\//amd64\//; s/=$INSTALLDIR_i386\//=$INSTALLDIR_amd64\//g" \
boot$N/win32-loader.ini
else
if [ "$ARCH" = amd64 ]; then
mkdir -p boot$N/isolinux