diff options
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/common/boot.c | 2 | ||||
| -rw-r--r-- | sys/boot/common/module.c | 2 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c index ae3cb7796c99..067012cf53c8 100644 --- a/sys/boot/common/boot.c +++ b/sys/boot/common/boot.c @@ -38,7 +38,7 @@ static char *getbootfile(int try); /* List of kernel names to try (may be overwritten by boot.config) XXX should move from here? */ -static const char *default_bootfiles = "kernel;kernel.old"; +static const char *default_bootfiles = "/boot/modules/kernel.ko"; static int autoboot_tried; diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c index effb848fa0e7..192e58db2c45 100644 --- a/sys/boot/common/module.c +++ b/sys/boot/common/module.c @@ -49,7 +49,7 @@ struct file_metadata* metadata_next(struct file_metadata *base_mp, int type); /* load address should be tweaked by first module loaded (kernel) */ static vm_offset_t loadaddr = 0; -static const char *default_searchpath ="/;/boot;/modules"; +static const char *default_searchpath ="/boot/modules;/modules;/boot/kernel"; struct preloaded_file *preloaded_files = NULL; diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 272f37e564fe..897eb40f7991 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -14,7 +14,7 @@ exec=".( Loading /boot/defaults/loader.conf ) cr" -kernel="/kernel" +kernel="/boot/kernel/kernel.ko" kernel_options="" userconfig_script_load="NO" @@ -46,7 +46,7 @@ bitmap_type="splash_image_data" #bootfile="kernel,kernel.old" # Set the default boot file set #console="vidconsole" # Set the current console #currdev="disk1s1a" # Set the current device -#module_path="/;/boot;/modules" # Set the module search path +#module_path="/boot/modules;/modules;/boot/kernel" # Set the module search path #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem |