From a84906fe5e02ef15c1ce4f5189ce9d056bed5d8b Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Wed, 4 May 2016 03:49:29 -0400 Subject: [PATCH 1/2] fix issue 1029 [FVT] The word trusty is hard coded in the script mlnxofed_ib_install.v2 --- .../scripts/Mellanox/mlnxofed_ib_install.v2 | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 index 558b9aa12..3a4881ce1 100644 --- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 +++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 @@ -250,18 +250,27 @@ if [ "$OS" = "Linux" ]; then echo "[Error] please make your $HOSTNAME has ability to access ports.ubuntu.com" >&2 exit 1 fi + + + echo "get distro name form /etc/lsb-release ......" + source /etc/lsb-release >/dev/null 2>&1 + if [ -z "$DISTRIB_CODENAME" ]; then + echo "[Error] can't get DISTRIB_CODENAME " >&2 + exit 1 + fi + echo "DISTRIB_CODENAME=$DISTRIB_CODENAME ...[OK]" cp /etc/apt/sources.list /etc/apt/sources.list.bak - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty main/d" /etc/apt/sources.list - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates main/d" /etc/apt/sources.list - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty universe/d" /etc/apt/sources.list - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates universe/d" /etc/apt/sources.list + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME main/d" /etc/apt/sources.list + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates main/d" /etc/apt/sources.list + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME universe/d" /etc/apt/sources.list + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates universe/d" /etc/apt/sources.list cat <<-EOF >>/etc/apt/sources.list -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty universe -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME universe +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates universe EOF apt-get clean all @@ -354,18 +363,25 @@ EOF sourceslist="$IMGROOTPATH/etc/apt/sources.list" cp "$sourceslist" "${sourceslist}.bak" + + echo "get distro name form $IMGROOTPATH/etc/lsb-release ......" + source $IMGROOTPATH/etc/lsb-release >/dev/null 2>&1 + if [ -z "$DISTRIB_CODENAME" ]; then + echo "[Error] can't get DISTRIB_CODENAME " >&2 + exit 1 + fi + echo "DISTRIB_CODENAME=$DISTRIB_CODENAME ...[OK]" - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty main/d" $sourceslist - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty main/d" $sourceslist - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates main/d" $sourceslist - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty universe/d" $sourceslist - sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ trusty-updates universe/d" $sourceslist + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME main/d" $sourceslist + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates main/d" $sourceslist + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME universe/d" $sourceslist + sed -i "/deb http:\\/\\/ports.ubuntu.com\\/ubuntu-ports\\/ $DISTRIB_CODENAME-updates universe/d" $sourceslist cat <<-EOF >>"$sourceslist" -deb http://ports.ubuntu.com/ubuntu-ports/ trusty main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main -deb http://ports.ubuntu.com/ubuntu-ports/ trusty universe -deb http://ports.ubuntu.com/ubuntu-ports/ trusty-updates universe +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME universe +deb http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates universe EOF chroot "$IMGROOTPATH" apt-get clean all From 16421352646a76aa5f05aefea60801a2b7c39936 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Fri, 6 May 2016 01:31:58 -0400 Subject: [PATCH 2/2] add execute permission --- xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 old mode 100644 new mode 100755