Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

configure initial-conf directory #17

Merged
merged 6 commits into from Mar 31, 2013
View
@@ -8,6 +8,7 @@ DISKTAB=disktab.48mb
NBLKS=98304
SRCDIR=${BSDSRCDIR:-/usr/src}
DESTDIR=${DESTDIR:-${CWD}/${WORKDIR}}
+CONFDIR=${CONFDIR:-initial-conf}
export SRCDIR DESTDIR CWD WORKDIR DISKTAB NBLKS
@@ -56,7 +57,8 @@ cp -p ${CWD}/conf ${CWD}/${WORKDIR}/
cp -p ${CWD}/mtree.conf ${CWD}/${WORKDIR}/
cp -pR ${CWD}/disktabs ${CWD}/${WORKDIR}/
cp -pR ${CWD}/tools ${CWD}/${WORKDIR}/
-cp -pR ${CWD}/initial-conf ${CWD}/${WORKDIR}/
+rm -rf ${CWD}/${WORKDIR}/initial-conf
+cp -pR ${CWD}/${CONFDIR} ${CWD}/${WORKDIR}/initial-conf
rm -r ${CWD}/${WORKDIR}/obj
mkdir -p ${CWD}/${WORKDIR}/obj
mkdir -p ${CWD}/obj
View
@@ -9,6 +9,7 @@ multicast_router=NO
bgpd_flags=NO
ospfd_flags=NO
+ripd_flags=NO
dhcpd_flags=NO
identd_flags=NO # E.g. "-bleH"
sasyncd_flags=NO
View
@@ -275,6 +275,10 @@ if [ X"${inetd}" != X"NO" -a -e /etc/inetd.conf ]; then
echo -n ' inetd'; inetd
fi
+if [ X"${ripd_flags}" != X"NO" -a -e /etc/ripd.conf ]; then
+ echo -n ' ripd'; ripd ${ripd_flags}
+fi
+
if [ X"${ospfd_flags}" != X"NO" -a -e /etc/ospfd.conf ]; then
echo -n ' ospfd'; ospfd ${ospfd_flags}
fi
View
2 list
@@ -225,6 +225,8 @@ COPY ${DESTDIR}/usr/sbin/ndp usr/sbin/ndp
COPY ${DESTDIR}/usr/sbin/ntpd usr/sbin/ntpd
COPY ${DESTDIR}/usr/sbin/ospfd usr/sbin/ospfd
COPY ${DESTDIR}/usr/sbin/ospfctl usr/sbin/ospfctl
+COPY ${DESTDIR}/usr/sbin/ripd usr/sbin/ripd
+COPY ${DESTDIR}/usr/sbin/ripctl usr/sbin/ripctl
#COPY ${DESTDIR}/usr/sbin/portmap usr/sbin/portmap
COPY ${DESTDIR}/usr/sbin/ppp usr/sbin/ppp
COPY ${DESTDIR}/usr/sbin/pppctl usr/sbin/pppctl