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

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

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


Revision 1.3 - (show annotations) (download)
Mon Aug 24 15:09:08 2009 UTC (15 years, 2 months ago) by slords
Branch: MAIN
CVS Tags: anaconda-10_1_1_103-1_centos4_1_el4_sme, anaconda-10_1_1_103-1_centos4, HEAD
Changes since 1.2: +0 -9 lines
Import CentOS 4.8 sources

1 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
3 +++ anaconda-10.1.1.37/bootdisk/i386/boot.msg 2006-03-09 15:13:21.000000000 -0600
4 @@ -3,7 +3,11 @@
5
6 - To install or upgrade in graphical mode, press the 0f<ENTER>07 key.
7
8 + - To install or upgrade in graphical mode on an i586 machine,
9 + type 0fi586 <ENTER>07.
10 +
11 - To install or upgrade in text mode, type: 0flinux text <ENTER>07.
12 + (or for i586 machines in text mode type: 0fi586 text <ENTER>07.)
13
14 - Use the function keys listed below for more information.
15
16 diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/general.msg anaconda-10.1.1.37/bootdisk/i386/general.msg
17 --- anaconda-10.1.1.37.orig/bootdisk/i386/general.msg 2003-07-09 00:06:18.000000000 -0500
18 +++ anaconda-10.1.1.37/bootdisk/i386/general.msg 2006-03-09 15:18:25.000000000 -0600
19 @@ -6,12 +6,16 @@
20 You are now ready to begin the installation process. In most cases,
21 the best way to get started is to simply press the 0f<ENTER>07 key.
22
23 +If you are doing an install on an i586 machine, you would substitute
24 +0fi58607 for 0flinux07 throughout these instructions.
25 +
26 If you are having problems with the graphical installer, you can use the
27 '0fresolution=<width>x<height>07' option to try and force a
28 particular resolution. For example, boot with
29 -'0flinux resolution=1024x76807'. If you have problems with
30 -displaying before the graphical environment starts,
31 -try booting with '0flinux nofb07'.
32 +'0flinux resolution=1024x76807' or '0fi586 resolution=1024x76807'.
33 +
34 +If you have problems with displaying before the graphical environment starts,
35 +try booting with '0flinux nofb07' or '0fi586 nofb07'.
36
37 Certain hardware configurations may have trouble with the automatic hardware
38 detection done during the installation. If you experience problems during the
39 diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/options.msg anaconda-10.1.1.37/bootdisk/i386/options.msg
40 --- anaconda-10.1.1.37.orig/bootdisk/i386/options.msg 2003-08-05 10:11:28.000000000 -0500
41 +++ anaconda-10.1.1.37/bootdisk/i386/options.msg 2006-03-09 15:21:47.000000000 -0600
42 @@ -3,6 +3,9 @@
43
44 09Installer Boot Options07
45
46 + If installing on an i586 machine, substitute 0fi58607 for 0flinux07
47 + for all the options listed on this page.
48 +
49 - To disable hardware probing, type: 0flinux noprobe <ENTER>07.
50
51 - To test the install media you are using, type: 0flinux mediacheck <ENTER>07.
52 diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/param.msg anaconda-10.1.1.37/bootdisk/i386/param.msg
53 --- anaconda-10.1.1.37.orig/bootdisk/i386/param.msg 2003-09-22 14:37:20.000000000 -0500
54 +++ anaconda-10.1.1.37/bootdisk/i386/param.msg 2006-03-09 15:23:24.000000000 -0600
55 @@ -10,6 +10,8 @@
56 To pass an option to the kernel, use the following format:
57
58 0flinux <options>07
59 + or
60 + 0fi586 <options>07
61
62 If a different installation mode is desired, enter it after the option(s).
63
64 @@ -17,6 +19,8 @@
65 type the following:
66
67 0flinux mem=128M noprobe07
68 + or
69 + 0fi586 mem=128M noprobe07
70
71 To pass options to modules, you will need to use the noprobe mode to disable
72 PCI autoprobing. When the installer asks for your device type that needs
73 diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/rescue.msg anaconda-10.1.1.37/bootdisk/i386/rescue.msg
74 --- anaconda-10.1.1.37.orig/bootdisk/i386/rescue.msg 2003-09-22 14:37:20.000000000 -0500
75 +++ anaconda-10.1.1.37/bootdisk/i386/rescue.msg 2006-03-09 15:24:40.000000000 -0600
76 @@ -9,8 +9,11 @@
77 one to restore a system to a working state.
78
79 To enter the rescue mode, boot your system from the installation
80 -CDROM or floppy and type 0flinux rescue <ENTER>07.
81 +CDROM or floppy and type:
82
83 + 0flinux rescue <ENTER>07.
84 + or
85 + 0fi586 rescue <ENTER>07.
86
87
88
89 diff -uNr anaconda-10.1.1.37.orig/bootdisk/i386/syslinux.cfg anaconda-10.1.1.37/bootdisk/i386/syslinux.cfg
90 --- anaconda-10.1.1.37.orig/bootdisk/i386/syslinux.cfg 2004-09-22 14:17:54.000000000 -0500
91 +++ anaconda-10.1.1.37/bootdisk/i386/syslinux.cfg 2006-03-09 15:26:28.000000000 -0600
92 @@ -11,6 +11,9 @@
93 label linux
94 kernel vmlinuz
95 append initrd=initrd.img ramdisk_size=8192
96 +label i586
97 + kernel vmlzi586
98 + append initrd=initi586.img ramdisk_size=8192
99 label text
100 kernel vmlinuz
101 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 @@ -183,7 +194,20 @@ makeBootImages() {
158 umount -f $TOPDESTPATH/images/fobpath
159 rmdir $TOPDESTPATH/images/fobpath
160
161 - cat > $TOPDESTPATH/images/pxeboot/README <<EOF
162 + if [ -f $TOPDESTPATH/isolinux/vmlzi586 ]; then
163 + cat > $TOPDESTPATH/images/pxeboot/README <<EOF
164 +The files in this directory are useful for booting a machine via PXE.
165 +
166 +The following files are available:
167 +vmlinuz - the BOOT kernel used for the i686 installer
168 +initrd.img - an initrd with support for all install methods and
169 + drivers supported for installation of $PRODUCT i686
170 +vmlzi586 - the BOOT kernel used for the i586 installer
171 +initi586.img - an initrd with support for all install methods and
172 + drivers supported for installation of $PRODUCT i586
173 +EOF
174 + else
175 + cat > $TOPDESTPATH/images/pxeboot/README <<EOF
176 The files in this directory are useful for booting a machine via PXE.
177
178 The following files are available:
179 @@ -191,6 +215,7 @@ vmlinuz - the BOOT kernel used for the i
180 initrd.img - an initrd with support for all install methods and
181 drivers supported for installation of $PRODUCT
182 EOF
183 + fi
184 else # set up the boot stuff for the xen guest kernel
185 echo "Building $KERNELARCH guest initrd.img"
186 mkdir -p $TOPDESTPATH/images/xen

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed