diff --git a/install/builder/packages/desktop?calculate=CLS/desktop b/install/builder/packages/desktop?calculate=CLS/desktop index 5a8af59..948b773 100644 --- a/install/builder/packages/desktop?calculate=CLS/desktop +++ b/install/builder/packages/desktop?calculate=CLS/desktop @@ -2,5 +2,4 @@ # Основные программы рабочей станции #------------------------------------------------------------------------------ -app-editors/nvi #клон vi diff --git a/install/builder/packages/desktop?calculate=CLS/desktop_nettools b/install/builder/packages/desktop?calculate=CLS/desktop_nettools index e3f68d9..f4ba902 100644 --- a/install/builder/packages/desktop?calculate=CLS/desktop_nettools +++ b/install/builder/packages/desktop?calculate=CLS/desktop_nettools @@ -5,6 +5,7 @@ net-analyzer/iptraf net-analyzer/tcpdump net-analyzer/traceroute +net-dialup/gnome-ppp #net-dialup/minicom net-dialup/ppp net-dialup/pptpclient diff --git a/install/calculate b/install/calculate index 23147b0..d79f439 100755 --- a/install/calculate +++ b/install/calculate @@ -4288,10 +4288,6 @@ sub make{ printmes(" ".gettext('done')); printmes(".\n"); } } -# if(getini("run.make.step.world", "chroot")){ -# printmes(" ".gettext('Execute')); printmes(" emerge -e packages..."); -# printmes(" ".gettext('done')); printmes(".\n"); -# } #получим список пакетов world = "" my @world = packages(); @@ -4313,10 +4309,8 @@ sub make{ printmes(" ".gettext('done').".\n"); } } -# elsif(getini("run.make.step.world", "chroot") < 1){ else{ printmes(" ".gettext('Execute')); printmes(" emerge --noreplace world...\n"); -# putini("run.make" => "world", "chroot"); #сохраним выполняемое действие if(system "$data{emergerun1} --noreplace @world $data{emergerun2} --nodie"){ beep(); printmes(" ".gettext('error')."!\n"); return ''; @@ -4329,7 +4323,6 @@ sub make{ printmes(" ".gettext('done').".\n"); } -# } $finish ++; } }