diff --git a/Change.log b/Change.log index d970f54..330c7e3 100644 --- a/Change.log +++ b/Change.log @@ -3,6 +3,7 @@ CHANGE LOG 1.4.0 * Changed path to resources from /usr/calculate to /var/calculate * The use of man-db when building systems. +* Added support Calculate Scratch Server. 1.3.12 * Fix creating format a digest file. diff --git a/install/calculate b/install/calculate index d24ab70..dc3f0e1 100755 --- a/install/calculate +++ b/install/calculate @@ -521,7 +521,7 @@ sub getarg{ printmes(gettext('Similarly for optional arguments').".\n\n"); printmes(gettext('Location').":\n"); - printmes(" -s, --os=[CLD|CLDG|CLDX|CLS|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop GNOME, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Directory Server)\n"); + printmes(" -s, --os=[CLD|CLDG|CLDX|CLS|CSS|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop GNOME, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Scratch Server, Calculate Directory Server)\n"); printmes(" -d, --disk=DISK\t"); printmes(gettext('installation or building system volume')."\n"); printmes(" -b, --build\t\t"); printmes(gettext('installation for assembling')."\n"); @@ -846,6 +846,7 @@ sub welcome{ CLD => "Calculate Linux Desktop", CLDG => "Calculate Linux Desktop", CLDX => "Calculate Linux Desktop", + CSS => "Calculate Scratch Server", CDS => "Calculate Directory Server", CLS => "Calculate Linux Scratch", CLSG => "Calculate Linux Scratch", @@ -2994,6 +2995,8 @@ sub checkready{ number_ver($data{linuxver}) > number_ver('10.4.99')) || ($data{calculate} eq "CLSG" && number_ver($data{linuxver}) > number_ver('10.0.9')) || + ($data{calculate} eq "CSS" && + number_ver($data{linuxver}) > number_ver('10.4.99')) || ($data{calculate} eq "CDS" && number_ver($data{linuxver}) > number_ver('10.4.99')) ) && !defined $data{arg}{'force'} @@ -4236,7 +4239,9 @@ sub configure{ } #удалим ссылку net.eth0, т.к. во всех десктопах, кроме CLS будет использоваться networkmanager - if($data{calculate} ne "CDS" && $data{calculate} ne "CLS"){system "$data{path} rm -f $data{chroot}/etc/init.d/net.eth0";} + if($data{calculate} ne "CDS" && $data{calculate} ne "CSS" && $data{calculate} ne "CLS"){ + system "$data{path} rm -f $data{chroot}/etc/init.d/net.eth0"; + } #если система собирается не из CLS if($data{stage} !~m/iso$/){