/[smeserver]/rpms/anaconda/sme7/centos4-buildi586.patch
ViewVC logotype

Annotation of /rpms/anaconda/sme7/centos4-buildi586.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Tue Jun 12 14:39:14 2007 UTC (17 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: anaconda-10_1_1_63-4_centos4_1_el4_sme 
Import on branch sme7 of package anaconda-10.1.1.63-4.centos4.1.el4.sme.src.rpm
1 slords 1.1 diff -uNrp anaconda-10.1.1.63.orig/scripts/mk-images anaconda-10.1.1.63/scripts/mk-images
2     --- anaconda-10.1.1.63.orig/scripts/mk-images 2007-05-06 08:14:01.000000000 -0500
3     +++ anaconda-10.1.1.63/scripts/mk-images 2007-05-06 09:06:50.000000000 -0500
4     @@ -1099,20 +1099,28 @@ arches="$BUILDARCH"
5     if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
6     arches="ppc64pseries ppc64 ppc64iseries ppc"
7     elif [ "$BUILDARCH" = "i386" ]; then
8     - arches="i586"
9     - kerneltags="kernel kernel-xenU"
10     + arches="i686 i586"
11     elif [ "$BUILDARCH" = "x86_64" ]; then
12     kerneltags="kernel kernel-xenU"
13     fi
14     foundakernel=""
15     for KERNELARCH in $arches; do
16     +
17     + # allow kernel only for i586 and kernel, kernel-xenU for i686
18     + if [ "$KERNELARCH" = "i586" ]; then
19     + kerneltags="kernel"
20     + fi
21     + if [ "$KERNELARCH" = "i686" ]; then
22     + kerneltags="kernel kernel-xenU"
23     + fi
24     +
25     for kernelvers in $kerneltags; do
26     - kpackage=$($LATEST $KERNELPATH $kernelvers)
27     - if [ "$KERNELARCH" = "i586" -a ! -f "$kpackage" ]; then
28     - echo "No i586 kernel, trying i686..."
29     - KERNELARCH="i686"
30     - kpackage=$($LATEST $KERNELPATH kernel)
31     + if [ "$KERNELARCH" = "i586" ]; then
32     + kernelvers="kernel"
33     + kerneltags="kernel"
34     + kerneltag=""
35     fi
36     + kpackage=$($LATEST $KERNELPATH $kernelvers)
37    
38     if [ ! -f "$kpackage" ]; then
39     echo "kernel ($kernelvers) does not exist for $KERNELARCH. skipping"
40     diff -uNrp anaconda-10.1.1.63.orig/scripts/mk-images.i386 anaconda-10.1.1.63/scripts/mk-images.i386
41     --- anaconda-10.1.1.63.orig/scripts/mk-images.i386 2006-11-20 15:30:15.000000000 -0600
42     +++ anaconda-10.1.1.63/scripts/mk-images.i386 2007-05-06 09:06:13.000000000 -0500
43     @@ -22,11 +22,16 @@ prepareBootImage() {
44     # used to populate a boot image
45     prepareBootTree() {
46     (cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE)
47     -
48     - cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
49     - cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
50    
51     - pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#000000=0 \#cdcfd5=7 \#c90000=2 \#ffffff=15 \#5b6c93=9 > $BOOTDISKDIR/splash.lss
52     + if [ "$KERNELARCH" = "i586" ]; then
53     + cp $MBD_FSIMAGE $MBD_BOOTTREE/init${KERNELARCH}.img
54     + cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlz${KERNELARCH}
55     + else
56     + cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
57     + cp $KERNELROOT/boot/vmlinuz-* $MBD_BOOTTREE/vmlinuz
58     + fi
59     +
60     + pngtopnm $BOOTDISKDIR/syslinux-splash.png | ppmtolss16 \#3399FF=2 > $BOOTDISKDIR/splash.lss
61     if [ $? != 0 ]; then
62     echo $0: Failed to create splash.lss
63     exit 1
64     @@ -155,6 +160,12 @@ makeBootImages() {
65     rm -f $TOPDESTPATH/images/pxeboot/*
66     ln $TOPDESTPATH/isolinux/vmlinuz $TOPDESTPATH/images/pxeboot/vmlinuz
67     ln $TOPDESTPATH/isolinux/initrd.img $TOPDESTPATH/images/pxeboot/initrd.img
68     + if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then
69     + ln $TOPDESTPATH/isolinux/vmlzi586 $TOPDESTPATH/images/pxeboot/vmlzi586
70     + fi
71     + if [ -f $TOPDESTPATH/isolinux/initi586.img ]; then
72     + ln $TOPDESTPATH/isolinux/initi586.img $TOPDESTPATH/images/pxeboot/initi586.img
73     + fi
74    
75     # links for the autoboot bits
76     if [ -f $TOPDESTPATH/dosutils/loadlin.exe ]; then
77     @@ -173,7 +184,7 @@ makeBootImages() {
78    
79     # now make a boot pendrive image
80     mkdir -p $TOPDESTPATH/images/fobpath
81     - dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=6 2>/dev/null
82     + dd if=/dev/zero of=$TOPDESTPATH/images/diskboot.img bs=1M count=12 2>/dev/null
83     mkdosfs $TOPDESTPATH/images/diskboot.img
84     $SYSLINUX $TOPDESTPATH/images/diskboot.img
85     mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath
86     @@ -183,7 +194,20 @@ makeBootImages() {
87     umount -f $TOPDESTPATH/images/fobpath
88     rmdir $TOPDESTPATH/images/fobpath
89    
90     - cat > $TOPDESTPATH/images/pxeboot/README <<EOF
91     + if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then
92     + cat > $TOPDESTPATH/images/pxeboot/README <<EOF
93     +The files in this directory are useful for booting a machine via PXE.
94     +
95     +The following files are available:
96     +vmlinuz - the BOOT kernel used for the i686 installer
97     +initrd.img - an initrd with support for all install methods and
98     + drivers supported for installation of $PRODUCT i686
99     +vmlzi586 - the BOOT kernel used for the i586 installer
100     +initi586.img - an initrd with support for all install methods and
101     + drivers supported for installation of $PRODUCT i586
102     +EOF
103     + else
104     + cat > $TOPDESTPATH/images/pxeboot/README <<EOF
105     The files in this directory are useful for booting a machine via PXE.
106    
107     The following files are available:
108     @@ -191,6 +215,7 @@ vmlinuz - the BOOT kernel used for the i
109     initrd.img - an initrd with support for all install methods and
110     drivers supported for installation of $PRODUCT
111     EOF
112     + fi
113     else # set up the boot stuff for the xen guest kernel
114     echo "Building $KERNELARCH guest initrd.img"
115     mkdir -p $TOPDESTPATH/images/xen
116     diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg anaconda-10.1.1.37/bootdisk/i386/boot.msg
117     --- anaconda-10.1.1.37.orig/bootdisk/i386/boot.msg 2003-09-22 14:37:20.000000000 -0500
118     +++ anaconda-10.1.1.37/bootdisk/i386/boot.msg 2006-03-09 15:13:21.000000000 -0600
119     @@ -3,7 +3,11 @@
120    
121     - To install or upgrade in graphical mode, press the 0f<ENTER>07 key.
122    
123     + - To install or upgrade in graphical mode on an i586 machine,
124     + type 0fi586 <ENTER>07.
125     +
126     - To install or upgrade in text mode, type: 0flinux text <ENTER>07.
127     + (or for i586 machines in text mode type: 0fi586 text <ENTER>07.)
128    
129     - Use the function keys listed below for more information.
130    
131     diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/general.msg anaconda-10.1.1.37/bootdisk/i386/general.msg
132     --- anaconda-10.1.1.37.orig/bootdisk/i386/general.msg 2003-07-09 00:06:18.000000000 -0500
133     +++ anaconda-10.1.1.37/bootdisk/i386/general.msg 2006-03-09 15:18:25.000000000 -0600
134     @@ -6,12 +6,16 @@
135     You are now ready to begin the installation process. In most cases,
136     the best way to get started is to simply press the 0f<ENTER>07 key.
137    
138     +If you are doing an install on an i586 machine, you would substitute
139     +0fi58607 for 0flinux07 throughout these instructions.
140     +
141     If you are having problems with the graphical installer, you can use the
142     '0fresolution=<width>x<height>07' option to try and force a
143     particular resolution. For example, boot with
144     -'0flinux resolution=1024x76807'. If you have problems with
145     -displaying before the graphical environment starts,
146     -try booting with '0flinux nofb07'.
147     +'0flinux resolution=1024x76807' or '0fi586 resolution=1024x76807'.
148     +
149     +If you have problems with displaying before the graphical environment starts,
150     +try booting with '0flinux nofb07' or '0fi586 nofb07'.
151    
152     Certain hardware configurations may have trouble with the automatic hardware
153     detection done during the installation. If you experience problems during the
154     diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/options.msg anaconda-10.1.1.37/bootdisk/i386/options.msg
155     --- anaconda-10.1.1.37.orig/bootdisk/i386/options.msg 2003-08-05 10:11:28.000000000 -0500
156     +++ anaconda-10.1.1.37/bootdisk/i386/options.msg 2006-03-09 15:21:47.000000000 -0600
157     @@ -3,6 +3,9 @@
158    
159     09Installer Boot Options07
160    
161     + If installing on an i586 machine, substitute 0fi58607 for 0flinux07
162     + for all the options listed on this page.
163     +
164     - To disable hardware probing, type: 0flinux noprobe <ENTER>07.
165    
166     - To test the install media you are using, type: 0flinux mediacheck <ENTER>07.
167     diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/param.msg anaconda-10.1.1.37/bootdisk/i386/param.msg
168     --- anaconda-10.1.1.37.orig/bootdisk/i386/param.msg 2003-09-22 14:37:20.000000000 -0500
169     +++ anaconda-10.1.1.37/bootdisk/i386/param.msg 2006-03-09 15:23:24.000000000 -0600
170     @@ -10,6 +10,8 @@
171     To pass an option to the kernel, use the following format:
172    
173     0flinux <options>07
174     + or
175     + 0fi586 <options>07
176    
177     If a different installation mode is desired, enter it after the option(s).
178    
179     @@ -17,6 +19,8 @@
180     type the following:
181    
182     0flinux mem=128M noprobe07
183     + or
184     + 0fi586 mem=128M noprobe07
185    
186     To pass options to modules, you will need to use the noprobe mode to disable
187     PCI autoprobing. When the installer asks for your device type that needs
188     diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/rescue.msg anaconda-10.1.1.37/bootdisk/i386/rescue.msg
189     --- anaconda-10.1.1.37.orig/bootdisk/i386/rescue.msg 2003-09-22 14:37:20.000000000 -0500
190     +++ anaconda-10.1.1.37/bootdisk/i386/rescue.msg 2006-03-09 15:24:40.000000000 -0600
191     @@ -9,8 +9,11 @@
192     one to restore a system to a working state.
193    
194     To enter the rescue mode, boot your system from the installation
195     -CDROM or floppy and type 0flinux rescue <ENTER>07.
196     +CDROM or floppy and type:
197    
198     + 0flinux rescue <ENTER>07.
199     + or
200     + 0fi586 rescue <ENTER>07.
201    
202    
203    
204     diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/syslinux.cfg anaconda-10.1.1.37/bootdisk/i386/syslinux.cfg
205     --- anaconda-10.1.1.37.orig/bootdisk/i386/syslinux.cfg 2004-09-22 14:17:54.000000000 -0500
206     +++ anaconda-10.1.1.37/bootdisk/i386/syslinux.cfg 2006-03-09 15:26:28.000000000 -0600
207     @@ -11,6 +11,9 @@
208     label linux
209     kernel vmlinuz
210     append initrd=initrd.img ramdisk_size=8192
211     +label i586
212     + kernel vmlzi586
213     + append initrd=initi586.img ramdisk_size=8192
214     label text
215     kernel vmlinuz
216     append initrd=initrd.img text ramdisk_size=8192
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed