From 41b68a1478926ef60d5b03484253a85615272799 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Sat, 10 Feb 2018 08:52:45 -0500 Subject: [PATCH] add libnss_dns to xcat-genesis-base --- xCAT-genesis-builder/buildrpm | 12 ++++++++---- xCAT-genesis-builder/install | 2 ++ xCAT-genesis-builder/xCAT-genesis-builder.spec | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm index dfd318818..c4fb822a0 100755 --- a/xCAT-genesis-builder/buildrpm +++ b/xCAT-genesis-builder/buildrpm @@ -130,10 +130,10 @@ if [ "$HOSTOS" = "mcp" ]; then # # and some files are in different directories elif [ $BUILDARCH = "ppc64" ]; then if [ "$HOSTOS" = "Pegas1.0" ]; then - sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install - sed -i 's/ reiserfstune//' $DRACUTMODDIR/install - sed -i 's/ vconfig//' $DRACUTMODDIR/install - sed -i 's/ ntp-wait//' $DRACUTMODDIR/install + sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install + sed -i 's/ reiserfstune//' $DRACUTMODDIR/install + sed -i 's/ vconfig//' $DRACUTMODDIR/install + sed -i 's/ ntp-wait//' $DRACUTMODDIR/install fi sed -i 's/ efibootmgr//' $DRACUTMODDIR/install sed -i 's/ dmidecode//' $DRACUTMODDIR/install @@ -141,6 +141,10 @@ elif [ $BUILDARCH = "ppc64" ]; then sed -i 's/\/lib\/terminfo\/v\/vt100/\/usr\/share\/terminfo\/v\/vt100/g' $DRACUTMODDIR/install fi +libnss_pkgname=`find /usr/lib64/ -name libnss_dns-2*.so | xargs basename` +sed -i "s/\/lib64\/libnss_dns-2.12.so/\/usr\/lib64\/$libnss_pkgname/g" $DRACUTMODDIR/install +sed -i 's/\/lib64\/libnss_dns.so.2/\/usr\/lib64\/libnss_dns.so.2/' $DRACUTMODDIR/install + mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs # run dracut diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install index f1042fe61..564d50883 100755 --- a/xCAT-genesis-builder/install +++ b/xCAT-genesis-builder/install @@ -7,6 +7,7 @@ dracut_install grep ip hostname /usr/bin/awk egrep grep dirname expr dracut_install mount.nfs sshd vi reboot lspci parted screen mkfs mkfs.ext4 mkfs.xfs xfs_db #mkfs.btrfs removed #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm dracut_install mkswap df brctl vconfig ifenslave ssh-keygen scp clear dhclient lldpad +dracut_install /lib64/libnss_dns-2.12.so /lib64/libnss_dns.so.2 dracut_install poweroff ntpq ntpd ntp-wait hwclock date /usr/share/terminfo/x/xterm /usr/share/terminfo/s/screen /etc/nsswitch.conf /etc/services dracut_install /sbin/rsyslogd /etc/protocols umount /bin/rpm /usr/lib/rpm/rpmrc dracut_install chmod /sbin/route /sbin/ifconfig /usr/bin/whoami /usr/bin/head /usr/bin/tail basename /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids #ibm fw wrapper requirements @@ -587,6 +588,7 @@ inst_dir /var/lib/nfs/statd/sm inst_dir /var/lib/nfs/statd/sm.bak inst_dir /var/lib/nfs/rpc_pipefs/nfs inst "/bin/bash" "/bin/sh" +inst "/lib64/libnss_dns-2.12.so" inst "/lib/terminfo/l/linux" "/lib/terminfo/l/linux" inst "/lib/terminfo/v/vt100" "/lib/terminfo/v/vt100" inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" diff --git a/xCAT-genesis-builder/xCAT-genesis-builder.spec b/xCAT-genesis-builder/xCAT-genesis-builder.spec index 3a9b428a1..3fbde6cbb 100644 --- a/xCAT-genesis-builder/xCAT-genesis-builder.spec +++ b/xCAT-genesis-builder/xCAT-genesis-builder.spec @@ -4,7 +4,7 @@ Version: %{?version:%{version}}%{!?version:%(cat Version)} Release: %{?release:%{release}}%{!?release:%(cat Release)} Epoch: 1 AutoReq: false -Requires: ipmitool screen btrfs-progs lldpad rpm-build mstflint xfsprogs nc rpmdevtools libstdc++-devel pciutils bridge-utils ntp ntp-perl iprutils psmisc mdadm bind-utils dosfstools usbutils libusbx +Requires: ipmitool screen btrfs-progs lldpad rpm-build mstflint xfsprogs nc rpmdevtools libstdc++-devel pciutils bridge-utils ntp ntp-perl iprutils psmisc mdadm bind-utils dosfstools usbutils libusbx bc Prefix: /opt/xcat AutoProv: false