[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-6-g6423be6
Andreas B. Mundt
andi.mundt at web.de
Thu Jun 28 18:46:23 UTC 2012
The following commit has been merged in the master branch:
commit 6423be67d11ecf20844eaf0a31b5687ed3219eca
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Wed Jun 27 22:09:52 2012 +0200
Sync with FAI upstream examples.
Sync with FAI 4.0.3 (git://github.com/faiproject/fai.git, commit
6168dab021). Keep apt-cacher-ng for now.
diff --git a/fai/config/class/20-hwdetect.source b/fai/config/class/20-hwdetect.source
index da8a0b0..4b4aacd 100755
--- a/fai/config/class/20-hwdetect.source
+++ b/fai/config/class/20-hwdetect.source
@@ -1,6 +1,6 @@
#! /bin/bash
-# (c) Thomas Lange, 2002-2009, lange at informatik.uni-koeln.de
+# (c) Thomas Lange, 2002-2012, lange at informatik.uni-koeln.de
# NOTE: Files named *.source will be evaluated, but their output ignored. Instead
# the contents of $newclasses will be added to the list of defined classes.
@@ -9,25 +9,20 @@
echo 0 > /proc/sys/kernel/printk
-# load all IDE drivers
-
-# DMA does not work if we load all modules in drivers/ide, so only try pci modules
-if [ -d /lib/modules/$(uname -r)/kernel/drivers/ide/pci ] ; then
- mod=$(find /lib/modules/$(uname -r)/kernel/drivers/ide/pci -type f | sed 's/\.ko$//' | sed 's/.*\///')
- for i in $mod; do
- modprobe $i 1>/dev/null 2>&1
+# wheezy does not have -m and modules.pcimap
+depmod -m 2>/dev/null
+if [ -f "/lib/modules/`uname -r`/modules.pcimap" ]; then
+ for module in $(pcimodules) ; do
+ [ "$verbose" ] && echo loading kernel module $module
+ modprobe "$module"
done
fi
-# Booting from CD does not always enable DMA.
-for d in $( echo /proc/ide/hd[a-z] 2>/dev/null); do
- [ -d $d ] && echo "using_dma:1" > $d/settings
-done
-
-# load additional kernel modules
-kernelmodules="usbkbd ide-disk"
+# here, you can load modules depending on the kernel version
+kernelmodules="sd_mod sr_mod"
case $(uname -r) in
2.6*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;;
+ 3*) kernelmodules="$kernelmodules mptspi dm-mod md-mod aes dm-crypt" ;;
esac
for mod in $kernelmodules; do
@@ -35,13 +30,7 @@ for mod in $kernelmodules; do
modprobe -a $mod 1>/dev/null 2>&1
done
-# let discover do most of the job
-#[ -x /sbin/discover-modprobe ] && /sbin/discover-modprobe
-
-# now we can mount the USB filesystem
-mount -t usbfs usbfs /proc/bus/usb
-
-modprobe -a sd_mod sr_mod
+ip ad show up | egrep -iv 'loopback|127.0.0.1|::1/128|_lft'
echo $printk > /proc/sys/kernel/printk
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 8bb8e12..ae4a177 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -1,6 +1,6 @@
#! /bin/bash
-# assign classes hosts
+# assign classes to hosts
# Most of the classes in $MAINSERVER_* should be self-contained and not
# specific to a given setup. Use the SERVER_* or CLIENT_* class for
@@ -40,31 +40,32 @@ WORKSTATION_A="LVM5_A LOG_CLIENT LDAP_CLIENT NFS_CLIENT KERBEROS_CLIENT CLIENT_A
# Use a list of classes for your machine:
case $HOSTNAME in
faiserver)
- echo "FAIBASE DEMO FAISERVER" ;;
- demohost)
- echo "FAIBASE DHCPC DEMO" ;;
+ echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
+ demohost|client*)
+ echo "FAIBASE DEBIAN DHCPC DEMO" ;;
+ xfcehost)
+ echo "FAIBASE DEBIAN DHCPC DEMO XORG XFCE" ;;
gnomehost)
- echo "FAIBASE DHCPC DEMO XORG GNOME";;
+ echo "FAIBASE DEBIAN DHCPC DEMO XORG GNOME" ;;
atom*)
- echo "FAIBASE DHCPC DEMO" ;;
+ echo "FAIBASE DEBIAN DHCPC DEMO" ;;
bear)
- echo "FAIBASE DHCPC LVM_XEN_SERVER XEN" ;;
+ echo "FAIBASE DEBIAN DHCPC LVM_XEN_SERVER XEN" ;;
puma)
- echo "FAIBASE DHCPC RAID_XEN_VIRTUAL" ;;
+ echo "FAIBASE DEBIAN DHCPC RAID_XEN_VIRTUAL" ;;
mainserver)
- echo "FAIBASE FAISERVER $MAINSERVER_A" ;;
+ echo "FAIBASE DEBIAN FAISERVER $MAINSERVER_A" ;;
workstation*)
## You might want to add some localization class like:
- # echo "FAIBASE DHCPC $WORKSTATION_A XORG DESKTOP GERMAN" ;;
- echo "FAIBASE DHCPC $WORKSTATION_A XORG DESKTOP" ;;
+ # echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP GERMAN" ;;
+ echo "FAIBASE DEBIAN DHCPC $WORKSTATION_A XORG DESKTOP" ;;
diskless)
- echo "$WORKSTATION_A XORG DISKLESS_CLIENT"
+ echo "DEBIAN $WORKSTATION_A XORG DISKLESS_CLIENT"
## skip GRUB_PC below:
exit 0 ;;
*)
- echo "FAIBASE DHCPC" ;;
+ echo "FAIBASE DEBIAN DHCPC" ;;
esac
-(ifclass I386 || ifclass AMD64) && echo GRUB_PC
-
+ifclass -o I386 AMD64 && echo GRUB_PC
exit 0
diff --git a/fai/config/class/DEBIAN.var b/fai/config/class/DEBIAN.var
new file mode 100644
index 0000000..a46a885
--- /dev/null
+++ b/fai/config/class/DEBIAN.var
@@ -0,0 +1,9 @@
+CONSOLEFONT=
+KEYMAP=us-latin1
+
+# MODULESLIST contains modules that will be loaded by the new system,
+# not during installation these modules will be written to /etc/modules
+# If you need a module during installation, add it to $kernelmodules
+# in 20-hwdetect.source.
+MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
+
diff --git a/fai/config/class/FAIBASE.var b/fai/config/class/FAIBASE.var
index c3901d7..023dab3 100644
--- a/fai/config/class/FAIBASE.var
+++ b/fai/config/class/FAIBASE.var
@@ -3,9 +3,6 @@
# allow installation of packages from unsigned repositories
FAI_ALLOW_UNSIGNED=1
-CONSOLEFONT=
-KEYMAP=us-latin1
-
# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not.
UTC=yes
TIMEZONE=Europe/Berlin
@@ -14,14 +11,5 @@ TIMEZONE=Europe/Berlin
# pw is "fai"
ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
-# MODULESLIST contains modules that will be loaded by the new system,
-# not during installation these modules will be written to /etc/modules
-# If you need a module during installation, add it to $kernelmodules
-# in 20-hwdetect.source. But discover should do most of this job
-MODULESLIST="usbkbd ehci-hcd ohci-hcd uhci-hcd usbhid psmouse"
-
-# erros in tasks greater than this value will cause the installation to stop
+# errors in tasks greater than this value will cause the installation to stop
STOP_ON_ERROR=700
-
-# use the new partitioning tool
-USE_SETUP_STORAGE=1
diff --git a/fai/config/class/GERMAN.var b/fai/config/class/GERMAN.var
index 219e3f7..8638a75 100644
--- a/fai/config/class/GERMAN.var
+++ b/fai/config/class/GERMAN.var
@@ -1,2 +1,3 @@
-# german environment
+# german environment (for Debian)
KEYMAP=de-latin1-nodeadkeys
+
diff --git a/fai/config/debconf/DEBIAN b/fai/config/debconf/DEBIAN
new file mode 100644
index 0000000..e9dc3c1
--- /dev/null
+++ b/fai/config/debconf/DEBIAN
@@ -0,0 +1,9 @@
+exim4-config exim4/dc_eximconfig_configtype select local delivery only; not on a network
+locales locales/default_environment_locale select en_US.UTF-8
+locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
+keyboard-configuration keyboard-configuration/modelcode string pc105
+keyboard-configuration keyboard-configuration/xkb-keymap select us
+keyboard-configuration keyboard-configuration/variant select USA
+keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC
+keyboard-configuration keyboard-configuration/layoutcode string us
+keyboard-configuration keyboard-configuration/optionscode string ctrl:nocaps,terminate:ctrl_alt_bksp
diff --git a/fai/config/debconf/FAIBASE b/fai/config/debconf/FAIBASE
deleted file mode 100644
index c43c2a8..0000000
--- a/fai/config/debconf/FAIBASE
+++ /dev/null
@@ -1,9 +0,0 @@
-passwd passwd/shadow boolean true
-exim4-config exim4/dc_eximconfig_configtype select local delivery only; not on a network
-locales locales/default_environment_locale select en_US.UTF-8
-locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
-xserver-xorg xserver-xorg/config/inputdevice/keyboard/model string pc105
-xserver-xorg xserver-xorg/autodetect_monitor boolean false
-xserver-xorg xserver-xorg/autodetect_keyboard boolean true
-xserver-xorg xserver-xorg/autodetect_mouse boolean true
-xserver-xorg xserver-xorg/autodetect_video_card boolean true
diff --git a/fai/config/debconf/FAISERVER b/fai/config/debconf/FAISERVER
deleted file mode 100644
index be6e8b4..0000000
--- a/fai/config/debconf/FAISERVER
+++ /dev/null
@@ -1,2 +0,0 @@
-# Should the server be started by inetd?
-tftpd-hpa tftpd-hpa/use_inetd boolean false
diff --git a/fai/config/debconf/GERMAN b/fai/config/debconf/GERMAN
index f2fe88e..a1fbc27 100644
--- a/fai/config/debconf/GERMAN
+++ b/fai/config/debconf/GERMAN
@@ -1,4 +1,8 @@
locales locales/default_environment_locale select de_DE.UTF-8
-locales locales/locales_to_be_generated multiselect de_DE.UTF-8 UTF-8, en_US.UTF-8 UTF-8
-keyboard-configuration keyboard-configuration/xkb-keymap select de
-keyboard-configuration keyboard-configuration/layoutcode string de
+locales locales/locales_to_be_generated multiselect de_DE.UTF-8 UTF-8
+keyboard-configuration keyboard-configuration/modelcode string pc105
+keyboard-configuration keyboard-configuration/xkb-keymap select de
+keyboard-configuration keyboard-configuration/variant select Germany
+keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC
+keyboard-configuration keyboard-configuration/layoutcode string de
+keyboard-configuration keyboard-configuration/optionscode string ctrl:nocaps,terminate:ctrl_alt_bksp
diff --git a/fai/config/disk_config/FAIBASE b/fai/config/disk_config/FAIBASE
index 0f44dcc..f03fd0c 100644
--- a/fai/config/disk_config/FAIBASE
+++ b/fai/config/disk_config/FAIBASE
@@ -4,9 +4,9 @@
disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
-primary / 250 ext3 rw,noatime,errors=remount-ro
-logical swap 200-1000 swap rw
-logical /var 600-1300 ext3 rw,noatime createopts="-L var -m 5" tuneopts="-c 0 -i 0"
-logical /tmp 100-1G ext3 rw,noatime,nosuid,nodev createopts="-L tmp -m 0" tuneopts="-c 0 -i 0"
-logical /usr 1G-8G ext3 rw,noatime,nodev createopts="-L usr"
-logical /home 100-50% ext3 rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0"
+primary / 250 ext4 rw,noatime,errors=remount-ro
+logical swap 200-1000 swap rw
+logical /var 600-1300 ext4 rw,noatime createopts="-L var -m 5" tuneopts="-c 0 -i 0"
+logical /tmp 100-1G ext4 rw,noatime,nosuid,nodev createopts="-L tmp -m 0" tuneopts="-c 0 -i 0"
+logical /usr 1G-8G ext4 rw,noatime,nodev createopts="-L usr"
+logical /home 100-50% ext4 rw,noatime,nosuid,nodev createopts="-L home -m 1" tuneopts="-c 0 -i 0"
diff --git a/fai/config/disk_config/FAISERVER b/fai/config/disk_config/FAISERVER
index 43d0ad0..234fa6c 100644
--- a/fai/config/disk_config/FAISERVER
+++ b/fai/config/disk_config/FAISERVER
@@ -1,13 +1,13 @@
-# example of new config file for setup-storage
+# config file for an FAI install server
#
# <type> <mountpoint> <size> <fs type> <mount options> <misc options>
disk_config disk1 disklabel:msdos fstabkey:uuid
-primary / 300 ext3 rw,noatime,errors=remount-ro
-logical swap 200-1000 swap rw
-logical /var 600-5G ext3 rw,noatime,nosuid,nodev createopts="-m15" tuneopts="-c 0 -i 0"
-logical /tmp 100-1000 ext3 rw,noatime,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0"
-logical /usr 1G-6G ext3 rw,noatime
-logical /home 100-40% ext3 rw,noatime,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"
-logical /srv 1G-50% ext3 rw,noatime createopts="-m 1" tuneopts="-c 0 -i 0"
+primary / 300 ext4 rw,noatime,errors=remount-ro
+logical swap 200-1000 swap rw
+logical /var 600-5G ext4 rw,noatime,nosuid,nodev createopts="-m15" tuneopts="-c 0 -i 0"
+logical /tmp 100-1000 ext4 rw,noatime,nosuid,nodev createopts="-m 0" tuneopts="-c 0 -i 0"
+logical /usr 1G-6G ext4 rw,noatime
+logical /home 100-40% ext4 rw,noatime,nosuid,nodev createopts="-m 1" tuneopts="-c 0 -i 0"
+logical /srv 1G-50% ext4 rw,noatime createopts="-m 1" tuneopts="-c 0 -i 0"
diff --git a/fai/config/disk_config/LVM_XEN_SERVER b/fai/config/disk_config/LVM_XEN_SERVER
index dded9f7..e15e889 100644
--- a/fai/config/disk_config/LVM_XEN_SERVER
+++ b/fai/config/disk_config/LVM_XEN_SERVER
@@ -1,24 +1,24 @@
disk_config disk1 fstabkey:uuid
-primary /boot 100 ext3 rw
+primary /boot 100 ext4 rw
primary swap 256 swap sw
-primary / 2000 ext3 rw
-logical /tmp 1000 ext3 rw,nosuid
-logical /usr 2000 ext3 rw
-logical /var 2000 ext3 rw
+primary / 2000 ext4 rw
+logical /tmp 1000 ext4 rw,nosuid
+logical /usr 2000 ext4 rw
+logical /var 2000 ext4 rw
logical - 0- - -
disk_config lvm
vg XENU disk1.8
-XENU-worm_ - 2000 ext3 -
+XENU-worm_ - 2000 ext4 -
XENU-wormswap - 500 swap -
-XENU-worm_tmp - 500 ext3 -
-XENU-worm_usr - 2000 ext3 -
-XENU-worm_var - 2000 ext3 -
-XENU-bull_ - 2000 ext3 -
+XENU-worm_tmp - 500 ext4 -
+XENU-worm_usr - 2000 ext4 -
+XENU-worm_var - 2000 ext4 -
+XENU-bull_ - 2000 ext4 -
XENU-bullswap - 500 swap -
-XENU-bull_tmp - 500 ext3 -
-XENU-bull_usr - 2000 ext3 -
-XENU-bull_var - 2000 ext3 -
-XENU-bull_var_spool - 4000 ext3 -
-XENU-bull_var_mail - 100000 ext3 -
+XENU-bull_tmp - 500 ext4 -
+XENU-bull_usr - 2000 ext4 -
+XENU-bull_var - 2000 ext4 -
+XENU-bull_var_spool - 4000 ext4 -
+XENU-bull_var_mail - 100000 ext4 -
diff --git a/fai/config/disk_config/RAID_XEN_VIRTUAL b/fai/config/disk_config/RAID_XEN_VIRTUAL
index 0c43674..ecc2b66 100644
--- a/fai/config/disk_config/RAID_XEN_VIRTUAL
+++ b/fai/config/disk_config/RAID_XEN_VIRTUAL
@@ -13,8 +13,8 @@ primary - 2000 - -
primary - 2000 - -
disk_config raid
-raid1 / hda1,sda1 ext3 rw
+raid1 / hda1,sda1 ext4 rw
raid1 swap hda2,sda2 swap sw
-raid1 /tmp hda3,sda3 ext3 rw,nosuid,nodev
-raid1 /usr hda4,sda4 ext3 rw
-raid1 /var hda5,sda5 ext3 rw
+raid1 /tmp hda3,sda3 ext4 rw,nosuid,nodev
+raid1 /usr hda4,sda4 ext4 rw
+raid1 /var hda5,sda5 ext4 rw
diff --git a/fai/config/files/boot/grub/menu.lst/GRUB b/fai/config/files/boot/grub/menu.lst/GRUB
deleted file mode 100644
index 18ce0a2..0000000
--- a/fai/config/files/boot/grub/menu.lst/GRUB
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-timeout 5
-default 0
-color cyan/blue white/blue
-
-### BEGIN AUTOMAGIC KERNELS LIST
-## lines between the AUTOMAGIC KERNELS LIST markers will be modified
-## by the debian update-grub script except for the default optons below
-
-## DO NOT UNCOMMENT THEM, Just edit them to your needs
-
-## ## Start Default Options ##
-## default kernel options
-# kopt=root=#ROOT_PARTITION# ro
-
-## default grub root device
-## e.g. groot=(hd0,0)
-# groot=#GROOT#
-
-## should update-grub create alternative boot options
-## e.g. alternative=true
-## alternative=false
-# alternative=true
-
-## should update-grub lock alternative boot options
-## e.g. lockalternative=true
-## lockalternative=false
-# lockalternative=true
-
-## altoption boot targets option
-## multiple altoptions lines are allowed
-## e.g. altoptions=(extra menu suffix) extra boot options
-## altoptions=(recovery mode) single
-# altoptions=(recovery mode) single
-
-## add memtest86 if found
-# memtest86=true
-
-## ## End Default Options ##
-
-### END DEBIAN AUTOMAGIC KERNELS LIST
-
-
diff --git a/fai/config/files/boot/grub/menu.lst/postinst b/fai/config/files/boot/grub/menu.lst/postinst
deleted file mode 100755
index d407ac6..0000000
--- a/fai/config/files/boot/grub/menu.lst/postinst
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/bash
-
-error=0 ; trap "error=$((error|1))" ERR
-
-set -a
-
-if [ -r $LOGDIR/disk_var.sh ] ; then
- . $LOGDIR/disk_var.sh
-else
- echo "disk_var.sh not found!"
- exit 0
-fi
-
-# if class NOMBR is defined, write boot loader into root partition, not into mbr
-ifclass NOMBR && BOOT_DEVICE=$BOOT_PARTITION
-
-[ -z "$BOOT_DEVICE" ] && exit 701
-[ -z "$BOOT_PARTITION" ] && exit 702
-
-grub-install --no-floppy --root-directory=$target $BOOT_DEVICE
-GROOT=$(device2grub $BOOT_PARTITION)
-perl -pi -e 's/#(\w+)#/$ENV{$1}/g' $2
-$ROOTCMD /usr/sbin/update-grub
-echo "Grub installed on $BOOT_DEVICE on $GROOT"
-
-exit $error
-
diff --git a/fai/config/files/etc/fai/NFSROOT/FAISERVER b/fai/config/files/etc/fai/NFSROOT/FAISERVER
deleted file mode 100644
index 6be52eb..0000000
--- a/fai/config/files/etc/fai/NFSROOT/FAISERVER
+++ /dev/null
@@ -1,42 +0,0 @@
-# package list for creating the NFSROOT
-
-PACKAGES aptitude
-nfs-common fai-nfsroot module-init-tools ssh rdate lshw portmap
-rsync lftp less dump reiserfsprogs e2fsprogs usbutils
-hwinfo psmisc pciutils hdparm smartmontools parted mdadm lvm2
-dnsutils ntpdate dosfstools jove xfsprogs xfsdump
-procinfo dialog discover
-console-tools console-common
-iproute udev subversion liblinux-lvm-perl
-
-# needed for the simple examples
-cfengine2 libapt-pkg-perl
-
-# you should not edit the lines below
-# architecture dependend list of packages that are installed
-
-PACKAGES aptitude I386
-grub lilo read-edid
-linux-image-686
-
-# packages for lenny:
-# linux-image-486 aufs-modules-2.6-486
-
-PACKAGES aptitude AMD64
-grub lilo
-linux-image-2.6-amd64
-# packages for lenny:
-# linux-image-2.6-amd64 aufs-modules-2.6-amd64
-
-PACKAGES aptitude IA64
-elilo gnu-efi efibootmgr
-
-PACKAGES aptitude SPARC
-silo sparc-utils
-
-PACKAGES aptitude ALPHA
-aboot
-
-PACKAGES aptitude POWERPC
-linux-image-2.6-powerpc
-yaboot
diff --git a/fai/config/files/etc/fai/fai.conf/FAISERVER b/fai/config/files/etc/fai/fai.conf/FAISERVER
new file mode 100644
index 0000000..4711cd1
--- /dev/null
+++ b/fai/config/files/etc/fai/fai.conf/FAISERVER
@@ -0,0 +1,8 @@
+# See fai.conf(5) for detailed information.
+
+# Account for saving log files and calling fai-chboot.
+LOGUSER=fai
+
+# URL to access the fai config space
+# If undefined, use default nfs://<install server>/$FAI_CONFIGDIR
+FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
new file mode 100644
index 0000000..d03d009
--- /dev/null
+++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
@@ -0,0 +1,14 @@
+# For a detailed description see nfsroot.conf(5)
+
+FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
+
+NFSROOT=/srv/fai/nfsroot
+TFTPROOT=/srv/tftp/fai
+NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
+FAI_DEBOOTSTRAP_OPTS="--exclude=info"
+
+# Configuration space
+FAI_CONFIGDIR=/srv/fai/config
+
+NFSROOT_ETC_HOSTS="192.168.33.250 faiserver"
+FAI_DEBOOTSTRAP="wheezy http://faiserver:9999/debian"
diff --git a/fai/config/files/etc/kernel-img.conf/DEFAULT b/fai/config/files/etc/kernel-img.conf/DEFAULT
deleted file mode 100644
index 27999ba..0000000
--- a/fai/config/files/etc/kernel-img.conf/DEFAULT
+++ /dev/null
@@ -1,5 +0,0 @@
-do_symlinks = Yes
-do_initrd = Yes
-silent_modules=yes
-clobber_modules=yes
-do_boot_enable=no
diff --git a/fai/config/files/etc/networks/FAIBASE b/fai/config/files/etc/networks/FAIBASE
deleted file mode 100644
index 7c62eaf..0000000
--- a/fai/config/files/etc/networks/FAIBASE
+++ /dev/null
@@ -1,3 +0,0 @@
-default 0.0.0.0
-loopback 127.0.0.0
-link-local 169.254.0.0
diff --git a/fai/config/hooks/instsoft.FAIBASE b/fai/config/hooks/instsoft.FAIBASE
deleted file mode 100755
index 123cbe5..0000000
--- a/fai/config/hooks/instsoft.FAIBASE
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-[ -s $target/etc/kernel-img.conf ] || fcopy -Bi /etc/kernel-img.conf
diff --git a/fai/config/hooks/savelog.LAST.source b/fai/config/hooks/savelog.LAST.source
index 48b138f..cb42234 100755
--- a/fai/config/hooks/savelog.LAST.source
+++ b/fai/config/hooks/savelog.LAST.source
@@ -28,14 +28,14 @@ No previous regular expression
No such
Device or resource busy
unknown option
-[a-z]\+\.log:E:
+[a-z]\+\.log:E:
No candidate version found
segfault
Couldn't find any package whose name or description matched
cannot create
The following packages have unmet dependencies"
-globalignorepatterns="[a-z]\+\.log:#
+globalignorepatterns="[a-z]\+\.log:#
Error: Driver 'pcspkr' is already registered, aborting
: bytes packets errors dropped
:+ error=0
@@ -73,7 +73,7 @@ RPC call returned error 101
deverror.out
(floppy), sector 0
mount version older than kernel
-Can't locate module
+Can't locate module
Warning only 896MB will be used.
hostname: Host name lookup failure
I can't tell the difference.
@@ -91,7 +91,7 @@ RPC: sendmsg returned error 101
can't print them to stdout. Define these classes
warning: downgrading
suppress emacs errors
-echo Error:
+echo Error:
Can't open dependencies file
documents in /usr/doc are no longer supported
if you have both a SCSI and an IDE CD-ROM
@@ -113,7 +113,7 @@ However, I can not read the target:
fai-kernels/modules.dep: No such file
Warning: The partition table looks like it was made
task_error=0
-^info: Trying to set
+^info: Trying to set
warning: /usr/lib/X11/fonts
can't read /etc/udev/rules.d/z25_persistent-net.rules
/cow': No such file or directory
@@ -122,7 +122,17 @@ X: bytes packets errors
ACPI Error
ACPI Warning
cannot stat \`/etc/modprobe.d/\*.conf'
-cdrom: open failed."
+cdrom: open failed.
+libgpg-error
+process \`kudzu' used the deprecated sysctl system call
+PM: Resume from disk failed
+JBD: barrier-based sync failed
+aufs: module is from the staging directory, the quality is unknown
+warning: linuxlogo stop runlevel arguments (none) do not match
+insserv: warning: script .\+ missing LSB tags and overrides
+live-premount.\+ If this fails
+cannot read table of mounted file systems
+failed to stat /dev/pts"
# add pattern on some conditions
if [ -n $FAI_ALLOW_UNSIGNED ] ; then
@@ -144,7 +154,7 @@ $myignorepatterns"
cd $LOGDIR || exit 3
if [ -s $errfile ]; then
- echo "Errorfile already exists. Aborting."
+ echo "Errorfile already exists. Aborting." >&2
exit
fi
@@ -155,8 +165,7 @@ if [ "$verbose" ]; then
fi
if [ -s $errfile ]; then
- echo "ERRORS found in log files. See $errfile"
+ echo "ERRORS found in log files. See $errfile" >&2
else
echo "Congratulations! No errors found in log files."
- export flag_reboot=1
fi
diff --git a/fai/config/package_config/DEFAULT b/fai/config/package_config/DEBIAN
similarity index 54%
rename from fai/config/package_config/DEFAULT
rename to fai/config/package_config/DEBIAN
index 881d85d..5078ab1 100644
--- a/fai/config/package_config/DEFAULT
+++ b/fai/config/package_config/DEBIAN
@@ -1,13 +1,13 @@
-PACKAGES aptitude-r I386
-linux-image-686
+PACKAGES aptitude I386
+linux-image-2.6-686 initramfs-tools
memtest86+
PACKAGES aptitude CHROOT
linux-image-686-
linux-image-amd64-
-PACKAGES aptitude-r AMD64
-linux-image-amd64
+PACKAGES aptitude AMD64
+linux-image-2.6-amd64 initramfs-tools
memtest86+
PACKAGES aptitude XEN
@@ -16,11 +16,5 @@ xen-linux-system-2.6.26-2-xen-amd64
PACKAGES aptitude DHCPC
isc-dhcp-client
-PACKAGES aptitude GRUB
-grub lilo-
-
PACKAGES aptitude GRUB_PC
-grub-pc grub- lilo-
-
-PACKAGES aptitude LILO
-lilo grub-
+grub-pc grub-legacy- lilo-
diff --git a/fai/config/package_config/DEMO b/fai/config/package_config/DEMO
index 0502f9b..ace8bad 100644
--- a/fai/config/package_config/DEMO
+++ b/fai/config/package_config/DEMO
@@ -3,7 +3,6 @@
PACKAGES aptitude
fortune-mod fortunes
rstat-client #rstatd
-rusers rusersd
# only when also class XORG is defined
PACKAGES aptitude XORG
diff --git a/fai/config/package_config/FAIBASE b/fai/config/package_config/FAIBASE
index 3997f26..7675831 100644
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@ -1,23 +1,23 @@
-PACKAGES aptitude
+PACKAGES aptitude DEBIAN
fai-client
-cfengine2
cron
debconf-utils
file
hdparm
less
nfs-common
-nscd
+rdate
rsync
openssh-client openssh-server
strace
-tcsh
time
procinfo
-exim4
+nullmailer
eject
locales
-console-common
+console-setup kbd
pciutils usbutils
lvm2
+
+nscd
bsd-mailx
diff --git a/fai/config/package_config/FAISERVER b/fai/config/package_config/FAISERVER
index 43d4656..3e1baa3 100644
--- a/fai/config/package_config/FAISERVER
+++ b/fai/config/package_config/FAISERVER
@@ -1,5 +1,12 @@
PACKAGES aptitude
fai-quickstart
+
+isc-dhcp-client
+debmirror tcpdump
+apache2
+genisoimage grub
+lftp
+syslinux-common
+
apt-cacher-ng
-tcpdump
whois
diff --git a/fai/config/package_config/GERMAN b/fai/config/package_config/GERMAN
index 765650c..351cbcf 100644
--- a/fai/config/package_config/GERMAN
+++ b/fai/config/package_config/GERMAN
@@ -1,3 +1,5 @@
PACKAGES aptitude
-german
-german-desktop
+task-german
+
+PACKAGES aptitude DESKTOP
+iceweasel-l10n-de
diff --git a/fai/config/package_config/GNOME b/fai/config/package_config/GNOME
index b2d1195..429586e 100644
--- a/fai/config/package_config/GNOME
+++ b/fai/config/package_config/GNOME
@@ -2,7 +2,7 @@ PACKAGES aptitude
iceweasel
#icedove
-menu gdm
+menu gdm3
gnome-core
gconf-editor
gnome-screensaver gnome-system-monitor gnome-system-tools
diff --git a/fai/config/package_config/XFCE b/fai/config/package_config/XFCE
new file mode 100644
index 0000000..a248674
--- /dev/null
+++ b/fai/config/package_config/XFCE
@@ -0,0 +1,5 @@
+PACKAGES aptitude
+xfce4 # base system
+xfce4-goodies # additional tools
+xdm
+iceweasel
diff --git a/fai/config/package_config/XORG b/fai/config/package_config/XORG
index 9c1735f..c062cb9 100644
--- a/fai/config/package_config/XORG
+++ b/fai/config/package_config/XORG
@@ -1,4 +1,4 @@
-PACKAGES aptitude
+PACKAGES aptitude DEBIAN
xorg xserver-xorg-video-all xserver-xorg-input-all
ttf-freefont
xscreensaver
diff --git a/fai/config/scripts/AMD64/99-discover-bug b/fai/config/scripts/AMD64/99-discover-bug
deleted file mode 100755
index 588a4bf..0000000
--- a/fai/config/scripts/AMD64/99-discover-bug
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /usr/sbin/cfagent -f
-
-# this is a workaround for bug #343338
-
-control:
- any::
- actionsequence = ( editfiles )
- EditFileSize = ( 30000 )
-
-editfiles:
- any::
- { ${target}/etc/discover-modprobe.conf
- ReplaceAll "^types=.*" With "types="
- }
diff --git a/fai/config/scripts/DEBIAN/10-rootpw b/fai/config/scripts/DEBIAN/10-rootpw
new file mode 100755
index 0000000..730a3b1
--- /dev/null
+++ b/fai/config/scripts/DEBIAN/10-rootpw
@@ -0,0 +1,9 @@
+#! /bin/bash
+
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
+
+# set root password
+$ROOTCMD usermod -p $ROOTPW root
+
+exit $error
+
diff --git a/fai/config/scripts/FAIBASE/30-interface b/fai/config/scripts/DEBIAN/30-interface
similarity index 64%
rename from fai/config/scripts/FAIBASE/30-interface
rename to fai/config/scripts/DEBIAN/30-interface
index d327f79..461a658 100755
--- a/fai/config/scripts/FAIBASE/30-interface
+++ b/fai/config/scripts/DEBIAN/30-interface
@@ -1,15 +1,17 @@
#! /bin/bash
-error=0 ; trap "error=$((error|1))" ERR
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
-if ifclass DHCPC && [ $FAI_ACTION != "softupdate" ] ; then
+if ifclass DHCPC && [ $FAI_ACTION != "softupdate" ]
+then
cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
auto lo eth0
iface lo inet loopback
iface eth0 inet dhcp
EOF
-else
+elif [ $FAI_ACTION != "softupdate" ]
+then
[ -n "$IPADDR" ] && cat > $target/etc/network/interfaces <<-EOF
# generated by FAI
auto lo eth0
@@ -21,15 +23,12 @@ else
gateway $GATEWAYS
EOF
[ -n "$NETWORK" ] && echo "localnet $NETWORK" > $target/etc/networks
+ [ -L $target/etc/resolv.conf ] || cp -p /etc/resolv.conf $target/etc
fi
-[ $FAI_ACTION == "install" ] && [ -s /etc/resolv.conf ] && \
- [ ! -L $target/etc/resolv.conf ] && cp -p /etc/resolv.conf $target/etc
-
-
# here fcopy is mostly used, when installing a client for running in a
# different subnet than during the installation
-fcopy -iU /etc/resolv.conf
-fcopy -iUM /etc/network/interfaces /etc/networks
+fcopy -i /etc/resolv.conf
+fcopy -iM /etc/network/interfaces /etc/networks
exit $error
diff --git a/fai/config/scripts/DEBIAN/40-misc b/fai/config/scripts/DEBIAN/40-misc
new file mode 100755
index 0000000..ef285e5
--- /dev/null
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -0,0 +1,23 @@
+#! /bin/bash
+
+# (c) Thomas Lange, 2001-2011, lange at debian.org
+# (c) Michael Goetze, 2010-2011, mgoetze at mgoetze.net
+
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
+
+# a list of modules which are loaded at boot time
+for module in $MODULESLIST; do
+ ainsl -a /etc/modules "^$module$"
+done
+
+fcopy -v /etc/hostname || echo $HOSTNAME > $target/etc/hostname
+ainsl -av /etc/mailname ${HOSTNAME}
+sed -i -e "s/^UTC.*/UTC=${UTC}/" $target/etc/default/rcS
+sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}/etc/inittab
+
+[ $FAI_ACTION = "softupdate" ] || cp /etc/fai/fai.conf $target/etc/fai/fai.conf
+ainsl -av /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
+
+fcopy -iv /etc/fai/fai.conf
+
+exit $error
diff --git a/fai/config/scripts/DEMO/10-misc b/fai/config/scripts/DEMO/10-misc
index ac9fb19..46cfa9f 100755
--- a/fai/config/scripts/DEMO/10-misc
+++ b/fai/config/scripts/DEMO/10-misc
@@ -1,17 +1,16 @@
#! /bin/bash
-# (c) Thomas Lange, 2001-2009, lange at debian.org
+# (c) Thomas Lange, 2001-2010, lange at debian.org
ifclass XORG && {
fcopy -M /etc/X11/xorg.conf
-# [ -n "$VIDEODRIVER" ] || VIDEODRIVER=vesa
-# grep -q %%VIDEODRIVER%% $target/etc/X11/xorg.conf &&
-# perl -pi.orig -pe "s/%%VIDEODRIVER%%/$VIDEODRIVER/" $target/etc/X11/xorg.conf
}
# add a demo user account
if ! $ROOTCMD getent passwd demo ; then
$ROOTCMD adduser --disabled-login --gecos "fai demo user" demo
-# echo "demo:$ROOTPW" | $ROOTCMD chpasswd --encrypted
$ROOTCMD usermod -p "$ROOTPW" demo
fi
+
+chmod -c 666 ${target}/dev/fd*
+chmod -c 444 ${target}/dev/sr*
diff --git a/fai/config/scripts/DEMO/30-demo b/fai/config/scripts/DEMO/30-demo
deleted file mode 100755
index 69c2a28..0000000
--- a/fai/config/scripts/DEMO/30-demo
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /usr/sbin/cfagent -f
-
-control:
- any::
- actionsequence = ( files editfiles )
- EditFileSize = ( 30000 )
-
-files:
- any::
-
-# floppy and cdroms are accessible for all
- ${target}/dev include=fd* mode=666 action=fixall r=1
- ${target}/dev include=sr* mode=444 action=fixall r=1
-
-editfiles:
- any::
-
- { ${target}/etc/init.d/sysklogd
- ReplaceAll "^SYSLOGD=.*" With 'SYSLOGD="-m 360"'
- }
diff --git a/fai/config/scripts/FAIBASE/10-misc b/fai/config/scripts/FAIBASE/10-misc
index 6434512..6394ad2 100755
--- a/fai/config/scripts/FAIBASE/10-misc
+++ b/fai/config/scripts/FAIBASE/10-misc
@@ -1,37 +1,27 @@
#! /bin/bash
-# (c) Thomas Lange, 2001-2008, lange at debian.org
+# (c) Thomas Lange, 2001-2012, lange at debian.org
-error=0 ; trap "error=$((error|1))" ERR
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
-# a list of modules which are loaded at boot time
-fcopy -i /etc/modules
-for module in $MODULESLIST; do
- ainsl -a $target/etc/modules "^$module$"
-done
-
-fcopy /etc/hostname || echo $HOSTNAME > $target/etc/hostname
echo $TIMEZONE > $target/etc/timezone
cp -f /usr/share/zoneinfo/${TIMEZONE} $target/etc/localtime
if [ -n "$IPADDR" ]; then
- ifclass DHCPC || ainsl -s $FAI_ROOT/etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
+ ifclass DHCPC || ainsl -s /etc/hosts "$IPADDR $HOSTNAME.$DOMAIN $HOSTNAME"
+else
+ ifclass DHCPC && ainsl -s /etc/hosts "127.0.0.1 $HOSTNAME"
fi
fcopy -iM /etc/hosts /etc/motd
-# set root password
-#echo "root:$ROOTPW" | $ROOTCMD chpasswd --encrypted
-$ROOTCMD usermod -p "$ROOTPW" root
# make /root accessible only by root
-chmod 0700 $target/root
-chown root:root $target/root
+chmod -c 0700 $target/root
+chown -c root:root $target/root
# copy default dotfiles for root account
fcopy -ir /root
-# create keyboard layout table
-$ROOTCMD bash -c "echo 'console-data console-data/keymap/full select $KEYMAP' | debconf-set-selections"
-$ROOTCMD install-keymap $KEYMAP || true
-# dumpkeys | gzip -9f >$target/etc/console/boottime.kmap.gz
+chmod -c 1777 ${target}/tmp
+chown -c 0:0 ${target}/tmp
exit $error
diff --git a/fai/config/scripts/FAIBASE/20-removable_media b/fai/config/scripts/FAIBASE/20-removable_media
index d6f368a..bac0658 100755
--- a/fai/config/scripts/FAIBASE/20-removable_media
+++ b/fai/config/scripts/FAIBASE/20-removable_media
@@ -3,19 +3,19 @@
# (c) Thomas Lange, 2006,2009, lange at debian.org
# create entries for removable media in fstab and directories in /media
-[ -b $target/dev/fd0 ] && ainsl $target/etc/fstab "/dev/fd0 /media/floppy auto users,noauto 0 0"
+[ -b $target/dev/fd0 ] && ainsl /etc/fstab "/dev/fd0 /media/floppy auto users,noauto 0 0"
cdromlist() {
[ -f /proc/sys/dev/cdrom/info ] || return
devs=$(grep 'drive name:' /proc/sys/dev/cdrom/info | cut -d ":" -f 2)
for d in $devs; do
- echo $d
+ echo $d
done
}
fstabline () {
line=$(printf "%-15s %-15s %-7s %-15s %-7s %s\n" "$1" "$2" "$3" "$4" "$5" "$6")
- ainsl $target/etc/fstab "$line"
+ ainsl /etc/fstab "$line"
}
i=0
diff --git a/fai/config/scripts/FAIBASE/40-misc b/fai/config/scripts/FAIBASE/40-misc
deleted file mode 100755
index 3424a84..0000000
--- a/fai/config/scripts/FAIBASE/40-misc
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /usr/sbin/cfagent -f
-
-control:
- any::
- actionsequence = ( directories editfiles )
- EditFileSize = ( 30000 )
-
-directories:
- any::
- ${target}/tmp mode=1777 owner=0 group=0
-
-editfiles:
- any::
- { ${target}/etc/mailname
- AutoCreate
- AppendIfNoSuchLine "${HOSTNAME}"
- }
-
- { ${target}/etc/default/rcS
- ReplaceAll "^UTC=.*" With "UTC=${UTC}"
- }
-
- { ${target}/etc/inittab
- ReplaceAll "/sbin/getty 38400"
- With "/sbin/getty -f /etc/issue.linuxlogo 38400"
- }
diff --git a/fai/config/scripts/GRUB/10-setup b/fai/config/scripts/GRUB/10-setup
deleted file mode 100755
index 3c22c89..0000000
--- a/fai/config/scripts/GRUB/10-setup
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-# support for GRUB version 1 (0.97)
-
-error=0 ; trap "error=$((error|1))" ERR
-
-fcopy -v /boot/grub/menu.lst
-
-exit $error
-
diff --git a/fai/config/scripts/GRUB/20-initramfs b/fai/config/scripts/GRUB/20-initramfs
deleted file mode 100755
index 6142073..0000000
--- a/fai/config/scripts/GRUB/20-initramfs
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/bash
-# support for GRUB version 1 (0.97)
-
-error=0 ; trap "error=$((error|1))" ERR
-
-not_up2date() {
- if [ $# -eq 0 ] ; then
- echo "No package name given!"
- return 127
- fi
-
- egrep -q "(^Unpacking $1 |^Unpacking replacement $1 )" $LOGDIR/*.log
- return $?
-}
-
-if [ `not_up2date lvm2` -o `not_up2date mdadm` ] ; then
- $ROOTCMD update-initramfs -k all -u
-fi
-
-
-exit $error
-
diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup
index 33161d9..f69fc71 100755
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@ -1,7 +1,7 @@
#! /bin/bash
# support for GRUB version 2 (1.98-1)
-error=0 ; trap "error=$((error|1))" ERR
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
set -a
diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 6de8856..873771d 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -1,17 +1,19 @@
#! /bin/bash
-# copyright Thomas Lange 2001-2007, lange at debian.org
+# copyright Thomas Lange 2001-2011, lange at debian.org
-error=0 ; trap "error=$((error|1))" ERR
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
-# remove backup files from cfengine
-dirs="root etc var"
-for path in $dirs; do
- find $target/$path -maxdepth 20 -name \*.cfedited -o -name \*.cfsaved | xargs -r rm
-done
+# remove backup files from cfengine, but only if cfengine is installed
+if [ -x /usr/sbin/cfagent ] || [ -x $target/usr/sbin/cfagent ] ; then
+ dirs="root etc var"
+ for path in $dirs; do
+ find $target/$path -maxdepth 20 -name \*.cfedited -o -name \*.cfsaved | xargs -r rm
+ done
+fi
-[ "$FAI_DEBMIRROR" ] &&
- ainsl $target/etc/fstab "#$FAI_DEBMIRROR $MNTPOINT nfs ro 0 0"
+[ "$FAI_DEBMIRROR" ] &&
+ ainsl /etc/fstab "#$FAI_DEBMIRROR $MNTPOINT nfs ro 0 0"
# set bios clock
if [ $do_init_tasks -eq 1 ] ; then
@@ -19,15 +21,17 @@ if [ $do_init_tasks -eq 1 ] ; then
no|"") hwopt="--localtime" ;;
yes) hwopt="--utc" ;;
esac
- $ROOTCMD hwclock $hwopt --systohc || true
+ hwclock $hwopt --systohc || true
fi
# Make sure everything is configured properly
-echo "Running \"apt-get -f install\" for the last time."
-$ROOTCMD apt-get -f install
+if ifclass DEBIAN ; then
+ echo "Running \"apt-get -f install\" for the last time."
+ $ROOTCMD apt-get -f install
+fi
lskernels=$(echo $target/boot/vmlinu*)
-[ -f ${lskernels%% *} ] || echo "ERROR: No kernel was installed. Have a look at shell.log"
+[ -f ${lskernels%% *} ] || echo "ERROR: No kernel was installed. Have a look at shell.log" >&2
# copy sources.list
fcopy -i /etc/apt/sources.list
diff --git a/fai/config/scripts/LILO/20-create-liloconf b/fai/config/scripts/LILO/20-create-liloconf
deleted file mode 100755
index 85a9d7d..0000000
--- a/fai/config/scripts/LILO/20-create-liloconf
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/bash
-
-# copyright Thomas Lange 2001-2005, lange at debian.org
-# LILO support may be dropped in a future release
-
-FFLAGS=${FAI_FLAGS// /,}
-
-cd $target/boot && kernelversion=$(ls vmlinuz-*)
-
-# if class NOMBR is defined, write boot loader into root partition, not into mbr
-ifclass NOMBR && BOOT_DEVICE=$ROOT_PARTITION
-
-if ifclass LILO; then
- fcopy /etc/lilo.conf || {
- # if the installed kernel is using an initial ramdisk
- if [ -L $target/initrd.img ]; then
- initrdopt="initrd=/initrd.img"
- fi
- # write lilo.conf and install lilo to disk
- echo "Creating lilo.conf for /vmlinuz"
- cat > $target/etc/lilo.conf <<-EOF
- boot=$BOOT_DEVICE
- root=$ROOT_PARTITION
- install=/boot/boot.b
- map=/boot/map
- vga=normal
- delay=50
-
- image=/vmlinuz
- append="devfs=nomount $kappend"
- $initrdopt
- label=linux
- read-only
-
- image=/vmlinuz.old
- label=linux.old
- read-only
- optional
- $liloappend
-EOF
- }
-fi
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ifclass FAI_BOOTPART && {
-
- rev=`uname -r`
- mkdir -p $target/fai-boot
- cp -a /boot/vmlinuz-$rev $target/fai-boot
-
- ifclass LILO && {
- # write lilo.conf and install lilo to disk
- echo "Add /fai-boot partition to lilo.conf"
-
- cat >> $target/etc/lilo.conf <<-EOF
- image=/fai-boot/boot/$kernelversion
- $initrdopt
- append="devfs=nomount"
- label=FAI
-EOF
- mkdir $target/fai-boot/etc
- cp $target/etc/lilo.conf $target/fai-boot/etc
- }
-
-}
-
-# now call lilo
-# you can also use this
-# $ROOTCMD lilo -v
-if ifclass LILO; then
- $target/sbin/lilo -r $target
-fi
diff --git a/fai/config/tests/Faitest.pm b/fai/config/tests/Faitest.pm
index bdaf1c1..98f9bc4 100644
--- a/fai/config/tests/Faitest.pm
+++ b/fai/config/tests/Faitest.pm
@@ -20,11 +20,11 @@ sub setup_test {
$verbose = $ENV{'debug'} if $ENV{'debug'};
my $result = GetOptions (
- "verbose=i" => \$verbose,
- "help" => \$help,
- "man" => \$man,
+ "verbose=i" => \$verbose,
+ "help" => \$help,
+ "man" => \$man,
- );
+ );
pod2usage(1) if $help;
pod2usage(-exitstatus => 0, -verbose => 2) if $man;
--
Debian-LAN development and packaging
More information about the debian-lan-devel
mailing list