diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2010-08-22 11:16:55 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2010-08-22 11:16:55 -0700 |
| commit | e77c795bcbe51aebd7579fe13cbf2a6d56eca47f (patch) | |
| tree | 54c89da073d3d7efe8ae156cc8b856a6a4d3dccf | |
| parent | 98df5136b3d9df5b7ca697215c2b492ad7544ddd (diff) | |
| download | illumos-joyent-e77c795bcbe51aebd7579fe13cbf2a6d56eca47f.tar.gz | |
51 branding regression for boot menu
Reviewed by: richlowe@richlowe.net
Approved by: richlowe@richlowe.net
--HG--
rename : usr/src/uts/intel/os/illumos.xpm => usr/src/uts/intel/os/splashimage.xpm
| -rw-r--r-- | exception_lists/copyright | 2 | ||||
| -rw-r--r-- | usr/src/lib/libbe/common/be_utils.c | 8 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-boot-real-mode.mf | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/config/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/os/splashimage.xpm (renamed from usr/src/uts/intel/os/illumos.xpm) | 0 |
5 files changed, 10 insertions, 4 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index e9945f1df4..cca987f762 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -316,7 +316,7 @@ usr/src/lib/krb5/ss/utils.c usr/src/lib/libkmsagent/common/SOAP/*.* usr/src/lib/librstp/common/*.[ch] usr/src/lib/librstp/common/[CRT]* -usr/src/uts/intel/os/illumos.xpm +usr/src/uts/intel/os/splashimage.xpm usr/src/uts/common/gssapi/mechs/krb5/crypto/block_size.c usr/src/uts/common/gssapi/mechs/krb5/crypto/checksum_length.c usr/src/uts/common/gssapi/mechs/krb5/crypto/des/f_parity.c diff --git a/usr/src/lib/libbe/common/be_utils.c b/usr/src/lib/libbe/common/be_utils.c index 39de4c81ce..141502888a 100644 --- a/usr/src/lib/libbe/common/be_utils.c +++ b/usr/src/lib/libbe/common/be_utils.c @@ -475,7 +475,13 @@ be_append_menu(char *be_name, char *be_root_pool, char *boot_pool, if (strstr(line, BE_GRUB_COMMENT) != NULL || strstr(line, "BOOTADM") != NULL) continue; - entries[num_lines] = strdup(temp_line); + if (strcmp(tok, "splashimage") == 0) { + entries[num_lines] = + strdup("splashimage " + "/boot/splashimage.xpm\n"); + } else { + entries[num_lines] = strdup(temp_line); + } num_lines++; } else if (found_title && !found_orig_be) { tmp_entries[num_tmp_lines] = strdup(temp_line); diff --git a/usr/src/pkg/manifests/system-boot-real-mode.mf b/usr/src/pkg/manifests/system-boot-real-mode.mf index ff0f743285..ad169dfaad 100644 --- a/usr/src/pkg/manifests/system-boot-real-mode.mf +++ b/usr/src/pkg/manifests/system-boot-real-mode.mf @@ -40,11 +40,11 @@ $(i386_ONLY)dir path=usr group=sys $(i386_ONLY)dir path=usr/lib $(i386_ONLY)dir path=usr/lib/fs group=sys $(i386_ONLY)dir path=usr/lib/fs/ufs group=sys -$(i386_ONLY)file path=boot/illumos.xpm group=sys $(i386_ONLY)file path=boot/solaris/bootenv.rc group=sys \ original_name=SUNWrmodr:boot/solaris/bootenv.rc preserve=true $(i386_ONLY)file path=boot/solaris/devicedb/master group=sys \ 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 $(i386_ONLY)legacy pkg=SUNWrmodr desc="Realmode Modules, (Root)" \ name="Realmode Modules, (Root)" diff --git a/usr/src/uts/intel/config/Makefile b/usr/src/uts/intel/config/Makefile index 5f597b96e3..19fa3fe414 100644 --- a/usr/src/uts/intel/config/Makefile +++ b/usr/src/uts/intel/config/Makefile @@ -47,7 +47,7 @@ PATH2INST = path_to_inst CONFIGFILES = name_to_major minor_perm driver_aliases name_to_sysnum \ driver_classes dacf.conf $(PATH2INST) mach SECCONFIG = device_policy priv_names -BOOTIMAGE = illumos.xpm +BOOTIMAGE = splashimage.xpm BOOTENVRC = bootenv.rc DEVMASTER = master FILEMODE = 644 diff --git a/usr/src/uts/intel/os/illumos.xpm b/usr/src/uts/intel/os/splashimage.xpm index d864423532..d864423532 100644 --- a/usr/src/uts/intel/os/illumos.xpm +++ b/usr/src/uts/intel/os/splashimage.xpm |