Package: fai-client
Version: 3.2.1
Severity: normal
% dpkg -L fai-doc fai-server fai-client | xargs grep FAI_DEBOOTSTRAP_OPT
/usr/share/doc/fai-doc/fai-guide.html/ch-arch.html:FAI_DEBOOTSTRAP_OPTS must be
adopted to the architecture you're using.
/usr/share/doc/fai-doc/examples/simple/files/etc/fai/make-fai-nfsroot.conf/FAISERVER:FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
/usr/sbin/make-fai-nfsroot: yes '' | LC_ALL=C call_verbose debootstrap
$FAI_DEBOOTSTRAP_OPTS $1 $NFSROOT $2
/etc/fai/make-fai-nfsroot.conf:FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
/usr/lib/fai/subroutines-linux: yes '' | LC_ALL=C debootstrap
$FAI_DEBOOTSTRAP_OPTS $1 $FAI_ROOT $2
/usr/sbin/fai: export FAI_DEBOOTSTRAP_OPT=$(source
$FAI_ETC_DIR/make-fai-nfsroot.conf; echo $FAI_DEBOOTSTRAP_OPT)
%
As you can see it's usually FAI_DEBOOTSTRAP_OPTS, but once (inside
/usr/sbin/fai) it's FAI_DEBOOTSTRAP_OPT (the last 'S' is missing).
Therefore FAI_DEBOOTSTRAP_OPTS just doesn't work at all. (Do you
remember my crossbuilding problem I mentioned on #fai? That's the
reason for it. ;-))
My attached patch (fai_fix_debopts_vs_debopt.patch) fixes the issue.
The other patch (fai_mention_debopts.patch) mentions
$FAI_DEBOOTSTRAP_OPTS in the shell output.
BTW: Is there any specific reason why we have the same
call_debootstrap() function twice? Once it's present in
/usr/lib/fai/subroutines-linux and another time in
/usr/sbin/make-fai-nfsroot. AFAICS only the one from
/usr/lib/fai/subroutines-linux is relevant (I'm using 'fai
dirinstall').
regards,
-mika-
--- /usr/sbin/fai.orig 2007-10-17 21:20:47.000000000 +0000
+++ /usr/sbin/fai 2007-10-17 21:20:50.000000000 +0000
@@ -223,7 +223,7 @@
export NFSROOT=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo $NFSROOT)
export FAI_DEBOOTSTRAP=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf; echo
$FAI_DEBOOTSTRAP)
- export FAI_DEBOOTSTRAP_OPT=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf;
echo $FAI_DEBOOTSTRAP_OPT)
+ export FAI_DEBOOTSTRAP_OPTS=$(source $FAI_ETC_DIR/make-fai-nfsroot.conf;
echo $FAI_DEBOOTSTRAP_OPTS)
fi
--- /usr/lib/fai/subroutines-linux.orig 2007-10-17 21:21:11.000000000 +0000
+++ /usr/lib/fai/subroutines-linux 2007-10-17 21:21:03.000000000 +0000
@@ -124,7 +124,7 @@
local dversion=$(dpkg -l debootstrap | grep debootstrap | cut -f7 -d' ')
echo "Creating base system using debootstrap version $dversion"
- echo "Calling debootstrap $1 $FAI_ROOT $2"
+ echo "Calling debootstrap $1 $FAI_DEBOOTSTRAP_OPTS $FAI_ROOT $2"
yes '' | LC_ALL=C debootstrap $FAI_DEBOOTSTRAP_OPTS $1 $FAI_ROOT $2
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
