[Fai-commit] r3631 - trunk/bin
fai-commit at lists.alioth.debian.org
fai-commit at lists.alioth.debian.org
Sat Jul 22 23:21:23 UTC 2006
Author: lange
Date: 2006-07-22 23:21:22 +0000 (Sat, 22 Jul 2006)
New Revision: 3631
Modified:
trunk/bin/make-fai-nfsroot
Log:
new path for /etc/fai/apt/sources.list
Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot 2006-07-22 23:16:33 UTC (rev 3630)
+++ trunk/bin/make-fai-nfsroot 2006-07-22 23:21:22 UTC (rev 3631)
@@ -77,8 +77,8 @@
exit 3
fi
-if [ ! -s "$cfdir/sources.list" ]; then
- echo "$cfdir/sources.list does not exists. Can't continue."
+if [ ! -d "$cfdir/apt" ]; then
+ echo "$cfdir/apt/ does not exists. Can't continue."
exit 7
fi
@@ -246,11 +246,10 @@
echo 'NTPSERVERS=""' > etc/default/ntp-servers
[ -d $NFSROOT/var/state ] || mkdir $NFSROOT/var/state
- cp -v $cfdir/sources.list $NFSROOT/etc/apt/sources.list
+ cp -a $cfdir/apt $NFSROOT/etc
egrep -q "127.0.0.1" etc/hosts 2>/dev/null || echo "127.0.0.1 localhost" >> etc/hosts
egrep -q "$NFSROOT_ETC_HOSTS" etc/hosts 2>/dev/null || echo "$NFSROOT_ETC_HOSTS" >> etc/hosts
- [ -f $cfdir/preferences ] && cp -v $cfdir/preferences $NFSROOT/etc/apt
# we need these option before installing the first package. So we
# can't put this into fai-nfsroot /etc/apt/apt.conf.d/90fai
cat <<EOF >$NFSROOT/etc/apt/apt.conf.d/10fai
More information about the Fai-commit
mailing list