diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/fai /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai --- /tmp/uytxu6VbI4/fai-3.1.3/bin/fai 2006-12-16 17:47:35.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai 2007-01-11 16:14:21.000000000 +0100 @@ -1,11 +1,11 @@ #!/bin/bash -# $Id: fai 4200 2006-12-16 16:47:35Z lange $ +# $Id: fai 4213 2007-01-11 15:14:21Z lange $ #********************************************************************* # # fai -- main installation script executed after booting # # This script is part of FAI (Fully Automatic Installation) -# (c) 1999-2006 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 1999-2007 by Thomas Lange, lange@informatik.uni-koeln.de # Universitaet zu Koeln # #********************************************************************* @@ -158,7 +158,7 @@ # Main routine # Parse commandline options -TEMP=$(getopt -o u:Nhvc:C: --long new,help,verbose,class:,cfdir: -n "$0" -- "$@") +TEMP=$(getopt -o u:Nhvc:C: --long hostname:,new,help,verbose,class:,cfdir: -n "$0" -- "$@") if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi # Note the quotes around `$TEMP': they are essential! eval set -- "$TEMP" diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-class /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-class --- /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-class 2006-08-24 19:07:22.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-class 2007-01-23 22:05:02.000000000 +0100 @@ -1,12 +1,12 @@ #! /bin/bash -# $Id: fai-class 3794 2006-08-24 17:07:21Z lange $ +# $Id: fai-class 4223 2007-01-23 21:05:01Z lange $ #********************************************************************* # # fai-class - determine all classes a host belongs to # # This script is part of FAI (Fully Automatic Installation) -# (c) 2002-2006 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2002-2007 by Thomas Lange, lange@informatik.uni-koeln.de # Universitaet zu Koeln # #********************************************************************* @@ -27,7 +27,7 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #********************************************************************* -version="version 1.5.3, 24-aug-2006" +version="version 1.5.4, 23-jan-2007" # import variables: $LOGDIR $verbose $debug # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -131,7 +131,11 @@ verbosemsg "Setting LOGDIR to default value /tmp/fai" LOGDIR=/tmp/fai; export LOGDIR fi - HOSTNAME=$(uname -n | cut -d. -f1); export HOSTNAME + if [ -n "$HOST" ]; then + export HOSTNAME=$HOST + else + HOSTNAME=$(uname -n | cut -d. -f1); export HOSTNAME + fi } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # main program diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-debconf /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-debconf --- /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-debconf 2006-09-08 14:15:41.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-debconf 2007-01-11 16:07:14.000000000 +0100 @@ -69,7 +69,7 @@ fi packages=$(awk '{print $1}' $LOGDIR/debconf.data | sort | uniq) # backup database - tmpdb=$($ROOTCMD mktemp) + tmpdb=$($ROOTCMD mktemp -t fai-debconf.XXXXXXXXXX) $ROOTCMD debconf-copydb configdb faidb --config=Name:faidb --config=Driver:File --config=Filename:$tmpdb for p in $packages; do # test if package is installed @@ -82,7 +82,7 @@ # echo "Package $p is not yet installed. Skipping reconfiguration." fi done - rm $target/$tmpdb + rm -f $target/$tmpdb $target/$tmpdb-old } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - usage() { diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-mirror /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-mirror --- /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-mirror 2006-09-13 18:47:27.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-mirror 2007-03-07 18:15:32.000000000 +0100 @@ -1,12 +1,12 @@ #! /bin/bash -# $Id: fai-mirror 3949 2006-09-13 16:47:26Z lange $ +# $Id: fai-mirror 4243 2007-03-07 17:15:32Z lange $ #********************************************************************* # # fai-mirror -- create and manage a partitial mirror for FAI # # This script is part of FAI (Fully Automatic Installation) -# (c) 2004-2006, Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2004-2007, Thomas Lange, lange@informatik.uni-koeln.de # #********************************************************************* # This program is free software; you can redistribute it and/or modify @@ -25,11 +25,12 @@ # MA 02111-1307, USA. #********************************************************************* -version="Version 1.9.2, 13-sep-2006" +version="Version 1.9.3, 7-mar-2007" # variables: NFSROOT, FAI_CONFIGDIR export FAI_ROOT=/ # do not execute in chroot +export PATH=$PATH:/usr/sbin trap "umount_dirs" EXIT ERR # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-setup /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-setup --- /tmp/uytxu6VbI4/fai-3.1.3/bin/fai-setup 2006-09-26 18:38:25.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/fai-setup 2007-01-23 23:36:08.000000000 +0100 @@ -1,12 +1,12 @@ #! /bin/bash -# $Id: fai-setup 4030 2006-09-26 16:38:24Z lange $ +# $Id: fai-setup 4225 2007-01-23 22:36:07Z lange $ #********************************************************************* # # fai-setup -- set up FAI # # This script is part of FAI (Fully Automatic Installation) -# (c) 2000-2006 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2000-2007 by Thomas Lange, lange@informatik.uni-koeln.de # Universitaet zu Koeln # #********************************************************************* @@ -74,6 +74,10 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - setup_fai_account() { + # most things should be executed as user $LOGUSER, since root may not have write + # permissions to $loguserhome (e.g if mount via NFS without no_root_squash) + + set +e loguserhome=$(eval "cd ~$LOGUSER 2>/dev/null && pwd;true") sshdir=$loguserhome/.ssh if [ -z "$loguserhome" ]; then @@ -128,6 +132,7 @@ logusergid=$(id -ng $LOGUSER) echo "User account $LOGUSER set up." + set -e } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -140,8 +145,12 @@ if [ -n "$LOGUSER" ]; then # chown only if cd was successful - cd $loguserhome && chown -R $LOGUSER:$logusergid . - chown -R $LOGUSER:$logusergid /srv/tftp/fai + cd $loguserhome + if [ $? -eq 0 ]; then + chown $LOGUSER:$logusergid . .rhosts || true + [ -d .ssh ] && chown -R $LOGUSER:$logusergid .ssh || true + fi + chown -R $LOGUSER:$logusergid /srv/tftp/fai || true fi if [ -z "$FAI_CONFIGDIR" ]; then diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/make-fai-nfsroot /tmp/OoP2jshG0Y/fai-3.1.8/bin/make-fai-nfsroot --- /tmp/uytxu6VbI4/fai-3.1.3/bin/make-fai-nfsroot 2006-11-05 12:37:43.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/make-fai-nfsroot 2007-01-11 16:02:00.000000000 +0100 @@ -1,12 +1,12 @@ #! /bin/bash -# $Id: make-fai-nfsroot 4143 2006-11-05 11:37:43Z lange $ +# $Id: make-fai-nfsroot 4211 2007-01-11 15:02:00Z lange $ #********************************************************************* # # make-fai-nfsroot -- create nfsroot directory and add additional packages # # This script is part of FAI (Fully Automatic Installation) -# (c) 2000-2006 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2000-2007 by Thomas Lange, lange@informatik.uni-koeln.de # Universitaet zu Koeln # #********************************************************************* @@ -159,14 +159,12 @@ mkdir -p -m 700 $NFSROOT/root/.ssh if [ -n "$LOGUSER" ] ; then loguserhome=`eval "cd ~$LOGUSER 2>/dev/null && pwd;true"` - # is copying of *.pub important? [ -f $loguserhome/.ssh/known_hosts ] && cp $loguserhome/.ssh/known_hosts $NFSROOT/root/.ssh/known_hosts [ -d $loguserhome/.ssh ] && { [ -f $loguserhome/.ssh/id_dsa ] && cp -p $loguserhome/.ssh/id_dsa* $NFSROOT/root/.ssh/ [ -f $loguserhome/.ssh/id_rsa ] && cp -p $loguserhome/.ssh/id_rsa* $NFSROOT/root/.ssh/ - cp -p $loguserhome/.ssh/*.pub $NFSROOT/root/.ssh/ } fi diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/bin/setup_harddisks /tmp/OoP2jshG0Y/fai-3.1.8/bin/setup_harddisks --- /tmp/uytxu6VbI4/fai-3.1.3/bin/setup_harddisks 2006-09-08 12:26:01.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/bin/setup_harddisks 2007-03-07 14:50:12.000000000 +0100 @@ -1,13 +1,13 @@ #!/usr/bin/perl -# $Id: setup_harddisks 3897 2006-09-08 10:26:01Z lange $ +# $Id: setup_harddisks 4240 2007-03-07 13:50:11Z lange $ #********************************************************************* # # setup_harddisks -- create partitions and filesystems on harddisk # # This script is part of FAI (Fully Automatic Installation) # Copyright (c) 1999, 2000 by ScALE Workgroup, Universitaet zu Koeln -# Copyright (c) 2000-2006 by Thomas Lange, Uni Koeln +# Copyright (c) 2000-2007 by Thomas Lange, Uni Koeln # #********************************************************************* # This program is free software; you can redistribute it and/or modify @@ -152,7 +152,7 @@ # Variables #**************************************************** -my $Version = "version 0.40fai"; +my $Version = "version 0.42fai"; my $megabyte = 1024 * 1024; # guess # $gigabyte = 1024 * $megabyte; @@ -823,7 +823,7 @@ # Linux Reiser file system if ($MPOptions{$mountpoint} =~ /\breiser\b/i) { # print "Make Reiser Filesystem:\n"; - $command = "echo y | mkreiserfs $mkreiserfs_options"; + $command = "echo y | LC_ALL=C mkreiserfs $mkreiserfs_options"; ($MPOptions{$mountpoint} =~ /(\-h\s*\w+)\b/) && ($command .= " $1"); ($MPOptions{$mountpoint} =~ /(\-v\s*\d+)\b/) && ($command .= " $1"); $command .= " /dev/$device"; @@ -908,6 +908,7 @@ $device = $MountpointPart{$mountpoint}; $type = "ext2"; ($MPOptions{$mountpoint} =~ /\b(dosfat16|winfat32)\b/i) && ($type = "vfat"); + ($MPOptions{$mountpoint} =~ /\b(ntfs)\b/i) && ($type = "ntfs"); ($MPOptions{$mountpoint} =~ /\b(reiser)\b/i) && ($type = "reiserfs"); ($MPOptions{$mountpoint} =~ /\b(xfs)\b/i) && ($type = "xfs"); ($MPOptions{$mountpoint} =~ /\b(ext3)\b/i) && ($type = "ext3"); diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/conf/NFSROOT /tmp/OoP2jshG0Y/fai-3.1.8/conf/NFSROOT --- /tmp/uytxu6VbI4/fai-3.1.3/conf/NFSROOT 2006-11-23 21:48:17.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/conf/NFSROOT 2007-03-06 23:18:31.000000000 +0100 @@ -5,7 +5,7 @@ bootpc rsync lftp rsh-client less dump reiserfsprogs usbutils psmisc pciutils hdparm smartmontools parted mdadm lvm2 dnsutils ntpdate dosfstools cvs jove xfsprogs xfsdump -sysutils dialog discover mdetect libnet-perl +sysutils dialog discover mdetect console-tools console-common expect iproute udev subversion diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/debian/changelog /tmp/OoP2jshG0Y/fai-3.1.8/debian/changelog --- /tmp/uytxu6VbI4/fai-3.1.3/debian/changelog 2006-12-17 17:40:54.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/debian/changelog 2007-03-13 23:39:57.000000000 +0100 @@ -1,3 +1,56 @@ +fai (3.1.8) unstable; urgency=medium + + * conf/NFSROOT: remove unknow package name (closes: 407950) + * setup_harddisks: use C locale when calling mkreiserfs (closes: 413504) + * fai-mirror: add /usr/sbin to $PATH so a normal user can also call + this command (closes: 413466) + * simple/package_config/GERMAN: fix wrong package name + * lib/subroutines: replace >>/dev/stderr with >&2 + + -- Thomas Lange Tue, 13 Mar 2007 23:39:56 +0100 + +fai (3.1.7) unstable; urgency=medium + + * subroutines: ifclass() should append to stderr (closes: #409059) + * examples/simple/, lib/fai-mount-disk, lib/mount2dir: use bash for + shell scripts (closes: #410084) + * fix typo in bug number of older changelog entry + * install_packages.8: add info for variable MAXPACKAGES + + -- Thomas Lange Wed, 14 Feb 2007 12:11:29 +0100 + +fai (3.1.6) unstable; urgency=high + + * fix important and grave bugs + * fai-setup: do not fail (and exit) if $loguserhome is not writeable for + root (closes: #407947) + * fai-class: fix syntax error (closes: #408153) + + -- Thomas Lange Tue, 23 Jan 2007 23:49:33 +0100 + +fai (3.1.5) unstable; urgency=low + + * make-fai-nfsroot: remove copying of *.pub files (closes: #406334) + * fai-debconf: add template when create tmp file, remove also old + tmp files (closes: #406336) + * fai: add missing parameter to --long options (closes: #406125) + * fai-classs: set hostname from -u as intended (closes: #406125) + * scripts/FAISERVER/10-conffiles: fix wrong path (closes: #406500) + * README: update year from 2006 to 2007 + + -- Thomas Lange Fri, 12 Jan 2007 14:57:12 +0100 + +fai (3.1.4) unstable; urgency=medium + + * these are only document changes and a one liner for setup_harddisks + * fix default examples. A change in the xorg package dependencies broke + the default FAI example installation (closes: #405435) + * remove xlockmore package from example (closes: #405433) + * setup_harddisks: add support for mountig existing NTFS partitions + (closes: #404187) + + -- Thomas Lange Thu, 4 Jan 2007 15:30:42 +0100 + fai (3.1.3) unstable; urgency=medium * fai-savelog: fix a security tagged bug, make local copy of LOGDIR only diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/class/10-base-classes /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/class/10-base-classes --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/class/10-base-classes 2005-11-23 23:43:56.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/class/10-base-classes 2007-02-07 17:09:34.000000000 +0100 @@ -1,8 +1,8 @@ -#! /bin/sh +#! /bin/bash # echo architecture and OS name in upper case. Do NOT remove these two lines uname -s | tr '[:lower:]' '[:upper:]' [ -x "`which dpkg`" ] && dpkg --print-installation-architecture | tr a-z A-Z [ -f /boot/RUNNING_FROM_FAICD ] && echo "FAICD" -exit 0 \ Kein Zeilenumbruch am Dateiende. +exit 0 diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/class/50-host-classes /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/class/50-host-classes --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/class/50-host-classes 2006-09-19 12:33:48.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/class/50-host-classes 2007-02-07 17:10:02.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # assign classes hosts diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/hooks/instsoft.FAIBASE /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/hooks/instsoft.FAIBASE --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/hooks/instsoft.FAIBASE 2006-04-18 22:21:18.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/hooks/instsoft.FAIBASE 2007-02-07 17:11:08.000000000 +0100 @@ -1,3 +1,3 @@ -#! /bin/sh +#! /bin/bash [ -s $target/etc/kernel-img.conf ] || fcopy -Bi /etc/kernel-img.conf diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/package_config/GERMAN /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/package_config/GERMAN --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/package_config/GERMAN 2006-09-20 18:17:30.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/package_config/GERMAN 2007-03-06 21:36:39.000000000 +0100 @@ -2,5 +2,5 @@ german PACKAGES aptitude GNOME -firefox-locale-de +firefox-locale-de-de thunderbird-locale-de diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/package_config/XORG /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/package_config/XORG --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/package_config/XORG 2006-09-19 15:56:10.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/package_config/XORG 2007-01-03 18:21:07.000000000 +0100 @@ -1,6 +1,5 @@ PACKAGES aptitude -xorg -xlockmore-gl +xorg xserver-xorg-video-all xserver-xorg-input-all ttf-freefont type1inst xscreensaver xscreensaver-gl diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/DEMO/10-misc /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/DEMO/10-misc --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/DEMO/10-misc 2006-09-19 16:47:52.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/DEMO/10-misc 2007-02-07 22:16:07.000000000 +0100 @@ -1,6 +1,6 @@ -#! /bin/sh +#! /bin/bash -# (c) Thomas Lange, 2001-2006, lange@debian.org +# (c) Thomas Lange, 2001-2007, lange@debian.org ifclass XORG && { fcopy -M /etc/X11/xorg.conf diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/FAIBASE/10-misc /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/FAIBASE/10-misc --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/FAIBASE/10-misc 2006-11-02 19:29:45.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/FAIBASE/10-misc 2007-02-07 22:16:41.000000000 +0100 @@ -1,6 +1,6 @@ -#! /bin/sh +#! /bin/bash -# (c) Thomas Lange, 2001-2006, lange@debian.org +# (c) Thomas Lange, 2001-2007, lange@debian.org error=0 ; trap "error=$((error|1))" ERR diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/FAIBASE/30-interface /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/FAIBASE/30-interface --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/FAIBASE/30-interface 2005-12-06 00:10:56.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/FAIBASE/30-interface 2007-02-07 22:16:51.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash error=0 ; trap "error=$((error|1))" ERR diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/FAISERVER/10-conffiles /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/FAISERVER/10-conffiles --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/FAISERVER/10-conffiles 2006-07-23 01:28:02.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/FAISERVER/10-conffiles 2007-01-11 17:55:05.000000000 +0100 @@ -4,7 +4,7 @@ fcopy -Bvr /etc/fai #/etc/fai/fai.conf /etc/fai/make-fai-nfsroot.conf -fcopy /etc/apt-proxy/apt-proxy-v2.conf /etc/fai/sources.list +fcopy /etc/apt-proxy/apt-proxy-v2.conf /etc/fai/apt/sources.list # use the same sources.list for the server itself and the clients cp -a $target/etc/fai/apt $target/etc/ diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/LAST/50-misc /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/LAST/50-misc --- /tmp/uytxu6VbI4/fai-3.1.3/examples/simple/scripts/LAST/50-misc 2006-11-02 17:27:14.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/examples/simple/scripts/LAST/50-misc 2007-02-07 22:17:21.000000000 +0100 @@ -1,6 +1,6 @@ -#! /bin/sh +#! /bin/bash -# copyright Thomas Lange 2001-2006, lange@debian.org +# copyright Thomas Lange 2001-2007, lange@debian.org error=0 ; trap "error=$((error|1))" ERR diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/lib/fai-mount-disk /tmp/OoP2jshG0Y/fai-3.1.8/lib/fai-mount-disk --- /tmp/uytxu6VbI4/fai-3.1.3/lib/fai-mount-disk 2006-07-31 22:54:45.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/lib/fai-mount-disk 2007-02-07 22:36:53.000000000 +0100 @@ -1,7 +1,7 @@ -#! /bin/sh +#! /bin/bash -# $Id: fai-mount-disk 3706 2006-07-31 20:54:24Z lange $ -# Copyright (c) 2002-2006 by Thomas Lange +# $Id: fai-mount-disk 4230 2007-02-07 21:36:53Z lange $ +# Copyright (c) 2002-2007 by Thomas Lange # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - fstab_mount() { diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/lib/mount2dir /tmp/OoP2jshG0Y/fai-3.1.8/lib/mount2dir --- /tmp/uytxu6VbI4/fai-3.1.3/lib/mount2dir 2006-11-27 16:44:02.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/lib/mount2dir 2007-02-07 22:36:53.000000000 +0100 @@ -1,12 +1,12 @@ -#! /bin/sh +#! /bin/bash -# $Id: mount2dir 4169 2006-11-27 15:44:02Z lange $ +# $Id: mount2dir 4230 2007-02-07 21:36:53Z lange $ #********************************************************************* # # mount2dir -- mount partitions to a directory using a fstab file # # This script is part of FAI (Fully Automatic Installation) -# (c) 2001-2006 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2001-2007 by Thomas Lange, lange@informatik.uni-koeln.de # Universitaet zu Koeln # #********************************************************************* diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/lib/subroutines /tmp/OoP2jshG0Y/fai-3.1.8/lib/subroutines --- /tmp/uytxu6VbI4/fai-3.1.3/lib/subroutines 2006-11-03 16:54:10.000000000 +0100 +++ /tmp/OoP2jshG0Y/fai-3.1.8/lib/subroutines 2007-03-07 14:51:11.000000000 +0100 @@ -1,12 +1,12 @@ #! /bin/bash -# $Id: subroutines 4137 2006-11-03 15:54:10Z lange $ +# $Id: subroutines 4241 2007-03-07 13:51:10Z lange $ #********************************************************************* # # subroutines -- useful subroutines for FAI # # This script is part of FAI (Fully Automatic Installation) -# (c) 2000-2006 by Thomas Lange, lange@informatik.uni-koeln.de +# (c) 2000-2007 by Thomas Lange, lange@informatik.uni-koeln.de # Universitaet zu Koeln # #********************************************************************* @@ -61,7 +61,7 @@ ifclass() { - [ "$debug" ] && echo "Test if class $1 is in $classes" >/dev/stderr + [ "$debug" ] && echo "Test if class $1 is in $classes" >&2 # test if a class is defined local cl local ret=1 @@ -69,7 +69,7 @@ for cl in $classes; do [ x$cl = x$1 ] && ret=0 && break done - [ "$debug" ] && echo "ifclass returns $ret" >/dev/stderr + [ "$debug" ] && echo "ifclass returns $ret" >&2 return $ret } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/man/install_packages.8 /tmp/OoP2jshG0Y/fai-3.1.8/man/install_packages.8 --- /tmp/uytxu6VbI4/fai-3.1.3/man/install_packages.8 2006-07-11 17:24:33.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/man/install_packages.8 2007-02-08 18:40:16.000000000 +0100 @@ -1,7 +1,7 @@ .\" Hey, EMACS: -*- nroff -*- .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY -.TH install_packages 8 "20 april 2005" "FAI 2.8.1" +.TH install_packages 8 "8 february 2007" "FAI 3.1" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -66,7 +66,8 @@ Print the list of all packages with version number that would be installed, then exit. .TP .B \-m MAX -Install only MAX packages at a time +Install only MAX packages at a time. Same as setting the shell +environment variable MAXPACKAGES. .TP .BI "\-t " Test mode. Do not execute installation commands. diff -Nru /tmp/uytxu6VbI4/fai-3.1.3/README /tmp/OoP2jshG0Y/fai-3.1.8/README --- /tmp/uytxu6VbI4/fai-3.1.3/README 2006-09-25 14:11:18.000000000 +0200 +++ /tmp/OoP2jshG0Y/fai-3.1.8/README 2007-01-11 17:48:29.000000000 +0100 @@ -50,4 +50,4 @@ 1024D/AB9B66FD AEA6 A8C1 BD8E 67C4 8EF6 8BCA DC13 E54E AB9B 66FD ---------------------------------------------------------------------- -Copyright (c) 1999-2006 Thomas Lange. All rights reserved. +Copyright (c) 1999-2007 Thomas Lange. All rights reserved.