smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various - space in reboot panel, max 15 chars for workgroup name, add action for recofigure, remove call to TAI64 in viewlogfiles, add requires for multi-language locales

Browse Source
This commit is contained in:
Brian Read
2025-01-27 15:16:21 +00:00
parent c2d677594b
commit eee68afa2b
5 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
root/etc/e-smith/events/actions/post-upgrade-and-reboot Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/bash
/usr/sbin/e-smith/signal-event post-upgrade
/usr/sbin/e-smith/signal-event reboot

9
root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm
View File

@@ -56,10 +56,11 @@ sub do_action {
# esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
# "; ", "/sbin/e-smith/signal-event", "reboot" );
system("/sbin/e-smith/signal-event", "post-upgrade") == 0
or die("Error occurred while running post-upgrade.\n");
system("/sbin/e-smith/signal-event", "reboot") == 0
or die("Error occurred while rebooting.\n");
esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade-and-reboot");
#system("/sbin/e-smith/signal-event", "post-upgrade") == 0
#or die("Error occurred while running post-upgrade.\n");
#system("/sbin/e-smith/signal-event", "reboot") == 0
#or die("Error occurred while rebooting.\n");
} ## end unless ($debug)
} ## end elsif ($function eq 'reconfigure')
$c->stash(title => $title, modul => $result);

11
root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm
View File

@@ -17,7 +17,7 @@ use Locale::gettext;
use SrvMngr::I18N;
use SrvMngr qw(theme_list init_session);
use esmith::ConfigDB;
use Time::TAI64;
#use Time::TAI64;
use File::Basename;
use HTML::Entities;
use esmith::FormMagick qw(gen_locale_date_string);
@@ -104,10 +104,11 @@ sub do_action {
sub timestamp2local {
$_ = shift;
if (/^(\@[0-9a-f]{24})(.*)/s) {
return Time::TAI64::tai64nlocal($1) . $2;
} elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
return localtime($1) . $2;
#if (/^(\@[0-9a-f]{24})(.*)/s) {
# return Time::TAI64::tai64nlocal($1) . $2;
#} els
if (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
return localtime($1) . $2;
}
return $_;
} ## end sub timestamp2local