diff options
| -rwxr-xr-x | bin/debian-edu-faiinstall | 6 | ||||
| -rw-r--r-- | conf/debian-edu/debian-edu-fai.conf (renamed from conf/debian-edu/faiinstall.conf) | 0 | ||||
| -rw-r--r-- | debian/install | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bin/debian-edu-faiinstall b/bin/debian-edu-faiinstall index 5f80f74..e803a4c 100755 --- a/bin/debian-edu-faiinstall +++ b/bin/debian-edu-faiinstall @@ -84,8 +84,8 @@ fi # source debian-edu-fai's config file # Allow site specific overrides to the variables -if [ -f /etc/debian-edu/faiinstall.conf ] ; then - . /etc/debian-edu/faiinstall.conf +if [ -f /etc/debian-edu/debian-edu-fai.conf ] ; then + . /etc/debian-edu/debian-edu-fai.conf fi # keep a copy of /srv/tftp/ltsp if this is the first attempt to deploy @@ -326,7 +326,7 @@ cat <<EOF > "${tftpdir}/debian-edu-fai/ltsp.ipxe" # Set the default image (img) based on arch, or to root-path if it's not empty #cpuid --ext 29 && set img amd64+${codename} || set img i386+${codename} -# choose default boot entry (via configurable variables, see /etc/debian-edu/faiinstall.conf) +# choose default boot entry (via configurable variables, see /etc/debian-edu/debian-edu-fai.conf) set img ${default_arch}+${default_codename} goto start diff --git a/conf/debian-edu/faiinstall.conf b/conf/debian-edu/debian-edu-fai.conf index 4ffd80d..4ffd80d 100644 --- a/conf/debian-edu/faiinstall.conf +++ b/conf/debian-edu/debian-edu-fai.conf diff --git a/debian/install b/debian/install index 35d413e..727d878 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,4 @@ -conf/debian-edu/faiinstall.conf etc/debian-edu/ +conf/debian-edu/debian-edu-fai.conf etc/debian-edu/ conf/debian-edu/fai/ etc/debian-edu/ conf/exports.d/debian-edu-fai.exports usr/share/debian-edu-fai/exports.d/ fai/config usr/share/debian-edu-fai/fai/ |