/[fai]/trunk/bin/make-fai-nfsroot

Diff of /trunk/bin/make-fai-nfsroot

Parent Directory | Revision Log | View Patch Patch

-trunk/scripts/make-fai-nfsroot
revision 2478 by lange,
Sat Oct 23 22:25:21 2004 UTC
+trunk/bin/make-fai-nfsroot
revision 4743 by lange,
Wed Nov 14 21:12:08 2007 UTC
 Line 6
  # make-fai-nfsroot -- create nfsroot directory and add additional packages
  #
  # This script is part of FAI (Fully Automatic Installation)
- # (c) 2000-2004 by Thomas Lange, lange@informatik.uni-koeln.de
+ # (c) 2000-2007 by Thomas Lange, lange@informatik.uni-koeln.de
  # Universitaet zu Koeln
  #
  #*********************************************************************
 Line 24
  # `/usr/share/common-licences/GPL' in the Debian GNU/Linux distribution
  # or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html.  You
  # can also obtain it by writing to the Free Software Foundation, Inc.,
- # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  #*********************************************************************
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ usage() {
+     cat <<-EOF
+         Copyright (C) 1999-2007 Thomas Lange
+         Report bugs to <fai@informatik.uni-koeln.de>.
+         Usage: make-fai-nfsroot [OPTIONS]
+   Create an NFSROOT for FAI.
+         Read the man pages pages make-fai-nfsroot(8).
+ EOF
+     exit 0
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ die() {
+     echo "ERROR: $@"
+     exit 99
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ check_nfsroot() {
+     set +e
+     # simple test, to see if important thing are available inside the nfsroot
+     [ -d $NFSROOT/usr/share/live-initramfs ] || die "live-initramfs is not installed."
+     local files=$(ls $NFSROOT/boot/initrd* 2>/dev/null)
+     [ -z "$files" ] && die "No initrd installed."
+     return 0
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ badupdateto32() {
+     cat <<-EOF
+         It seems that you have updated an older FAI version without checking files in /etc/fai/
+         Please check the NEWS file for changes in variable names and if you have a linux-image package
+         defined in /etc/fai/NFSROOT.
+ EOF
+     die $@
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
- if [ `id -u` -ne 0 ]; then
+ kfile="vmlinuz" # some architectures use different names
-     echo "Run this program as root."
+ merror="properly"
-     exit 9
+ sshpreserve=0
+ divert=1
+ if [ -f /etc/lsb-release ]; then
+     . /etc/lsb-release
+     case "$DISTRIB_ID" in
+         Ubuntu) divert=0 ;;
+     esac
  fi
- merror="properly"
  # option e currently does nothing
- while getopts ervc:f:kK opt ; do
+ while getopts hervC:f:kKpU opt ; do
      case "$opt" in
-         c) cfdir=$OPTARG ;;
+         C) cfdir=$OPTARG ;;
          v) verbose=1 ; v=-v ;;
          r) recover=1 ;;
-         f) cfg=$OPTARG ;;
+         f) die "Option -f is not supported any more. Use option -C instead" ;;
          k) kinstall=1 ;;
-         K) kremove=1; kinstall=1 ;;
+         K) kremove=1;;
-         e) expert=1 ;;
+         h) usage ;;
+         e) expert=1 ;; # a dummy option, that only fai-setup uses
+         p) sshpreserve=1 ;;
+         U) divert=0 ;;
          ?) exit 5 ;; # error in option parsing
      esac
  done
+ if [ $(id -u) != "0" ]; then
+     echo "Run this program as root."
+     exit 9
+ fi
+ { # start of block which output will be written to log file
  set -e
- [ -z "$cfdir" ] && cfdir=/etc/fai
+ # use FAI_ETC_DIR from environment variable
+ if [ -n "$FAI_ETC_DIR" -a -z "$cfdir" ]; then
+     echo "Using environment variable \$FAI_ETC_DIR."
+ fi
+ [ -z "$cfdir" ] && cfdir=${FAI_ETC_DIR:=/etc/fai}
+ cfdir=$(readlink -f $cfdir) # canonicalize path
  if [ ! -d "$cfdir" ]; then
      echo "$cfdir is not a directory"
      exit 6
  fi
- [ "$verbose" ] && echo "Using configuration files from directory $cfdir"
+ [ "$verbose" ] && echo "Using configuration files from $cfdir"
- if [ -n "$cfg" ]; then
+ . $cfdir/fai.conf
-     . $cfdir/$cfg
- else
-     . $cfdir/fai.conf
- fi
  # read config file for this tool
  if [ -f "$cfdir/make-fai-nfsroot.conf" ]; then
-Line 72 
 else
+Line 130 
 else
      exit 8
  fi
- if [ -z "$NFSROOT" ]; then
+ # IMO this may be removed, since all information should be included into sources.list
-     echo "\$NFSROOT is not set. Please check your settings in $cfdir/fai.conf."
+ [ -n "$FAI_LOCAL_REPOSITORY" ] && die "The use of \$FAI_LOCAL_REPOSITORY is now deprecated. Please include this information into sources.list."
-     exit 4
+ [ -n "$packages" ] && badupdateto32 "The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
- fi
+ [ -n "$NFSROOT_PACKAGES" ] && die "The use of \$NFSROOT_PACKAGES in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
+ [ -n "$FAI_SOURCES_LIST" ] && die "The use of \$FAI_SOURCES_LIST is deprecated. Please use sources.list now."
+ [ -z "$NFSROOT" ] && die "\$NFSROOT is not set. Please check your settings in $cfdir/fai.conf."
+ [ -z "$TFTPROOT" ] && badupdateto32 "\$TFTPROOT is not set. Please check your settings in $cfdir/make-fai-nfsroot.conf."
+ [ -n "$KERNELPACKAGE" ] && badupdateto32 "The use of \$KERNELPACKAGE is deprecated. Please use $cfdir/NFSROOT now."
+ [ ! -d "$cfdir/apt" ] && die "$cfdir/apt/ does not exists. Can't continue."
- if [ "$FAI_SOURCES_LIST" ]; then
+ oldnfsroot=$NFSROOT
-     echo "The usage of the variable \$FAI_SOURCES_LIST is deprecated. Please use sources.list now."
+ NFSROOT="$NFSROOT/live/filesystem.dir"
-     exit 3
- fi
- if [ ! -s "$cfdir/sources.list" -a ! -f /etc/apt/sources.list ]; then
-     echo "Neither $cfdir/sources.list nor /etc/apt/sources.list exists."
-     echo "I think something is wrong. Can't continue."
-     exit 7
- fi
- kfile="vmlinuz"
- case `uname -m` in
-     i386|i486|i586|i686|amd64)
-         arch_packages="grub lilo read-edid kudzu hwtools dmidecode" ;;
-     ia64)
-         arch_packages="elilo gnu-efi efibootmgr" ;;
-     sparc|sparc64)
-         arch_packages="silo sparc-utils" ;;
-     ppc)
-         arch_packages=""
-         kfile="vmlinux" ;;
-     alpha)
-         arch_packages="aboot" ;;
-     *)  arch_packages="" ;;
- esac
- packages="$packages
- $arch_packages"
  ROOTCMD="chroot $NFSROOT"
  RUNDIR=/var/run/fai/make-fai-nfsroot
- [ ! -d $RUNDIR ] && mkdir -p $RUNDIR
+ mkdir -p $RUNDIR
- LIBFAI=/usr/lib/fai
- SHAREFAI=/usr/share/fai
  export DEBIAN_FRONTEND=noninteractive
  [ "$recover" ] || rm -rf $RUNDIR/*
- trap "umount_dirs" EXIT
+ trap 'echo "Aborting";umount_dirs' EXIT
  trap "bad_exit" ERR
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  bad_exit() {
-Line 130 
 bad_exit() {
+Line 160 
 bad_exit() {
      echo "Please fix the error or try make-fai-nfsroot -v"
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- die() {
-     echo "$@"
-     exit 99
- }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  call_with_stamp() {
      local func=$1
      local stamp=$RUNDIR/$func
      # call subroutine
      [ "$recover" -a -f $stamp ] && return 0
-     "$@"
+     # make a stamp only on success.
-     > $stamp
+     "$@" && : > $stamp
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  call_verbose() {
      if [ "$verbose" ]; then
          "$@"
+         return $?
      else
          "$@" > /dev/null
+         return $?
      fi
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  install_kernel_nfsroot() {
-     rm -rf $NFSROOT/boot/*-$KERNELVERSION $NFSROOT/lib/modules/$KERNELVERSION
+     if [ $divert = 1 ]; then
-     # since woody we can install the kernel using dpkg -i
+         rm $NFSROOT/usr/sbin/update-initramfs
-     echo "do_boot_enable=no" > $NFSROOT/etc/kernel-img.conf
+         LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-initramfs
-     dpkg -x $KERNELPACKAGE $NFSROOT
+         $ROOTCMD update-initramfs -k all -t -u
-     # if $NFROOT/proc/modules exists, then update-modules calls depmod -a without
+     fi
-     # these special flags; so umount first
-     [ -e $NFSROOT/proc/modules ] && umount $NFSROOT/proc
-     chroot $NFSROOT update-modules
-     chroot $NFSROOT depmod -qaF /boot/System.map-$KERNELVERSION $KERNELVERSION || true
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  setup_ssh() {
      # nothing to do if no ssh is available in nfsroot
-     [ -f $NFSROOT/var/lib/dpkg/info/ssh.list ] || return 0
+     [ -f $NFSROOT/usr/bin/ssh ] || return 0
+     if [ $sshpreserve = 1 ]; then
+         tar -C $NFSROOT -xf $tmptar
+         rm $tmptar
+         return 0
+     fi
      mkdir -p -m 700 $NFSROOT/root/.ssh
      if [ -n "$LOGUSER" ] ; then
-         loguserhome=`eval "cd ~$LOGUSER 2>/dev/null && pwd;true"`
+         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
-Line 198 
 setup_ssh() {
+Line 224 
 setup_ssh() {
  copy_fai_files() {
      # copy to nfsroot
-     perl -pi -e "s#^root::#root:${FAI_ROOTPW}:#" etc/passwd
+     echo "root:$FAI_ROOTPW" | $ROOTCMD chpasswd --encrypted
-     mkdir -p $NFSROOT/$SHAREFAI $NFSROOT/$LIBFAI $NFSROOT/etc/fai
-     cd $NFSROOT
-     fdivert /etc/dhcp3/dhclient-script /etc/dhcp3/dhclient.conf
-     cp -p $SHAREFAI/etc/dhclient.conf etc/dhcp3
      cp -Rpv $cfdir/* $NFSROOT/etc/fai
+     # append additional variables to fai.conf for the install clients
+     [ -z "$FAI_CONFIG_SRC" ] && echo "FAI_CONFIG_SRC=nfs://`hostname`$FAI_CONFIGDIR" >> $NFSROOT/etc/fai/fai.conf
+     # remove some files that should not be copied
      rm -f $NFSROOT/etc/fai/make-fai-nfsroot.conf
      [ -f $cfdir/.cvspass ] && cp -p $v $cfdir/.cvspass $NFSROOT/.cvspass
-     cp -p $LIBFAI/sbin/* sbin/
+     $ROOTCMD shadowconfig on
-     mv sbin/dhclient-script etc/dhcp3
-     cp -p /usr/sbin/{ftar,fcopy,install_packages} usr/sbin/
-     cp -p /usr/bin/{fai-do-scripts,fai-class} usr/bin/
-     cp -p $LIBFAI/* usr/lib/fai 2>/dev/null || true  # cp will complain about directories
-     cp -p $SHAREFAI/etc/fai_modules_off etc/modutils/
-     cp -p $SHAREFAI/subroutines* usr/share/fai
-     cp -p $v $SHAREFAI/etc/apt.conf $NFSROOT/etc/apt
-     cp -p /usr/share/perl5/Debian/Fai.pm usr/share/perl5/Debian/
-     $ROOTCMD pwconv # enable shadow
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  call_debootstrap() {
-     echo "Creating nfsroot for $1 using debootstrap"
+     local dversion=$(dpkg -l debootstrap | grep debootstrap | cut -f7 -d' ')
-     [ "$verbose" ] && echo "Calling debootstrap $1 $NFSROOT $2"
+     echo "Creating base system using debootstrap version $dversion"
-     yes '' | LC_ALL=C call_verbose debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $NFSROOT $2 || true
+     echo "Calling debootstrap $1 $NFSROOT $2"
+     yes '' | LC_ALL=C call_verbose debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $NFSROOT $2
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ add_all_host_entries() {
+     local ips=$(ifconfig | grep -w inet | cut -d : -f 2 | cut -d ' ' -f 1 | grep -v 127.0.0.1)
+     for eth in $ips; do
+         getent hosts $eth >> etc/hosts || true
+     done
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  create_base() {
-Line 231 
 create_base() {
+Line 256 
 create_base() {
      if [ "$FAI_DEBOOTSTRAP" ]; then
          call_with_stamp call_debootstrap $FAI_DEBOOTSTRAP
          $ROOTCMD apt-get clean
+         rm -f $NFSROOT/etc/resolv.conf
          echo "Creating base.tgz"
-         tar -l -C $NFSROOT -cf - --exclude var/tmp/base.tgz . | gzip > $NFSROOT/var/tmp/base.tgz
+         tar --one-file-system -C $NFSROOT -cf - --exclude var/tmp/base.tgz . | gzip > $NFSROOT/var/tmp/base.tgz
+         touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
      else
          die "\$FAI_DEBOOTSTRAP not defined."
      fi
-Line 241 
 create_base() {
+Line 268 
 create_base() {
  create_nfsroot() {
      mkdir -p $NFSROOT/$FAI
-     cd $NFSROOT || die "Error: Can't cd to $NFSROOT"
+     cd $NFSROOT || die "Can't cd to $NFSROOT"
      call_with_stamp create_base
+     # save the list of all packages in the base.tgz
+     $ROOTCMD dpkg --get-selections | egrep 'install$' | awk '{print $1}' > var/tmp/base-pkgs.lis
      if [ "$FAI_DEBMIRROR" ]; then
          [ "$verbose" ] && echo "Mounting $FAI_DEBMIRROR to $NFSROOT/$MNTPOINT."
-Line 256 
 create_nfsroot() {
+Line 285 
 create_nfsroot() {
      # liloconfig, dump and raidtool2 needs these files
      echo "# UNCONFIGURED FSTAB FOR BASE SYSTEM" > etc/fstab
      > etc/raidtab
-     mkdir -p lib/modules/$KERNELVERSION           # dirty trick to hoax lvm
-     >  lib/modules/$KERNELVERSION/modules.dep  # dirty trick to hoax lvm
      echo 'NTPSERVERS=""' > etc/default/ntp-servers
-     [ -d $NFSROOT/var/state ] || mkdir $NFSROOT/var/state
+     # live.conf will set hostname to debian
-     [ "$verbose" ] && echo "Try to copy $cfdir/sources.list or /etc/apt/sources.list."
+     cp /dev/null etc/live.conf
-     cp -v $cfdir/sources.list $NFSROOT/etc/apt/sources.list || \
-         cp -v /etc/apt/sources.list $NFSROOT/etc/apt/sources.list || \
+     cp -a $cfdir/apt $NFSROOT/etc
-         { echo "No sources.list file found."
-           echo "I think something is wrong. But I'll try to continue."
+     ainsl -as $NFSROOT/etc/hosts "127.0.0.1 localhost"
-         }
+     ainsl     $NFSROOT/etc/hosts "$NFSROOT_ETC_HOSTS"
+     add_all_host_entries
-     echo "127.0.0.1 localhost" >> etc/hosts
-     echo "$NFSROOT_ETC_HOSTS" >> etc/hosts
+     # we need these option before installing the first package. So we
-     [ -f /etc/apt/preferences ] && cp -v /etc/apt/preferences $NFSROOT/etc/apt
+     # can't put this into fai-nfsroot /etc/apt/apt.conf.d/90fai
-     [ -f $cfdir/preferences ] && cp -v $cfdir/preferences $NFSROOT/etc/apt
+     cat <<EOF >$NFSROOT/etc/apt/apt.conf.d/10fai
+ APT::Get::AllowUnauthenticated "true";
+ Aptitude::CmdLine::Ignore-Trust-Violations yes;
+ EOF
      echo "Upgrading $NFSROOT"
      LC_ALL=C call_verbose call_with_stamp upgrade_nfsroot
-     echo "Adding additional packages to $NFSROOT:"
+     LC_ALL=C call_with_stamp add_packages_nfsroot
-     echo "$packages"
-     LC_ALL=C call_verbose call_with_stamp add_packages_nfsroot
      call_with_stamp copy_fai_files
      # set timezone in nfsroot
-Line 284 
 create_nfsroot() {
+Line 312 
 create_nfsroot() {
      echo $timezone > etc/timezone
      rm -f etc/localtime && ln -sf /usr/share/zoneinfo/$timezone etc/localtime
-     # make little changes to nfsroot, because nfsroot is
+     rm etc/mtab && ln -s /proc/mounts etc/mtab
-     # read only for the install clients
+     ln -s /usr/sbin/fai etc/init.d/rcS
-     rm -rf etc/mtab var/run etc/sysconfig
-     ln -s /proc/mounts etc/mtab
-     ln -s /tmp/var/run var/run
-     ln -sf /tmp/var/state/discover var/state/discover
-     ln -s /tmp/etc/syslogsocket dev/log
-     ln -sf /tmp/etc/resolv.conf etc/resolv.conf
-     ln -sf /tmp etc/sysconfig
-     ln -s ../../sbin/rcS_fai etc/init.d/rcS
-     ln -sf /dev/null etc/network/ifstate
      # for nis
-     [ -d var/yp ] && ln -s /tmp/binding var/yp/binding
+ #    [ -d var/yp ] && ln -s /tmp/binding var/yp/binding
-     # turn off logging of loading kernel modules
-     [ -d var/log/ksymoops/ ] && rmdir var/log/ksymoops/
-     ln -s /dev/null var/log/ksymoops
      # definition for loopback device
      echo "iface lo inet loopback" > etc/network/interfaces
-     echo "*.* /tmp/fai/syslog.log" > etc/syslog.conf
      cat >> root/.profile <<-EOF
          PATH=/usr/local/sbin:/usr/local/bin:/usr/lib/fai:/bin:/sbin:/usr/bin:/usr/sbin:
          export PATH
-         . $SHAREFAI/subroutines
+         . /usr/lib/fai/subroutines
-         . $SHAREFAI/subroutines-$OS_TYPE
+         . /usr/lib/fai/subroutines-linux
          set -a
-         . /tmp/fai/variables.sh 2>/dev/null
+         . /tmp/fai/variables.log 2>/dev/null
  EOF
      call_verbose call_with_stamp setup_ssh
-     cat >$NFSROOT/etc/rc2.d/S01fai_abort <<-EOF
-         #!/bin/sh
-         echo FAI: installation aborted.
-         echo reboot with: faireboot
-         echo or after a logout
-         sh
-         cd /
-         umount -ar
-         reboot -dfi
- EOF
-     chmod a+rx $NFSROOT/etc/rc2.d/S01fai_abort
-     echo -e "\n$FAI_LOCAL_REPOSITORY" >> etc/apt/sources.list
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  upgrade_nfsroot() {
-     cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
+     if [ -f /etc/resolv.conf ]; then
+         cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf-installserver
+         cp -p $v /etc/resolv.conf $NFSROOT/etc/resolv.conf # this is needed during make-fai-nfsroot
+     fi
      $ROOTCMD apt-get update
-     $ROOTCMD apt-get -fyu install
+     $ROOTCMD apt-get -fy install fai-nfsroot
      $ROOTCMD apt-get check
      rm -rf $NFSROOT/etc/apm
      mount -t proc /proc $NFSROOT/proc
-     # fake start-stop-dameon
+     if [ $divert = 1 ]; then
-     fdivert /etc/init.d/rcS /sbin/start-stop-daemon /sbin/discover-modprobe
+         fdivert /usr/sbin/update-initramfs
-     cp /sbin/fai-start-stop-daemon $NFSROOT/sbin/
+         ln -s /bin/true $NFSROOT/usr/sbin/update-initramfs
-     ln -s /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
+     fi
+     fdivert /sbin/start-stop-daemon /sbin/discover-modprobe
+     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin
+     cp -p /sbin/fai-start-stop-daemon $NFSROOT/sbin/start-stop-daemon
      $ROOTCMD apt-get -y dist-upgrade
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  add_packages_nfsroot() {
-     $ROOTCMD apt-get -y --fix-missing install $packages </dev/null
+     local iarch=$($ROOTCMD dpkg --print-installation-architecture|tr /a-z/ /A-Z/)
-     if [ -n "$NFSROOT_PACKAGES" ] ; then
+     export FAI_ROOT=$NFSROOT
-         LC_ALL=C $ROOTCMD apt-get -y --fix-missing install $NFSROOT_PACKAGES </dev/null
+     export classes="NFSROOT $iarch"
-     fi
+ cat > $NFSROOT/etc/kernel-img.conf << EOF
-     $ROOTCMD apt-get clean
+ do_bootloader = No
+ do_initrd = No
+ warn_initrd = No
+ EOF
+     install_packages -l -p$cfdir > $NFSROOT/var/tmp/packages.nfsroot
+     echo "Adding additional packages to $NFSROOT:"
+     cat $NFSROOT/var/tmp/packages.nfsroot
+     call_verbose install_packages $v -p$cfdir
+     echo "install_packages exit code: $?"
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  umount_dirs() {
      [ -f $NFSROOT/usr/sbin/dpkg-divert ] &&
-        LC_ALL=C $ROOTCMD dpkg-divert --package fai --rename --remove /sbin/discover-modprobe
+        LC_ALL=C $ROOTCMD dpkg-divert --rename --remove /sbin/discover-modprobe
      cd /
-     sleep 2
      [ -d $NFSROOT/proc/self ] && umount $NFSROOT/proc
      [ -d $NFSROOT/proc/self ] && umount $NFSROOT/dev/pts
      if [ "$FAI_DEBMIRROR" ]; then
-Line 375 
 umount_dirs() {
+Line 388 
 umount_dirs() {
  get_kernel_version() {
      local package=$1
-     KERNELVERSION=`dpkg --info $package | grep "Package: kernel-image" | sed -e 's/.*kernel-image-'//`
+     KERNELVERSION=`dpkg --info $package | grep ' Package: '`
+     KERNELVERSION=${KERNELVERSION/*-image-/}
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  setup_bootp(){
-     if [ -x "`which mkelf-linux`" ]; then
+     mkdir -p $TFTPROOT
-         mkelf-linux --ip=any --output=/boot/fai/installimage \
+     if [ -x "$(which mkelf-linux)" ]; then
-           $NFSROOT/boot/$kfile-$KERNELVERSION
+         # does not work any mork if we do not know the excatly kernel name
+ :
+ #       mkelf-linux --ip=any --output=$TFTPROOT/installimage \
+ #         $NFSROOT/boot/$kfile-$KERNELVERSION
      else
          echo "Command mkelf-linux not found. Can not set up BOOTP booting. Please install the package mknbi and rerun fai-setup."
          return
-Line 390 
 setup_bootp(){
+Line 408 
 setup_bootp(){
      # imggen is free software from 3com - use ver1.00: 1.01 produces "Image too Big" errors.
      # it converts netboot images to images which are bootable by 3com network cards
-     if [ -x "`which imggen`" ]; then
+     if [ -x "$(which imggen)" ]; then
-         imggen -a /boot/fai/installimage /boot/fai/installimage_3com
+         imggen -a $TFTPROOT/installimage $TFTPROOT/installimage_3com
      fi
      echo "BOOTP environment prepared."
  }
-Line 401 
 setup_dhcp(){
+Line 419 
 setup_dhcp(){
      # pxe and dhcp environment
      local pxebin=/usr/lib/syslinux/pxelinux.0
-     cp -p $NFSROOT/boot/$kfile-$KERNELVERSION /boot/fai/$kfile-install
+     rm -f $NFSROOT/boot/*.bak
-     [ -f $pxebin ] && cp $pxebin /boot/fai
+     mkdir -p $TFTPROOT/pxelinux.cfg
-     [ -d /boot/fai/pxelinux.cfg ] || mkdir -p /boot/fai/pxelinux.cfg || true
+     cp -pv $NFSROOT/boot/$kfile-* $TFTPROOT
+     cp -pv $NFSROOT/boot/initrd.img-* $TFTPROOT
+     [ -f $pxebin ] && cp $pxebin $TFTPROOT
      echo "DHCP environment prepared. If you want to use it, you have to enable the dhcpd and the tftp-hpa daemon."
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  fdivert() {
+     local item
      for item in "$@"; do
-         LC_ALL=C $ROOTCMD dpkg-divert --quiet --package fai --add --rename $item
+         LC_ALL=C $ROOTCMD dpkg-divert --quiet --add --rename $item
      done
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  kernel_install() {
  # Install the kernel package
- if [ -f $KERNELPACKAGE ]; then
-     # determine kernel version
-     get_kernel_version $KERNELPACKAGE
      # create tftp boot images
      call_with_stamp install_kernel_nfsroot
-Line 437 
 if [ -f $KERNELPACKAGE ]; then
+Line 455 
 if [ -f $KERNELPACKAGE ]; then
                          echo "Unknown boot option" ;;
          esac
      done
- else
-     merror="with errors"
-     echo "Error. Kernel package $KERNELPACKAGE not found."
-     echo "No install kernel installed in /boot/fai."
-     echo "No kernel modules available in nfsroot."
- fi
  }
- # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ run_hooks() {
+     local file
+     if [ -z "$NFSROOT_HOOKS" ]; then
+         return
+     fi
+     if [ -d "$NFSROOT_HOOKS"  ]; then
+         echo "Running hooks..."
+         for file in $(ls $NFSROOT_HOOKS/* 2>/dev/null); do
+             . $file
+         done
+     fi
+ }
+ # - - - - - - - - - - - - - - - - - - - - - - - - - -
  # main routine
  # remove all kernels from nfsroot
  [ -n "$kremove" ] && {
      echo "Removing all kernels from NFSROOT."
-     rm -f $NFSROOT/boot/{System.map,vmlinuz,config}*
+     $ROOTCMD aptitude -y purge ~nlinux-image
-     rm -rf $NFSROOT/lib/modules/2.*
+     exit
  }
  # just install a new kernel to the nfsroot
  [ -n "$kinstall" ] && {
      trap "true" EXIT
      echo "Installing new kernel into the nfsroot."
+     if [ $divert = 1 ]; then
+         fdivert /usr/sbin/update-initramfs
+         ln -s /bin/true $NFSROOT/usr/sbin/fai
+     fi
+     LC_ALL=C add_packages_nfsroot
      kernel_install
-     echo "New kernel from $KERNELPACKAGE installed into the nfsroot."
+     run_hooks
-     exit
+     umount_dirs
+     trap "true" EXIT
+     echo "make-fai-nfsroot finished $merror."
+     exit 0
  }
- echo Creating FAI nfsroot can take a long time and will
+ echo "Creating FAI nfsroot in $NFSROOT."
- echo need more than $nfssize disk space in $NFSROOT.
+ echo "By default it needs more than 330 MBytes disk space."
+ echo "This may take a long time."
+ if [ $sshpreserve = 1 ]; then
+     # save old .ssh directory
+     tmptar=$(mktemp) || exit 12
+     # should we set the umask before? Does it influence the other parts?
+     tar -C $NFSROOT -cvf $tmptar root/.ssh
+ fi
  # Kill the directory if not in recover mode
  if [ -d $NFSROOT/$FAI -a ! "$recover" ]
  then
      echo $NFSROOT already exists. Removing $NFSROOT
      umount $NFSROOT/dev/pts 1>/dev/null 2>&1 || true
-     rm -rf $NFSROOT/.??* $NFSROOT/*
+     rm -rf $oldnfsroot/.??* $oldnfsroot/*
      # also remove files $NFSROOT/.? but not . and ..
-     find $NFSROOT ! -type d -xdev -maxdepth 1 | xargs -r rm -f
+     find $oldnfsroot -xdev -maxdepth 1 ! -type d | xargs -r rm -f
  fi
  # Create a new nfsroot
+ if [ ! -x "$(which debootstrap)" ]; then
+     die "Can't find debootstrap command. Aborting."
+ fi
  call_with_stamp create_nfsroot
  kernel_install
+ run_hooks
+ check_nfsroot
  umount_dirs
  trap "true" EXIT
  echo "make-fai-nfsroot finished $merror."
  exit 0
+ } 2>&1 | tee /var/log/fai/make-fai-nfsroot.log
+ echo "Log file written to /var/log/fai/make-fai-nfsroot.log"

 Legend:



Removed from v.2478
 


changed lines


 
Added in v.4743
 Legend:



Removed from v.2478
 


changed lines


 
Added in v.4743
-Removed from v.2478
+Added in v.4743

	ViewVC Help
Powered by ViewVC 1.1.5