janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 22:40:38 +01:00
Code Activity

integrate-distro.sh: Ongoing improvements

Browse source 
- Fix /etc/ldap.conf
  - Disable fetchmsttfonts (for now)
  - Add /boot to fstab
This commit is contained in:
Jan Lindemann 2011-08-18 15:48:47 +00:00 • committed by Jan Lindemann
commit 1b29cf0bcf
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/integrate-distro.sh
View file

@ -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 # ata_piix (as opposed to ahci) doesn't seem to support sata-hotplugging
#kernel_version=2.6.37.4 #kernel_version=2.6.37.4
kernel_version=2.6.37.6-jng135-default 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 umask 0022
unused_pkgs=" unused_pkgs="
@ -143,9 +143,9 @@ payload_pkgs="
ftp-server-run ftp-server-run
bprof-run bprof-run
fetchmsttfonts
" "
# fetchmsttfonts
# -- functions # -- functions
usage() usage()
{ {
@ -436,6 +436,7 @@ make_etc_fstab()
|debugfs /sys/kernel/debug debugfs noauto 0 0 |debugfs /sys/kernel/debug debugfs noauto 0 0
|usbfs /proc/bus/usb usbfs noauto 0 0 |usbfs /proc/bus/usb usbfs noauto 0 0
|devpts /dev/pts devpts mode=0620,gid=5 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 |/usr/share/syslinux /srv/nfs/boot/pxe/bin auto bind 0 0
EOT EOT
} }
@ -502,7 +503,9 @@ make_etc_resolv_conf()
make_etc_ldap_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() make_etc_openldap_ldap_conf()
@ -515,7 +518,7 @@ EOT
make_netboot_etc_hosts() make_netboot_etc_hosts()
{ {
cat /etc/hosts [ -f /etc/hosts.netboot ] && cat /etc/hosts.netboot
_cat<<EOT _cat<<EOT
EOT EOT
} }
@ -793,7 +796,7 @@ cmd_install()
make_etc_openldap_ldap_conf > $root/etc/openldap/ldap.conf make_etc_openldap_ldap_conf > $root/etc/openldap/ldap.conf
chmod 644 $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_hosts > $root/etc/hosts
make_etc_resolv_conf > $root/etc/resolv.conf make_etc_resolv_conf > $root/etc/resolv.conf
make_etc_fstab > $root/etc/fstab 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-//'` #kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'`
# seed the ldap database # seed the ldap database
# FIXME: this does not work off a netboot distro
slapcat | chroot $root /usr/sbin/slapadd -qw slapcat | chroot $root /usr/sbin/slapadd -qw
[ "$install_dev" ] && setup_boot_loader_local [ "$install_dev" ] && setup_boot_loader_local