|
diff -uNrp anaconda-10.1.1.63.orig/scripts/mk-images anaconda-10.1.1.63/scripts/mk-images |
|
|
--- anaconda-10.1.1.63.orig/scripts/mk-images 2007-05-06 08:14:01.000000000 -0500 |
|
|
+++ anaconda-10.1.1.63/scripts/mk-images 2007-05-06 09:06:50.000000000 -0500 |
|
|
@@ -1099,20 +1099,28 @@ arches="$BUILDARCH" |
|
|
if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then |
|
|
arches="ppc64pseries ppc64 ppc64iseries ppc" |
|
|
elif [ "$BUILDARCH" = "i386" ]; then |
|
|
- arches="i586" |
|
|
- kerneltags="kernel kernel-xenU" |
|
|
+ arches="i686 i586" |
|
|
elif [ "$BUILDARCH" = "x86_64" ]; then |
|
|
kerneltags="kernel kernel-xenU" |
|
|
fi |
|
|
foundakernel="" |
|
|
for KERNELARCH in $arches; do |
|
|
+ |
|
|
+ # allow kernel only for i586 and kernel, kernel-xenU for i686 |
|
|
+ if [ "$KERNELARCH" = "i586" ]; then |
|
|
+ kerneltags="kernel" |
|
|
+ fi |
|
|
+ if [ "$KERNELARCH" = "i686" ]; then |
|
|
+ kerneltags="kernel kernel-xenU" |
|
|
+ fi |
|
|
+ |
|
|
for kernelvers in $kerneltags; do |
|
|
- kpackage=$($LATEST $KERNELPATH $kernelvers) |
|
|
- if [ "$KERNELARCH" = "i586" -a ! -f "$kpackage" ]; then |
|
|
- echo "No i586 kernel, trying i686..." |
|
|
- KERNELARCH="i686" |
|
|
- kpackage=$($LATEST $KERNELPATH kernel) |
|
|
+ if [ "$KERNELARCH" = "i586" ]; then |
|
|
+ kernelvers="kernel" |
|
|
+ kerneltags="kernel" |
|
|
+ kerneltag="" |
|
|
fi |
|
|
+ kpackage=$($LATEST $KERNELPATH $kernelvers) |
|
|
|
|
|
if [ ! -f "$kpackage" ]; then |
|
|
echo "kernel ($kernelvers) does not exist for $KERNELARCH. skipping" |
|
|
diff -uNrp anaconda-10.1.1.63.orig/scripts/mk-images.i386 anaconda-10.1.1.63/scripts/mk-images.i386 |
|
|
--- anaconda-10.1.1.63.orig/scripts/mk-images.i386 2006-11-20 15:30:15.000000000 -0600 |
|
|
+++ anaconda-10.1.1.63/scripts/mk-images.i386 2007-05-06 09:06:13.000000000 -0500 |
|
|
@@ -22,11 +22,16 @@ prepareBootImage() { |
|
|
# used to populate a boot image |
|
|
prepareBootTree() { |
|
|
(cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE) |
|
|
- |
|
|
- cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img |
|
|
- cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz |
|
|
|
|
|
- pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss |
|
|
+ if [ "$KERNELARCH" = "i586" ]; then |
|
|
+ cp $MBD_FSIMAGE $MBD_BOOTTREE/init${KERNELARCH}.img |
|
|
+ cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlz${KERNELARCH} |
|
|
+ else |
|
|
+ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img |
|
|
+ cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz |
|
|
+ fi |
|
|
+ |
|
|
+ pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#3399FF=2 > $BOOTDISKDIR/splash.lss |
|
|
if [ $? != 0 ]; then |
|
|
echo $0: Failed to create splash.lss |
|
|
exit 1 |
|
|
@@ -155,6 +160,12 @@ makeBootImages() { |
|
|
rm -f $TOPDESTPATH/images/pxeboot/* |
|
|
ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz |
|
|
ln $TOPDESTPATH/isolinux/initrd.img $TOPDESTPATH/images/pxeboot/initrd.img |
|
|
+ if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then |
|
|
+ ln $TOPDESTPATH/isolinux/vmlzi586 $TOPDESTPATH/images/pxeboot/vmlzi586 |
|
|
+ fi |
|
|
+ if [ -f $TOPDESTPATH/isolinux/initi586.img ]; then |
|
|
+ ln $TOPDESTPATH/isolinux/initi586.img $TOPDESTPATH/images/pxeboot/initi586.img |
|
|
+ fi |
|
|
|
|
|
# links for the autoboot bits |
|
|
if [ -f $TOPDESTPATH/dosutils/loadlin.exe ]; then |
|
|
@@ -173,7 +184,7 @@ makeBootImages() { |
|
|
|
|
|
# now make a boot pendrive image |
|
|
mkdir -p $TOPDESTPATH/images/fobpath |
|
|
- dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=6 2>/dev/null |
|
|
+ dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=12 2>/dev/null |
|
|
mkdosfs $TOPDESTPATH/images/diskboot.img |
|
|
$SYSLINUX $TOPDESTPATH/images/diskboot.img |
|
|
mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath |
|
|
@@ -183,7 +194,20 @@ makeBootImages() { |
|
|
umount -f $TOPDESTPATH/images/fobpath |
|
|
rmdir $TOPDESTPATH/images/fobpath |
|
|
|
|
|
- cat > $TOPDESTPATH/images/pxeboot/README <<EOF |
|
|
+ if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then |
|
|
+ cat > $TOPDESTPATH/images/pxeboot/README <<EOF |
|
|
+The files in this directory are useful for booting a machine via PXE. |
|
|
+ |
|
|
+The following files are available: |
|
|
+vmlinuz - the BOOT kernel used for the i686 installer |
|
|
+initrd.img - an initrd with support for all install methods and |
|
|
+ drivers supported for installation of $PRODUCT i686 |
|
|
+vmlzi586 - the BOOT kernel used for the i586 installer |
|
|
+initi586.img - an initrd with support for all install methods and |
|
|
+ drivers supported for installation of $PRODUCT i586 |
|
|
+EOF |
|
|
+ else |
|
|
+ cat > $TOPDESTPATH/images/pxeboot/README <<EOF |
|
|
The files in this directory are useful for booting a machine via PXE. |
|
|
|
|
|
The following files are available: |
|
|
@@ -191,6 +215,7 @@ vmlinuz - the BOOT kernel used for the i |
|
|
initrd.img - an initrd with support for all install methods and |
|
|
drivers supported for installation of $PRODUCT |
|
|
EOF |
|
|
+ fi |
|
|
else # set up the boot stuff for the xen guest kernel |
|
|
echo "Building $KERNELARCH guest initrd.img" |
|
|
mkdir -p $TOPDESTPATH/images/xen |
|
1 |
diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg anaconda-10.1.1.37/bootdisk/i386/boot.msg |
diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg anaconda-10.1.1.37/bootdisk/i386/boot.msg |
2 |
--- anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg 2003-09-22 14:37:20.000000000 -0500 |
--- anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg 2003-09-22 14:37:20.000000000 -0500 |
3 |
+++ anaconda-10.1.1.37/bootdisk/i386/boot.msg 2006-03-09 15:13:21.000000000 -0600 |
+++ anaconda-10.1.1.37/bootdisk/i386/boot.msg 2006-03-09 15:13:21.000000000 -0600 |
99 |
label text |
label text |
100 |
kernel vmlinuz |
kernel vmlinuz |
101 |
append initrd=initrd.img text ramdisk_size=8192 |
append initrd=initrd.img text ramdisk_size=8192 |
102 |
|
diff -uNrp anaconda-10.1.1.62.orig/scripts/mk-images anaconda-10.1.1.62/scripts/mk-images |
103 |
|
--- anaconda-10.1.1.62.orig/scripts/mk-images 2007-03-05 10:10:56.000000000 -0600 |
104 |
|
+++ anaconda-10.1.1.62/scripts/mk-images 2007-03-05 10:15:31.000000000 -0600 |
105 |
|
@@ -1099,7 +1099,7 @@ arches="$BUILDARCH" |
106 |
|
if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then |
107 |
|
arches="ppc64pseries ppc64 ppc64iseries ppc" |
108 |
|
elif [ "$BUILDARCH" = "i386" ]; then |
109 |
|
- arches="i586" |
110 |
|
+ arches="i686 i586" |
111 |
|
kerneltags="kernel kernel-xenU" |
112 |
|
elif [ "$BUILDARCH" = "x86_64" ]; then |
113 |
|
kerneltags="kernel kernel-xenU" |
114 |
|
@@ -1124,7 +1124,7 @@ for KERNELARCH in $arches; do |
115 |
|
mkdir -p $KERNELROOT/lib/modules/misc |
116 |
|
|
117 |
|
foundakernel="yes" |
118 |
|
- if [ "${kernelvers}" = "kernel-xenU" ]; then kerneltag="xenU" ; fi |
119 |
|
+ if [ "${kernelvers}" = "kernel-xenU" ]; then kerneltag="xenU" ; else kerneltag=""; fi |
120 |
|
|
121 |
|
ppackage=$($LATEST $KERNELPATH hwdata) |
122 |
|
if [ ! -f "$ppackage" ]; then |
123 |
|
diff -uNrp anaconda-10.1.1.62.orig/scripts/mk-images.i386 anaconda-10.1.1.62/scripts/mk-images.i386 |
124 |
|
--- anaconda-10.1.1.62.orig/scripts/mk-images.i386 2007-03-05 10:10:57.000000000 -0600 |
125 |
|
+++ anaconda-10.1.1.62/scripts/mk-images.i386 2007-03-05 10:28:25.000000000 -0600 |
126 |
|
@@ -22,9 +22,14 @@ prepareBootImage() { |
127 |
|
# used to populate a boot image |
128 |
|
prepareBootTree() { |
129 |
|
(cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE) |
130 |
|
- |
131 |
|
- cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img |
132 |
|
- cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz |
133 |
|
+ |
134 |
|
+ if [ "$KERNELARCH" = "i586" ]; then |
135 |
|
+ cp $MBD_FSIMAGE $MBD_BOOTTREE/init${KERNELARCH}.img |
136 |
|
+ cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlz${KERNELARCH} |
137 |
|
+ else |
138 |
|
+ cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img |
139 |
|
+ cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz |
140 |
|
+ fi |
141 |
|
|
142 |
|
pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#3399FF=2 > $BOOTDISKDIR/splash.lss |
143 |
|
if [ $? != 0 ]; then |
144 |
|
@@ -155,6 +160,12 @@ makeBootImages() { |
145 |
|
rm -f $TOPDESTPATH/images/pxeboot/* |
146 |
|
ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz |
147 |
|
ln $TOPDESTPATH/isolinux/initrd.img $TOPDESTPATH/images/pxeboot/initrd.img |
148 |
|
+ if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then |
149 |
|
+ ln $TOPDESTPATH/isolinux/vmlzi586 $TOPDESTPATH/images/pxeboot/vmlzi586 |
150 |
|
+ fi |
151 |
|
+ if [ -f $TOPDESTPATH/isolinux/initi586.img ]; then |
152 |
|
+ ln $TOPDESTPATH/isolinux/initi586.img $TOPDESTPATH/images/pxeboot/initi586.img |
153 |
|
+ fi |
154 |
|
|
155 |
|
# links for the autoboot bits |
156 |
|
if [ -f $TOPDESTPATH/dosutils/loadlin.exe ]; then |
157 |
|
@@ -173,7 +184,7 @@ makeBootImages() { |
158 |
|
|
159 |
|
# now make a boot pendrive image |
160 |
|
mkdir -p $TOPDESTPATH/images/fobpath |
161 |
|
- dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=6 2>/dev/null |
162 |
|
+ dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=12 2>/dev/null |
163 |
|
mkdosfs $TOPDESTPATH/images/diskboot.img |
164 |
|
$SYSLINUX $TOPDESTPATH/images/diskboot.img |
165 |
|
mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath |
166 |
|
@@ -183,7 +194,20 @@ makeBootImages() { |
167 |
|
umount -f $TOPDESTPATH/images/fobpath |
168 |
|
rmdir $TOPDESTPATH/images/fobpath |
169 |
|
|
170 |
|
- cat > $TOPDESTPATH/images/pxeboot/README <<EOF |
171 |
|
+ if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then |
172 |
|
+ cat > $TOPDESTPATH/images/pxeboot/README <<EOF |
173 |
|
+The files in this directory are useful for booting a machine via PXE. |
174 |
|
+ |
175 |
|
+The following files are available: |
176 |
|
+vmlinuz - the BOOT kernel used for the i686 installer |
177 |
|
+initrd.img - an initrd with support for all install methods and |
178 |
|
+ drivers supported for installation of $PRODUCT i686 |
179 |
|
+vmlzi586 - the BOOT kernel used for the i586 installer |
180 |
|
+initi586.img - an initrd with support for all install methods and |
181 |
|
+ drivers supported for installation of $PRODUCT i586 |
182 |
|
+EOF |
183 |
|
+ else |
184 |
|
+ cat > $TOPDESTPATH/images/pxeboot/README <<EOF |
185 |
|
The files in this directory are useful for booting a machine via PXE. |
186 |
|
|
187 |
|
The following files are available: |
188 |
|
@@ -191,6 +215,7 @@ vmlinuz - the BOOT kernel used for the i |
189 |
|
initrd.img - an initrd with support for all install methods and |
190 |
|
drivers supported for installation of $PRODUCT |
191 |
|
EOF |
192 |
|
+ fi |
193 |
|
else # set up the boot stuff for the xen guest kernel |
194 |
|
echo "Building $KERNELARCH guest initrd.img" |
195 |
|
mkdir -p $TOPDESTPATH/images/xen |