sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use $DISTRO_NAME instead of local lsb_release

Browse Source 
The $DISTRO_NAME var is now set in all of the OS elements
in environment.d.  This patch removes the call to
lsb_release and instead uses the $DISTRO_NAME variable.

Change-Id: I7088eb88b6a3611fef5a21a6b62975876549465f
This commit is contained in:
Ryan Brady 2014-06-26 16:44:11 -04:00
parent fb1adbbfee
commit 4ca059f9d9
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/base/pre-install.d/03-baseline-tools
View File

@ -4,11 +4,8 @@
set -eu set -eu
set -o pipefail set -o pipefail
# If lsb_release is missing, just do nothing. case $DISTRO_NAME in
DISTRO=`lsb_release -si` || true 'ubuntu'|'debian')
case $DISTRO in
'Ubuntu'|'Debian')
# Note: add-apt-repository would be nice for RPM platforms too - so when we # Note: add-apt-repository would be nice for RPM platforms too - so when we
# need something like it, create a wrapper in dpkg/bin and fedora/bin. # need something like it, create a wrapper in dpkg/bin and fedora/bin.
apt-get -y update apt-get -y update

4
elements/ramdisk/install.d/20-install-dhcp-client
View File

@ -2,8 +2,6 @@
set -eux set -eux
set -o pipefail set -o pipefail
DISTRO=`lsb_release -si` || true if [ "opensuse" = "$DISTRO_NAME" ]; then
if [ "openSUSE project" = "$DISTRO" ]; then
install-packages dhcp-client install-packages dhcp-client
fi fi