From 7e603a29f911078be7350d13bdff1a3eaf7be466 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 6 Jan 2014 16:40:13 +0100 Subject: [PATCH] more tweaks for f20 --- pkgs.py | 2 +- vbuild-init-lxc.sh | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs.py b/pkgs.py index 84010db6..ced8d97c 100755 --- a/pkgs.py +++ b/pkgs.py @@ -35,7 +35,7 @@ default_arch='x86_64' known_arch = ['i386', 'i686', 'x86_64'] default_fcdistro='f14' known_fcdistros = [ 'centos5','centos6', - 'f8', 'f10','f12', 'f14', 'f16', 'f18', + 'f8', 'f10','f12', 'f14', 'f16', 'f18','f20', 'sl6', # debians 'squeeze','wheezy', diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh index 561be5e8..288cbff1 100755 --- a/vbuild-init-lxc.sh +++ b/vbuild-init-lxc.sh @@ -195,21 +195,24 @@ TYPE=Ethernet MTU=1500 EOF -# set the hostname -if [[ "$fcdistro" == "f18" ]] ; then - cat < ${rootfs_path}/etc/hostname + # set the hostname + case "$fcdistro" in + f18|f2?) + cat < ${rootfs_path}/etc/hostname $HOSTNAME EOF -else - cat < ${rootfs_path}/etc/sysconfig/network + echo ;; + *) + cat < ${rootfs_path}/etc/sysconfig/network NETWORKING=yes HOSTNAME=$HOSTNAME EOF - # set minimal hosts - cat < $rootfs_path/etc/hosts + # set minimal hosts + cat < $rootfs_path/etc/hosts 127.0.0.1 localhost $HOSTNAME EOF -fi + echo ;; + esac dev_path="${rootfs_path}/dev" rm -rf $dev_path -- 2.43.0