integrate-distro.sh: Ongoing improvements

- Add make_etc_resolv_conf
  - Add variable rpm_kernel_version
This commit is contained in:
Jan Lindemann 2011-08-17 15:02:51 +00:00 committed by Jan Lindemann
commit 08459eaade

View file

@ -7,16 +7,17 @@ o_name=suse-11.4
cmd=install
initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci"
# 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-4
#kernel_version=2.6.37.4
kernel_version=2.6.37.6-jng135-default
rpm_kernel_version=2.6.37.6-jng135-4
umask 0022
unused_pkgs="
sysvinit-systemd
kernel
kernel-default-2.6.37.6~jng135-4
kernel-syms-2.6.37.6~jng135-4
kernel-source-2.6.37.6~jng135-4
kernel-default-$rpm_kernel_version
kernel-syms-$rpm_kernel_version
kernel-source-$rpm_kernel_version
aufs-kmp
"
@ -25,6 +26,7 @@ unused_pkgs="
special_pkgs="
aufs
aufs-kmp-default
kernel-default-$rpm_kernel_version
rpm
"
@ -34,7 +36,7 @@ special_pkgs="
payload_pkgs="
kernel-$kernel_version
kernel
aufs
mkinitrd
sysvinit
@ -493,6 +495,11 @@ make_etc_hosts()
EOT
}
make_etc_resolv_conf()
{
cat /etc/resolv.conf
}
make_etc_ldap_conf()
{
cat /etc/ldap.conf
@ -788,6 +795,7 @@ cmd_install()
make_etc_ldap_conf > $root/etc/hosts
make_etc_hosts > $root/etc/hosts
make_etc_resolv_conf > $root/etc/resolv.conf
make_etc_fstab > $root/etc/fstab
make_etc_sysctl_conf > $root/etc/sysctl.conf
make_etc_issue > $root/etc/issue