Merge branch 'master' of csclub:projects/packages

This commit is contained in:
Michael Spang 2011-03-12 01:03:58 -05:00
commit de67d544b8
2 changed files with 6 additions and 5 deletions

View File

@ -43,13 +43,13 @@ profiles csclub server machine i386 general-use squeeze;
# Computer Science Club Servers (Restricted)
@glomag
profiles csclub server machine amd64 lenny;
profiles csclub server machine amd64 squeeze;
@sodium-benzoate
profiles csclub server machine amd64 lenny;
profiles csclub server machine amd64 squeeze;
@ginseng
profiles csclub server machine amd64 lenny;
profiles csclub server machine amd64 squeeze;
@artificial-flavours
profiles csclub server machine i386 squeeze;

View File

@ -46,7 +46,8 @@ if @core {
# physical machine (non virtual server)
if @machine {
install lm-sensors smartmontools hwinfo lshw @armel mtd-utils
@x86 acpid @x86 acpi @x86 @!lucid @!maverick acpi-support-base;
@x86 acpid @x86 acpi @x86 @!lucid @!maverick acpi-support-base
kexec-tools;
};
# container (virtual server)
@ -469,5 +470,5 @@ if @!container {
@powerpc install linux-image-powerpc;
@alpha install linux-image-alpha
@mips install linux-image-mips;
@armel install linux-image-armel;
@armel install;
};