diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 54f8070f..8c90d198 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -3,7 +3,7 @@ # -- defaults # install_dev=/dev/sdb arch=`uname -m` -suse_version=12.2 +suse_version=12.3 o_name=suse-$suse_version cmd=install initrd_modules="aufs via-rhine e1000 e1000e myri10ge forcedeth usbcore ohci-hcd ehci-hcd uhci-hcd hid usbhid ahci 8139too sata_nv" @@ -26,6 +26,7 @@ case $suse_version in dhcpcd kbd + unscd portmap xorg-x11-Xnest xorg-x11-fonts-scalable @@ -58,9 +59,24 @@ case $suse_version in kernel_flavour= ;; 12.2) - kernel_version=3.7.8~jng11 + payload_pkgs=" + unscd + " + kernel_version=3.7.8-jng11-default rpm_kernel_version=3.7.8~jng11-1 ;; +12.3) + base_pkgs=" + module-init-tools + " + + payload_pkgs=" + nscd + " + + kernel_version=3.7.10-jng12-default + rpm_kernel_version=3.7.10~jng12-1 + ;; esac umask 0022 @@ -73,9 +89,20 @@ unused_pkgs=" aufs-kmp " +base_pkgs=" + $base_pkgs + coreutils + sysvinit +" + +update_pkgs=" + $update_pkgs + zypper +" # -- pciutils # used by jux, should be done by grepping /proc-files special_pkgs=" + $special_pkgs aufs aufs-kmp-default kernel$kernel_flavour-$rpm_kernel_version @@ -118,7 +145,6 @@ payload_pkgs=" nfs-kernel-server tftp - unscd nss_ldap fuse @@ -827,8 +853,8 @@ cmd_install() make_etc_issue > $root/etc/issue make_etc_issue_net > $root/etc/issue.net - host_zypper "base" install --auto-agree-with-licenses coreutils sysvinit - host_zypper "base update" install --auto-agree-with-licenses zypper + host_zypper "base" install --auto-agree-with-licenses $base_pkgs + host_zypper "base update" install --auto-agree-with-licenses $update_pkgs #undo_rpmnew run setup_zypper_repos base update payload