Commit d0fa0bde authored by Christopher Huhn's avatar Christopher Huhn
Browse files

Merge parts of Stretch default config that will not do harm on Wheezy and Jessie

parent aa1f51f8
......@@ -4,5 +4,5 @@ maintainer_email "hpc@gsi.de"
license "All rights reserved"
description "Installs/Configures fai"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "0.7.6"
version "0.8.0"
depends "nfs"
......@@ -102,8 +102,8 @@ node.fai.flavors.each do |f, config|
template "#{configdir}/NFSROOT" do
source "NFSROOT.erb"
variables(
:extra_pkgs => pkgs
:install_action => 'install' if codename == 'stretch'
:extra_pkgs => pkgs,
:install_action => ((codename == 'stretch')?'install':nil)
)
mode 0644
notifies :run, "execute[update-#{f}-nfsroot]"
......
# package list for creating the NFSROOT
PACKAGES aptitude
nfs-common fai-nfsroot module-init-tools ssh rdate lshw rpcbind
rsync lftp less dump reiserfsprogs e2fsprogs usbutils
PACKAGES <%= @install_action || 'aptitude' %>
nfs-common fai-nfsroot ssh rdate lshw rpcbind
rsync lftp less dump reiserfsprogs e2fsprogs usbutils
hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
dnsutils ntpdate dosfstools xfsprogs xfsdump
dnsutils ntpdate dosfstools xfsprogs xfsdump btrfs-tools
procinfo numactl dialog
iproute udev subversion
console-common kbd
iproute netselect moreutils udev subversion
xz-utils
cupt
cupt
syslinux-common
curl wget- netcat-traditional
ca-certificates # for get-config-dir-https
nmap
# some network cards needs firmware
firmware-bnx2 firmware-bnx2x firmware-realtek
#firmware-linux-nonfree
# dracut can replace live-boot
dracut-network live-boot- live-boot-initramfs-tools-
......@@ -25,23 +32,26 @@ dracut-network live-boot- live-boot-initramfs-tools-
# you should not edit the lines below
# architecture dependend list of packages that are installed
#git # git consumes a lot of disk space on the FAI CD (ISO 9660)
#git # git consumes a lot of disk space on the FAI CD
lsb-release # used to define classes based on release code names eg. WHEEZY
# The following packages where added via Chef attributes:
<%= @extra_pkgs.join(' ') %>
PACKAGES aptitude I386
grub read-edid
linux-image-686
PACKAGES <%= @install_action || 'aptitude' %> I386
grub-pc
linux-image-686-pae
# packages for Ubuntu natty/oneiric/precise:
# linux-image-generic live-boot
PACKAGES aptitude AMD64
grub
PACKAGES <%= @install_action || 'aptitude' %> AMD64
grub-pc
linux-image-amd64
# packages for Ubuntu natty/oneiric/precise:
# linux-image-generic live-boot
PACKAGES install UBUNTU
upstart-sysv
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment