integrate-distro.sh: Ongoing improvements

- Set DHCPD_INTERFACE to etc in /etc/sysconfig/dhcpd
- Add packages ftp-server-run, openvpn, nfs-kernel-server
This commit is contained in:
Jan Lindemann 2011-06-21 13:04:06 +00:00 committed by Jan Lindemann
commit a14a6e444c

View file

@ -52,6 +52,7 @@ payload_pkgs="
courier-authlib-ldap courier-authlib-ldap
xinetd xinetd
apache2 apache2
nfs-kernel-server
unscd unscd
nss_ldap nss_ldap
@ -68,6 +69,7 @@ payload_pkgs="
sudo sudo
sysconfig sysconfig
glibc-locale glibc-locale
openvpn
xorg-x11 xorg-x11
xorg-x11-driver-video xorg-x11-driver-video
@ -109,6 +111,7 @@ payload_pkgs="
jux-client-run jux-client-run
feedfsd-run feedfsd-run
snmp-manager-run snmp-manager-run
ftp-server-run
bprof-run bprof-run
" "
# -- functions # -- functions
@ -615,6 +618,15 @@ insserv_all()
done done
} }
set_sysconf_value()
{
local file="$1"
local key="$2"
local value="$3"
sed "s/^ *$key *=.*/$key=$value/" $root/$file > $root/$file.tmp
mv $root/$file.tmp $root/$file
}
cmd_install() cmd_install()
{ {
if true; then if true; then
@ -636,6 +648,7 @@ cmd_install()
/etc/sysconfig/keyboard \ /etc/sysconfig/keyboard \
/etc/sysconfig/clock \ /etc/sysconfig/clock \
/etc/openldap/schema/authldap.schema \ /etc/openldap/schema/authldap.schema \
/etc/bprof.secret \
; do ; do
install -d -m 755 `dirname $root$c` install -d -m 755 `dirname $root$c`
cp -rp $c $root$c cp -rp $c $root$c
@ -672,9 +685,8 @@ cmd_install()
insserv_all insserv_all
local boot_conf=$root/etc/sysconfig/boot set_sysconf_value etc/sysconfig/boot RUN_PARALLEL no
sed 's/RUN_PARALLEL *=.*/RUN_PARALLEL=no/' $boot_conf > $boot_conf.tmp set_sysconf_value etc/sysconfig/dhcpd DHCPD_INTERFACE eth0 # TODO: bprof this
mv $boot_conf.tmp $boot_conf
cat $root_password_file | chroot $root /usr/bin/passwd --stdin cat $root_password_file | chroot $root /usr/bin/passwd --stdin
chroot $root /sbin/ldconfig chroot $root /sbin/ldconfig