Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move UI task progress bar during START DC proc #26

Merged
merged 1 commit into from Nov 21, 2016
Merged

Move UI task progress bar during START DC proc #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion root/etc/e-smith/events/actions/nethserver-dc-install
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ if ! [ -d ${nsroot}/etc/yum/vars ]; then
mkdir -p ${nsroot}/etc/yum/vars
mkdir -p ${nsroot}/var/log/journal
mkdir -p ${nsroot}/etc/systemd/network
yum -y --releasever=7 --installroot=${nsroot} install /usr/lib/nethserver-dc/ns-samba-*.ns7.x86_64.rpm centos-release systemd-networkd
yum -y --releasever=7 --installroot=${nsroot} install /usr/lib/nethserver-dc/ns-samba-*.ns7.x86_64.rpm centos-release systemd-networkd | /usr/libexec/nethserver/ptrack-nsdc-install
systemctl enable machines.target
systemctl --root=${nsroot} enable samba-provision.service samba.service
fi
53 changes: 53 additions & 0 deletions root/usr/libexec/nethserver/ptrack-nsdc-install
View file
Open in desktop
@@ -0,0 +1,53 @@
#!/usr/bin/perl

#
# Copyright (C) 2016 Nethesis S.r.l.
# http://www.nethesis.it - nethserver@nethesis.it
#
# This script is part of NethServer.
#
# NethServer is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License,
# or any later version.
#
# NethServer is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with NethServer. If not, see COPYING.
#

use strict;
use NethServer::TrackerClient;

my $tracker = NethServer::TrackerClient->new();

my %tasks = (
'deps' => $tracker->declare_task('Resolve dependencies'),
'download' => $tracker->declare_task('Download RPMs'),
'installing' => $tracker->declare_task('Install RPMs'),
'verifying' => $tracker->declare_task('Verifying RPMs'),
);

while (<STDIN>) {
print $_;
chomp $_;
if($_ =~ /^Dependencies Resolved/) {
$tracker->set_task_done($tasks{'deps'}, $_, 0);
} elsif ($_ =~ /^Total download size/) {
$tracker->set_task_progress($tasks{'download'}, 0.1, $_);
} elsif ($_ =~ /^Running transaction check/) {
$tracker->set_task_done($tasks{'download'}, $_, 0);
} elsif ($_ =~ m| Installing *: .* +(\d+)/(\d+)|) {
$tracker->set_task_progress($tasks{'installing'}, $1 / $2, $_);
} elsif ($_ =~ m| Verifying *: .* +(\d+)/(\d+)|) {
$tracker->set_task_progress($tasks{'verifying'}, $1 / $2, $_);
} elsif ($_ =~ /^Complete!/) {
$tracker->set_task_done($tasks{'installing'}, $_, 0);
$tracker->set_task_done($tasks{'verifying'}, $_, 0);
}
}