From 08459eaade829e41834ff159c3632043e8681ab3 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 17 Aug 2011 15:02:51 +0000 Subject: [PATCH] integrate-distro.sh: Ongoing improvements - Add make_etc_resolv_conf - Add variable rpm_kernel_version --- scripts/integrate-distro.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 74926d00..0e899ccb 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -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