From 1b29cf0bcf78a8796a95fbe3f0d7cc3965e17ca3 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 18 Aug 2011 15:48:47 +0000 Subject: [PATCH] integrate-distro.sh: Ongoing improvements - Fix /etc/ldap.conf - Disable fetchmsttfonts (for now) - Add /boot to fstab --- scripts/integrate-distro.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 0e899ccb..044b89b3 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -9,7 +9,7 @@ initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd # ata_piix (as opposed to ahci) doesn't seem to support sata-hotplugging #kernel_version=2.6.37.4 kernel_version=2.6.37.6-jng135-default -rpm_kernel_version=2.6.37.6-jng135-4 +rpm_kernel_version=2.6.37.6~jng135-4 umask 0022 unused_pkgs=" @@ -143,9 +143,9 @@ payload_pkgs=" ftp-server-run bprof-run - fetchmsttfonts " +# fetchmsttfonts # -- functions usage() { @@ -436,6 +436,7 @@ make_etc_fstab() |debugfs /sys/kernel/debug debugfs noauto 0 0 |usbfs /proc/bus/usb usbfs noauto 0 0 |devpts /dev/pts devpts mode=0620,gid=5 0 0 + |/dev/sda2 /boot auto defaults 0 0 |/usr/share/syslinux /srv/nfs/boot/pxe/bin auto bind 0 0 EOT } @@ -502,7 +503,9 @@ make_etc_resolv_conf() make_etc_ldap_conf() { - cat /etc/ldap.conf + cat /etc/ldap.conf.netboot | sed ' + s/__DHCPSIADDR__/127.0.0.1/ + ' } make_etc_openldap_ldap_conf() @@ -515,7 +518,7 @@ EOT make_netboot_etc_hosts() { - cat /etc/hosts + [ -f /etc/hosts.netboot ] && cat /etc/hosts.netboot _cat< $root/etc/openldap/ldap.conf chmod 644 $root/etc/openldap/ldap.conf - make_etc_ldap_conf > $root/etc/hosts + make_etc_ldap_conf > $root/etc/ldap.conf make_etc_hosts > $root/etc/hosts make_etc_resolv_conf > $root/etc/resolv.conf make_etc_fstab > $root/etc/fstab @@ -818,6 +821,7 @@ cmd_install() #kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'` # seed the ldap database + # FIXME: this does not work off a netboot distro slapcat | chroot $root /usr/sbin/slapadd -qw [ "$install_dev" ] && setup_boot_loader_local