diff options
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/Makefile | 2 | ||||
| -rw-r--r-- | mdk-stage1/NEWS | 2 | ||||
| -rw-r--r-- | mdk-stage1/config-stage1.h | 2 | ||||
| -rw-r--r-- | mdk-stage1/doc/TECH-INFOS | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index ca8c11b23..1d66d22fe 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -27,7 +27,7 @@ include $(top_dir)/Makefile.common include $(top_dir)/../Makefile.config ARCHDIR=$(ARCH) ifeq (i386, $(ARCH)) -ARCHDIR=i586 +ARCHDIR=i686 endif DEFS = -DDISTRIB_NAME=\"$(DISTRIB_NAME)\" -DDISTRIB_VERSION=\"$(DISTRIB_VERSION)\" -DDISTRIB_TYPE=\"$(DISTRIB_TYPE)\" -DDISTRIB_DESCR=\"$(DISTRIB_DESCR)\" $(ADDITIONAL_DEFS) -D_FILE_OFFSET_BITS=64 -DARCH=\"$(ARCHDIR)\" -DCONFIG_USE_ZLIB diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 5f5feed68..714ea3129 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,5 @@ +- Replace i586 with i686 in files + 2.62 - Sync list_modules with kernel 6.4 diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h index feb621494..e3409df98 100644 --- a/mdk-stage1/config-stage1.h +++ b/mdk-stage1/config-stage1.h @@ -42,7 +42,7 @@ /* the remote media is mounted in MEDIA_LOCATION, and - IMAGE_LOCATION is a symlink image -> image/mdk/mirror/dir - - IMAGE_LOCATION is a symlink image -> loop/i586 and iso file is loopback mounted in LOOP_LOCATION + - IMAGE_LOCATION is a symlink image -> loop/i686 and iso file is loopback mounted in LOOP_LOCATION */ #define MEDIA_LOCATION_REL "media" #define MEDIA_LOCATION IMAGE_LOCATION_DIR MEDIA_LOCATION_REL diff --git a/mdk-stage1/doc/TECH-INFOS b/mdk-stage1/doc/TECH-INFOS index 49c9c59b8..81d559a7f 100644 --- a/mdk-stage1/doc/TECH-INFOS +++ b/mdk-stage1/doc/TECH-INFOS @@ -6,7 +6,7 @@ This feature is used to replace redhat kickstart. It uses the kernel parameter "automatic" with keywords separated with commas and colons, on the following genres: - automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i586 + automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i686 automatic=method:ftp,network:dhcp,server:ftp.ciril.fr,directory:/pub/linux/mandriva-devel/cooker @@ -89,9 +89,9 @@ commandline), please find each keyword short-alias counterpart in file This gives for example for: - automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i586 + automatic=method:nfs,network:static,ip:192.168.1.24,server:192.168.1.7,directory:/stable/i686 ==> - automatic=met:nfs,net:static,ip:192.168.1.24,ser:192.168.1.7,dir:/stable/i586 + automatic=met:nfs,net:static,ip:192.168.1.24,ser:192.168.1.7,dir:/stable/i686 |