more tweaks for f20

diff --git a/pkgs.py b/pkgs.py
index 84010db..ced8d97 100755 (executable)
--- 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 561be5e..288cbff 100755 (executable)
--- 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 <<EOF > ${rootfs_path}/etc/hostname
+    # set the hostname
+    case "$fcdistro" in 
+       f18|f2?)
+           cat <<EOF > ${rootfs_path}/etc/hostname
 $HOSTNAME
 EOF
-else
-    cat <<EOF > ${rootfs_path}/etc/sysconfig/network
+           echo ;;
+       *)
+            cat <<EOF > ${rootfs_path}/etc/sysconfig/network
 NETWORKING=yes
 HOSTNAME=$HOSTNAME
 EOF
-    # set minimal hosts
-    cat <<EOF > $rootfs_path/etc/hosts
+            # set minimal hosts
+           cat <<EOF > $rootfs_path/etc/hosts
 127.0.0.1 localhost $HOSTNAME
 EOF
-fi
+           echo ;;
+    esac
 
     dev_path="${rootfs_path}/dev"
     rm -rf $dev_path