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

integrate-distro.sh: Ongoing improvements

Browse source 
- 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
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/integrate-distro.sh
View file

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