[Global] Ajout de console-setup pour les non domus, et adieu lenny/etch

This commit is contained in:
Pierre-Elliott Bécue 2013-08-14 23:57:28 +02:00
parent 0643b71c7b
commit 21af4273db
6 changed files with 37 additions and 31 deletions

View file

@ -1,9 +1,6 @@
<Base> <Base>
<Group name="crans"> <Group name="crans">
<!-- Les paquets utiles pour l'utilisation de tous les jours --> <!-- Les paquets utiles pour l'utilisation de tous les jours -->
<Group name="lenny">
<Package name="emacs22-nox"/>
</Group>
<Group name="squeeze"> <Group name="squeeze">
<Package name="emacs23-nox"/> <Package name="emacs23-nox"/>
</Group> </Group>
@ -26,10 +23,8 @@
<Package name="tree"/> <Package name="tree"/>
<Package name="vim"/> <Package name="vim"/>
<Package name="zsh"/> <Package name="zsh"/>
<Group name="debian-version=etch" negate="true">
<Package name="bash-completion"/> <Package name="bash-completion"/>
</Group> </Group>
</Group>
<Group name="server-x"> <Group name="server-x">
<Package name="gitk"/> <Package name="gitk"/>

View file

@ -0,0 +1,4 @@
<Bundle name="console-setup" version="2.0">
<Package name="console-setup"/>
<Path name="/etc/default/console-setup"/>
</Bundle>

View file

@ -0,0 +1,16 @@
# CONFIGURATION FILE FOR SETUPCON
# Consult the console-setup(5) manual page.
ACTIVE_CONSOLES="/dev/tty[1-6]"
CHARMAP="UTF-8"
CODESET="Lat15"
FONTFACE="Fixed"
FONTSIZE="8x16"
VIDEOMODE=
# The following is an example how to use a braille font
# FONT='lat9w-08.psf.gz brl-8x8.psf'

View file

@ -0,0 +1,3 @@
<FileInfo>
<Info owner='root' group='root' perms='0644'/>
</FileInfo>

View file

@ -446,9 +446,7 @@
<!-- +===================+ --> <!-- +===================+ -->
<Group name="debian" category="linux-distribution"/> <Group name="debian" category="linux-distribution"/>
<Group name="lenny" category="debian-version"/>
<Group name="sid" category="debian-version"/> <Group name="sid" category="debian-version"/>
<Group name="etch" category="debian-version"/>
<Group name="squeeze" category="debian-version"/> <Group name="squeeze" category="debian-version"/>
<Group name="wheezy" category="debian-version"/> <Group name="wheezy" category="debian-version"/>
@ -526,25 +524,12 @@
<Bundle name="generate"/> <Bundle name="generate"/>
</Group> </Group>
<Group name="crans-etch" public="true"
comment="profile minimal pour etch">
<Group name="crans-common"/>
<Group name="etch"/>
<Group name="openntpd"/>
</Group>
<Group name="crans-lenny" public="true"
comment="profile minimal pour lenny">
<Group name="crans-common"/>
<Group name="lenny"/>
<Group name="openntpd"/>
</Group>
<Group name="crans-squeeze" public="true" <Group name="crans-squeeze" public="true"
comment="profile minimal pour squeeze"> comment="profile minimal pour squeeze">
<Group name="crans-common"/> <Group name="crans-common"/>
<Group name="squeeze"/> <Group name="squeeze"/>
<Group name="ntp"/> <Group name="ntp"/>
<Group name="console-setup"/>
</Group> </Group>
<Group name="crans-domu-squeeze" public="true" <Group name="crans-domu-squeeze" public="true"
@ -555,6 +540,13 @@
<Group name="ntpdate"/> <Group name="ntpdate"/>
</Group> </Group>
<Group name="crans-wheezy" public="true"
comment="profile minimal pour wheezy">
<Group name="crans-common"/>
<Group name="wheezy"/>
<Group name="ntp"/>
</Group>
<Group name="crans-domu-wheezy" public="true" <Group name="crans-domu-wheezy" public="true"
comment="profile minimal pour wheezy"> comment="profile minimal pour wheezy">
<Group name="crans-common"/> <Group name="crans-common"/>
@ -568,13 +560,6 @@
<Group name="domu"/> <Group name="domu"/>
</Group> </Group>
<Group name="crans-wheezy" public="true"
comment="profile minimal pour wheezy">
<Group name="crans-common"/>
<Group name="wheezy"/>
<Group name="ntp"/>
</Group>
<Group name="crans-dom0-wheezy" public="true" <Group name="crans-dom0-wheezy" public="true"
comment="groupe crans pour un dom0 sous wheezy"> comment="groupe crans pour un dom0 sous wheezy">
<Group name="crans"/> <Group name="crans"/>
@ -1151,6 +1136,11 @@
<Group name="home-permanent"/> <Group name="home-permanent"/>
</Group> </Group>
<Group name="console-setup"
comment="Setup des layouts sur tty">
<Bundle name="console-setup"/>
</Group>
<Group name="ntp" <Group name="ntp"
comment="Client NTP en daemon"> comment="Client NTP en daemon">
<Bundle name="ntp"/> <Bundle name="ntp"/>

View file

@ -149,8 +149,6 @@ if not has("db-replicat-test"):
@ @
@access to dn="ou=data,dc=crans,dc=org" @access to dn="ou=data,dc=crans,dc=org"
@ by anonymous search @ by anonymous search
if has("crans-lenny"):
@ by dn.regex="cn=(postfix|intranet|dovecot),dc=crans,dc=org" search
@ by * break @ by * break
@ @
@access to dn.subtree="ou=Group,dc=crans,dc=org" @access to dn.subtree="ou=Group,dc=crans,dc=org"