summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Asaad <George.Asaad@Sun.COM>2010-07-30 15:51:47 -0700
committerGeorge Asaad <George.Asaad@Sun.COM>2010-07-30 15:51:47 -0700
commit655ac28efabd9441018156844eddfa8c23c793ff (patch)
tree979aa1cbded6603c8dc837b0479871a36f04d68f
parent9afd82b6e7542aa6bbe65be67611d626af6dabbd (diff)
downloadillumos-joyent-655ac28efabd9441018156844eddfa8c23c793ff.tar.gz
6949698 bootadm needs to be updated to include Oracle in the grub title
-rw-r--r--usr/src/cmd/boot/bootadm/bootadm.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c
index 8a71cae6a7..277834e0d4 100644
--- a/usr/src/cmd/boot/bootadm/bootadm.c
+++ b/usr/src/cmd/boot/bootadm/bootadm.c
@@ -7084,15 +7084,17 @@ get_title(char *rootdir)
goto out;
}
- while (s_fgets(title, sizeof (title), fp) != NULL) {
- cp = strstr(title, "Solaris");
- if (cp)
- break;
+ /* grab first line of /etc/release */
+ cp = s_fgets(title, sizeof (title), fp);
+ if (cp) {
+ while (isspace(*cp)) /* remove leading spaces */
+ cp++;
}
+
(void) fclose(fp);
out:
- cp = cp ? cp : "Solaris";
+ cp = cp ? cp : "Oracle Solaris";
BAM_DPRINTF((D_GET_TITLE, fcn, cp));