Mercurial > illumos > illumos-gate
changeset 13233:023f1cd6fa75
128 Splash image /boot/solaris.xpm file not found error stops the boot process
Reviewed by: garrett@nexenta.com
Approved by: garrett@nexenta.com
| author | Damian Wojsław <damian@wojslaw.pl> |
|---|---|
| date | Tue, 02 Nov 2010 15:37:30 +0100 |
| parents | c9e6fe062e39 |
| children | 8157e74f6c4d |
| files | usr/src/pkg/manifests/system-boot-real-mode.mf usr/src/uts/intel/config/Makefile |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkg/manifests/system-boot-real-mode.mf Tue Nov 02 07:21:18 2010 +0100 +++ b/usr/src/pkg/manifests/system-boot-real-mode.mf Tue Nov 02 15:37:30 2010 +0100 @@ -46,6 +46,7 @@ original_name=SUNWrmod:boot/solaris/devicedb/master preserve=true $(i386_ONLY)file path=boot/splashimage.xpm group=sys $(i386_ONLY)file path=usr/lib/fs/ufs/mboot mode=0444 +hardlink path=boot/solaris.xpm target=splashimage.xpm $(i386_ONLY)legacy pkg=SUNWrmodr desc="Realmode Modules, (Root)" \ name="Realmode Modules, (Root)" $(i386_ONLY)legacy pkg=SUNWrmodu desc="Realmode Modules, (Usr)" \
--- a/usr/src/uts/intel/config/Makefile Tue Nov 02 07:21:18 2010 +0100 +++ b/usr/src/uts/intel/config/Makefile Tue Nov 02 15:37:30 2010 +0100 @@ -48,6 +48,7 @@ driver_classes dacf.conf $(PATH2INST) mach SECCONFIG = device_policy priv_names BOOTIMAGE = splashimage.xpm +ALTBOOTIMAGE = solaris.xpm # Temporary, for compatibility BOOTENVRC = bootenv.rc DEVMASTER = master FILEMODE = 644 @@ -65,6 +66,7 @@ ROOTCONFIGFILES += $(BOOTIMAGE:%=$(ROOTBOOT)/%) ROOTCONFIGFILES += $(BOOTENVRC:%=$(BOOTSOLARIS)/%) ROOTCONFIGFILES += $(DEVMASTER:%=$(BOOTDEVICEDB)/%) +ROOTALTBOOTIMAGE = $(ALTBOOTIMAGE:%=$(ROOTBOOT)/%) # # Default build targets. @@ -73,7 +75,7 @@ def all: $(SRCFILES) -install: all $(ROOTCONFIGFILES) +install: all $(ROOTCONFIGFILES) $(ROOTALTBOOTIMAGE) # # The ROOTETC directory is made by ../../../Targetdirs @@ -95,6 +97,10 @@ $(ROOTBOOT)/%: $(ROOTBOOT) $(SRCDIR)/% $(INS.file) +$(ROOTBOOT)/solaris.xpm: $(ROOTBOOT)/splashimage.xpm + $(RM) $@; $(LN) $(ROOTBOOT)/splashimage.xpm $@ + + $(BOOTSOLARIS): $(INS) -s -d -m $(DIRMODE) $@