From 29ba2e2cf1e8043f68702e111f12b097446058b9 Mon Sep 17 00:00:00 2001 From: Frans Pop Date: Mon, 7 Aug 2006 21:03:18 +0000 Subject: Rename some i386 files/directories to x86 because of AMD64 inclusion --- nl/using-d-i/components.xml | 4 +- nl/using-d-i/modules/i386/grub-installer.xml | 26 ----------- nl/using-d-i/modules/i386/lilo-installer.xml | 70 ---------------------------- nl/using-d-i/modules/x86/grub-installer.xml | 26 +++++++++++ nl/using-d-i/modules/x86/lilo-installer.xml | 70 ++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 nl/using-d-i/modules/i386/grub-installer.xml delete mode 100644 nl/using-d-i/modules/i386/lilo-installer.xml create mode 100644 nl/using-d-i/modules/x86/grub-installer.xml create mode 100644 nl/using-d-i/modules/x86/lilo-installer.xml (limited to 'nl/using-d-i') diff --git a/nl/using-d-i/components.xml b/nl/using-d-i/components.xml index c9834c760..fd62ed170 100644 --- a/nl/using-d-i/components.xml +++ b/nl/using-d-i/components.xml @@ -150,8 +150,8 @@ dient u de documentatie van uw opstartlader te raadplegen. &module-os-prober.xml; &module-alpha-aboot-installer.xml; &module-hppa-palo-installer.xml; -&module-i386-grub-installer.xml; -&module-i386-lilo-installer.xml; +&module-x86-grub-installer.xml; +&module-x86-lilo-installer.xml; &module-ia64-elilo-installer.xml; &module-mips-arcboot-installer.xml; &module-mipsel-colo-installer.xml; diff --git a/nl/using-d-i/modules/i386/grub-installer.xml b/nl/using-d-i/modules/i386/grub-installer.xml deleted file mode 100644 index fdb192e37..000000000 --- a/nl/using-d-i/modules/i386/grub-installer.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Install the <command>Grub</command> Boot Loader - on a Hard Disk - - -The main &architecture; boot loader is called grub. -Grub is a flexible and robust boot loader and a good default choice for -newbies and old hands alike. - - - -By default, grub will be installed into the Master Boot Record (MBR), where -it will take over complete control of the boot process. If you prefer, you -can install it elsewhere. See the grub manual for complete information. - - - -If you do not want to install grub at all, use the Back button to get to -the main menu, and from there select whatever bootloader you would like to -use. - - - diff --git a/nl/using-d-i/modules/i386/lilo-installer.xml b/nl/using-d-i/modules/i386/lilo-installer.xml deleted file mode 100644 index 5223cb0f1..000000000 --- a/nl/using-d-i/modules/i386/lilo-installer.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - Install the <command>LILO</command> Boot Loader - on a Hard Disk - - -The second &architecture; boot loader is called LILO. -It is an old complex program which offers lots of functionality, -including DOS, Windows, and OS/2 boot management. Please carefully -read the instructions in the directory -/usr/share/doc/lilo/ if you have special needs; -also see the LILO mini-HOWTO. - - - - -Currently the LILO installation will only create menu entries for other -operating systems if these can be chainloaded. -This means you may have to manually add a menu entry for operating -systems like GNU/Linux and GNU/Hurd after the installation. - - - - -&d-i; presents you three choices where to install the -LILO boot loader: - - - -Master Boot Record (MBR) - -This way the LILO will take complete control of the -boot process. - - - -new Debian partition - -Choose this if you want to use another boot -manager. LILO will install itself at the beginning -of the new Debian partition and it will serve as a secondary boot -loader. - - - -Other choice - -Useful for advanced users who want to install LILO -somewhere else. In this case you will be asked for desired -location. You can use devfs style names, such as those that start with -/dev/ide, /dev/scsi, and -/dev/discs, as well as traditional names, such as -/dev/hda or /dev/sda. - - - - - - -If you can no longer boot into Windows 9x (or DOS) after this step, -you'll need to use a Windows 9x (MS-DOS) boot disk and use the -fdisk /mbr command to reinstall the MS-DOS -master boot record — however, this means that you'll need to use -some other way to get back into Debian! For more information on this -please read . - - - diff --git a/nl/using-d-i/modules/x86/grub-installer.xml b/nl/using-d-i/modules/x86/grub-installer.xml new file mode 100644 index 000000000..fdb192e37 --- /dev/null +++ b/nl/using-d-i/modules/x86/grub-installer.xml @@ -0,0 +1,26 @@ + + + + + Install the <command>Grub</command> Boot Loader + on a Hard Disk + + +The main &architecture; boot loader is called grub. +Grub is a flexible and robust boot loader and a good default choice for +newbies and old hands alike. + + + +By default, grub will be installed into the Master Boot Record (MBR), where +it will take over complete control of the boot process. If you prefer, you +can install it elsewhere. See the grub manual for complete information. + + + +If you do not want to install grub at all, use the Back button to get to +the main menu, and from there select whatever bootloader you would like to +use. + + + diff --git a/nl/using-d-i/modules/x86/lilo-installer.xml b/nl/using-d-i/modules/x86/lilo-installer.xml new file mode 100644 index 000000000..5223cb0f1 --- /dev/null +++ b/nl/using-d-i/modules/x86/lilo-installer.xml @@ -0,0 +1,70 @@ + + + + + Install the <command>LILO</command> Boot Loader + on a Hard Disk + + +The second &architecture; boot loader is called LILO. +It is an old complex program which offers lots of functionality, +including DOS, Windows, and OS/2 boot management. Please carefully +read the instructions in the directory +/usr/share/doc/lilo/ if you have special needs; +also see the LILO mini-HOWTO. + + + + +Currently the LILO installation will only create menu entries for other +operating systems if these can be chainloaded. +This means you may have to manually add a menu entry for operating +systems like GNU/Linux and GNU/Hurd after the installation. + + + + +&d-i; presents you three choices where to install the +LILO boot loader: + + + +Master Boot Record (MBR) + +This way the LILO will take complete control of the +boot process. + + + +new Debian partition + +Choose this if you want to use another boot +manager. LILO will install itself at the beginning +of the new Debian partition and it will serve as a secondary boot +loader. + + + +Other choice + +Useful for advanced users who want to install LILO +somewhere else. In this case you will be asked for desired +location. You can use devfs style names, such as those that start with +/dev/ide, /dev/scsi, and +/dev/discs, as well as traditional names, such as +/dev/hda or /dev/sda. + + + + + + +If you can no longer boot into Windows 9x (or DOS) after this step, +you'll need to use a Windows 9x (MS-DOS) boot disk and use the +fdisk /mbr command to reinstall the MS-DOS +master boot record — however, this means that you'll need to use +some other way to get back into Debian! For more information on this +please read . + + + -- cgit v1.2.3