diff options
4 files changed, 22 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service index 82ffe7919..6fa97466a 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service @@ -1,12 +1,14 @@ [Unit] Description=Phosphor Host Console SSH Per-Connection Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service +Wants=sshdgenkeys.service [Service] -Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" -EnvironmentFile={envfiledir}/dropbear -ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS -SyslogIdentifier=dropbear -ExecReload={base_bindir}/kill -HUP $MAINPID +Environment="SSHD_OPTS=" +EnvironmentFile=-/etc/default/ssh +ExecStart=-@SBINDIR@/sshd -i -o ForceCommand="/usr/bin/env obmc-console-client" +SyslogIdentifier=sshd +ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID StandardInput=socket +StandardError=syslog KillMode=process diff --git a/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service index 35de4304b..934ebaef5 100644 --- a/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service +++ b/meta-phosphor/recipes-phosphor/state/files/phosphor-reset-host-reboot-attempts@.service @@ -7,7 +7,7 @@ ConditionPathExists=!/run/openbmc/host@%i-on [Service] Restart=no Type=oneshot -ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.Control.Boot.RebootAttempts AttemptsLeft u 3" +ExecStart=/bin/sh -c "busctl set-property `mapper get-service /xyz/openbmc_project/state/host%i` /xyz/openbmc_project/state/host%i xyz.openbmc_project.Control.Boot.RebootAttempts AttemptsLeft u 4" [Install] WantedBy=obmc-host-start@%i.target diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch new file mode 100644 index 000000000..f25c799b7 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch @@ -0,0 +1,13 @@ +diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js +index 4298884..e1881ff 100644 +--- a/app/common/services/api-utils.js ++++ b/app/common/services/api-utils.js +@@ -1472,7 +1472,7 @@ window.angular && (function(angular) { + } + + function titlelize(title) { +- title = title.replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, ''); ++ title = title.replace(/tach/g, ' Tachometer').replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, ''); + for (var i = 0; i < Constants.HARDWARE.uppercase_titles.length; + i++) { + if (title.toLowerCase().indexOf( diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend index c2dae597b..5fac6e13c 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/phosphor-webui:" SRC_URI += "file://login-page-name.patch \ file://cpu-power-reporting.patch \ + file://tachometer-display.patch \ " |
