diff options
| author | Toomas Soome <tsoome@me.com> | 2017-03-20 23:40:23 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2017-03-21 16:06:00 +0000 |
| commit | 8665881c0dfc6f05581d92376fcc3584444a9c5f (patch) | |
| tree | 5285fef6a2e2efe891e4dc7f237e7195935e3867 /usr/src | |
| parent | 0eec6d647c67ffda03b768c8686fedcf218dae1e (diff) | |
| download | illumos-joyent-8665881c0dfc6f05581d92376fcc3584444a9c5f.tar.gz | |
7958 loader: reset module type search after unload
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/boot/Makefile.version | 2 | ||||
| -rw-r--r-- | usr/src/boot/sys/boot/common/module.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version index a07ad75939..275840836e 100644 --- a/usr/src/boot/Makefile.version +++ b/usr/src/boot/Makefile.version @@ -33,4 +33,4 @@ LOADER_VERSION = 1.1 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes. # The version is processed from left to right, the version number can only # be increased. -BOOT_VERSION = $(LOADER_VERSION)-2017.3.16.1 +BOOT_VERSION = $(LOADER_VERSION)-2017.3.16.2 diff --git a/usr/src/boot/sys/boot/common/module.c b/usr/src/boot/sys/boot/common/module.c index c748a8211c..b091cf23b6 100644 --- a/usr/src/boot/sys/boot/common/module.c +++ b/usr/src/boot/sys/boot/common/module.c @@ -322,6 +322,9 @@ file_load(char *filename, vm_offset_t dest, struct preloaded_file **result) int error; int i; + if (preloaded_files == NULL) + last_file_format = 0; + if (archsw.arch_loadaddr != NULL) dest = archsw.arch_loadaddr(LOAD_RAW, filename, dest); |