Add support Calculate Linux Desktop GNOME (CLDG).

master
Трацевский Александр 15 years ago
parent 4153653133
commit adfeb157ef

@ -0,0 +1,5 @@
#------------------------------------------------------------------------------
# Мета-пакет зависимостей
#------------------------------------------------------------------------------
app-misc/cldg-meta

@ -4,26 +4,26 @@ INCLUDE common.cfg
MENU TITLE Welcome to Calculate Linux (#-march-#)
LABEL cld
#?calculate=CLD#
#?calculate=CLD?calculate=CLDG?calculate=CLDX#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveDVD
#calculate#
#?calculate=CLS#
MENU LABEL #-calculatename-# #-linuxver-# LiveCD
#calculate#
#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
#?calculate=CLSG?calculate=CLSK#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD
#calculate#
KERNEL /boot/vmlinuz
APPEND root=/dev/ram0 initrd=/boot/initrd init=/linuxrc looptype=squashfs unionfs doload=squashfs,isofs,unionfs loop=/#-squash_cur-# nodevfs cdroot video=uvesafb:ywrap,1024x768-32@60,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet noresume doscsi
LABEL cld-docache
#?calculate=CLD#
#?calculate=CLD?calculate=CLDG?calculate=CLDX#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveDVD (RAM)
#calculate#
#?calculate=CLS#
MENU LABEL #-calculatename-# #-linuxver-# LiveCD (RAM)
#calculate#
#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
#?calculate=CLSG?calculate=CLSK#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD (RAM)
#calculate#
KERNEL /boot/vmlinuz
@ -32,10 +32,10 @@ LABEL cld-docache
#?calculate!=CLS#
LABEL cld-nox
#calculate#
#?calculate=CLD#
#?calculate=CLD?calculate=CLDG?calculate=CLDX#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveDVD (No-X)
#calculate#
#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
#?calculate=CLSG?calculate=CLSK#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD (No-X)
#calculate#
#?calculate!=CLS#
@ -44,13 +44,13 @@ LABEL cld-nox
#calculate#
LABEL cld-builder
#?calculate=CLD#
#?calculate=CLD?calculate=CLDG?calculate=CLDX#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveDVD Builder
#calculate#
#?calculate=CLS#
MENU LABEL #-calculatename-# #-linuxver-# LiveCD Builder
#calculate#
#?calculate=CLSG?calculate=CLSK?calculate=CLDX#
#?calculate=CLSG?calculate=CLSK#
MENU LABEL #-calculatename-# #-linuxver-# #-calculatesubname-# LiveCD Builder
#calculate#
KERNEL /boot/vmlinuz

@ -518,7 +518,7 @@ sub getarg{
printmes(gettext('Similarly for optional arguments').".\n\n");
printmes(gettext('Location').":\n");
printmes(" -s, --os=[CLD|CLDX|CLS|CLSG|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Linux Scratch GNOME, Calculate Directory Server)\n");
printmes(" -s, --os=[CLD|CLDG|CLDX|CLS|CLSG|CDS] "); printmes(gettext('select operation system')); printmes(" (Calculate Linux Desktop KDE, Calculate Linux Desktop GNOME, Calculate Linux Desktop XFCE, Calculate Linux Scratch, Calculate Linux Scratch GNOME, 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");
@ -827,6 +827,7 @@ sub welcome{
#обозначение зарезервированных версий систем
%{$data{ver}} = (
CLD => "Calculate Linux Desktop",
CLDG => "Calculate Linux Desktop",
CLDX => "Calculate Linux Desktop",
CDS => "Calculate Directory Server",
CLS => "Calculate Linux Scratch",
@ -835,6 +836,7 @@ sub welcome{
);
%{$data{ver_desktop}} = (
CLD => "KDE",
CLDG => "GNOME",
CLDX => "XFCE",
CLSG => "GNOME",
CLSK => "KDE",
@ -2904,6 +2906,8 @@ sub checkready{
if(
(($data{calculate} eq "CLD" &&
number_ver($data{linuxver}) > number_ver('10.0.9')) ||
($data{calculate} eq "CLDG" &&
number_ver($data{linuxver}) > number_ver('10.0.9')) ||
($data{calculate} eq "CLDX" &&
number_ver($data{linuxver}) > number_ver('10.0.9')) ||
($data{calculate} eq "CLS" &&

@ -7,6 +7,6 @@ DISPLAYMANAGER="kdm"
#?calculate=CLDX#
DISPLAYMANAGER="slim"
#calculate#
#?calculate=CLSG#
#?calculate=CLSG?calculate=CLDG#
DISPLAYMANAGER="gdm"
#calculate#

Loading…
Cancel
Save