Browse Source

Merge pull request #100 from josephbisch/lsb-release-fix

Use lsb_release to get codename rather than /etc/lsb-release
pull/105/head
Dev Random 5 years ago
parent
commit
b0aba0e1b3
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      bin/make-base-vm
  2. 1
    1
      target-bin/bootstrap-fixup.in

+ 1
- 1
bin/make-base-vm View File

@@ -74,7 +74,7 @@ if [ $ARCH = "amd64" -a $SUITE = "hardy" ]; then
FLAVOUR=server
fi

addpkg=pciutils,build-essential,git-core,subversion,language-pack-en,wget
addpkg=pciutils,build-essential,git-core,subversion,language-pack-en,wget,lsb-release

if [ $LXC = "1" ]; then
addpkg=$addpkg,lxc

+ 1
- 1
target-bin/bootstrap-fixup.in View File

@@ -2,7 +2,7 @@

set -e

. /etc/lsb-release
DISTRIB_CODENAME=`lsb_release -cs`

echo "deb http://HOSTIP:3142/archive.ubuntu.com/ubuntu $DISTRIB_CODENAME main universe" > $1/etc/apt/sources.list
echo "deb http://HOSTIP:3142/security.ubuntu.com/ubuntu $DISTRIB_CODENAME-security main universe" >> $1/etc/apt/sources.list

Loading…
Cancel
Save