fedora: fc21: Added Fedora 21 template and related configurations

9 years ago · 96442c83cb
parent 0b3eab8591
commit 96442c83cb
26 changed files with 492 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ mnt_*
 *.img
 install-templates.sh
 yum_repo_qubes/*
+scripts_fedora/base_rpms_fc21/*
--- a/appmenus_fc21/netvm-whitelisted-appmenus.list
+++ b/appmenus_fc21/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_fc21/vm-whitelisted-appmenus.list
+++ b/appmenus_fc21/vm-whitelisted-appmenus.list
@ -0,0 +1,3 @@
+gnome-terminal.desktop
+nautilus.desktop
+firefox.desktop
--- a/appmenus_fc21/whitelisted-appmenus.list
+++ b/appmenus_fc21/whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-prefs.desktop
+system-config-date.desktop
+system-config-printer.desktop
--- a/appmenus_fc21_minimal/netvm-whitelisted-appmenus.list
+++ b/appmenus_fc21_minimal/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+xterm.desktop
--- a/appmenus_fc21_minimal/vm-whitelisted-appmenus.list
+++ b/appmenus_fc21_minimal/vm-whitelisted-appmenus.list
@ -0,0 +1 @@
+xterm.desktop
--- a/appmenus_fc21_minimal/whitelisted-appmenus.list
+++ b/appmenus_fc21_minimal/whitelisted-appmenus.list
@ -0,0 +1 @@
+xterm.desktop
--- a/scripts_fedora/01_install_core.sh
+++ b/scripts_fedora/01_install_core.sh
@ -5,6 +5,12 @@ if ! [ -f "${INSTALLDIR}/tmp/.prepared_base" ]; then
    rpm --initdb --root=$INSTALLDIR
    rpm --import --root=$INSTALLDIR $SCRIPTSDIR/keys/*

+    if [ "$DIST" == "fc21" ]; then
+        echo "-> Retreiving core RPM packages..."
+        INITIAL_PACKAGES="filesystem setup fedora-release"
+        yum --disablerepo=\* --enablerepo=fedora -y --installroot="${INSTALLDIR}" --releasever=${DIST/fc/} install --downloadonly --downloaddir="$SCRIPTSDIR/base_rpms_${DIST}" ${INITIAL_PACKAGES}
+    fi
+
    echo "-> Installing core RPM packages..."
    rpm -i --root=$INSTALLDIR $SCRIPTSDIR/base_rpms/*.rpm || exit 1

--- a/scripts_fedora/02_install_groups.sh
+++ b/scripts_fedora/02_install_groups.sh
@ -1,26 +1,27 @@
-#!/bin/sh
-if [ -n "${TEMPLATE_FLAVOR}" ]; then
-	PKGLISTFILE="$SCRIPTSDIR/packages_${DIST}_${TEMPLATE_FLAVOR}.list"
-		if ! [ -r "${PKGLISTFILE}" ]; then
-		echo "ERROR: ${PKGLISTFILE} does not exists!"
-		exit 1
-	fi
-elif [ -r "$SCRIPTSDIR/packages_${DIST}.list" ]; then
-	PKGLISTFILE="$SCRIPTSDIR/packages_${DIST}.list"
-else
-	PKGLISTFILE="$SCRIPTSDIR/packages.list"
-fi
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :

-echo "--> Preparing environment..."
-mount -t proc proc mnt/proc
+source "${SCRIPTSDIR}/distribution.sh"

-export PKGGROUPS=$(cat $PKGLISTFILE)
+# Create system mount points
+prepareChroot

-export YUM0=$PWD/yum_repo_qubes
-yum clean all -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR
-yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR $PKGGROUPS || RETCODE=1
-yum update -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR || RETCODE=1
+#### '----------------------------------------------------------------------
+info ' Trap ERR and EXIT signals and cleanup (umount)'
+#### '----------------------------------------------------------------------
+trap cleanup ERR
+trap cleanup EXIT

-umount mnt/proc
+#### '----------------------------------------------------------------------
+info " Installing extra packages in script_${DIST}/packages.list file"
+#### '----------------------------------------------------------------------
+export YUM0=${PWD}/yum_repo_qubes
+yum clean all -c ${PWD}/yum.conf ${YUM_OPTS} -y --installroot=${INSTALLDIR}
+installPackages
+yum update -c ${PWD}/yum.conf ${YUM_OPTS} -y --installroot=${INSTALLDIR} || exit 1

-exit $RETCODE
+#### '----------------------------------------------------------------------
+info ' Cleanup'
+#### '----------------------------------------------------------------------
+trap - ERR EXIT
+trap
--- a/scripts_fedora/04_install_qubes.sh
+++ b/scripts_fedora/04_install_qubes.sh
@ -1,4 +1,5 @@
 #!/bin/sh
+
 echo "--> Preparing environment..."
 mount -t proc proc $PWD/mnt/proc

@ -23,4 +24,8 @@ if [ "$TEMPLATE_FLAVOR" != "minimal" ]; then
    $SCRIPTSDIR/add_3rd_party_software.sh || RETCODE=1
 fi

+# Distribution specific steps
+source ./functions.sh
+buildStep "${0}" "${DIST}"
+
 exit $RETCODE
--- a/scripts_fedora/04_install_qubes_fc21.sh
+++ b/scripts_fedora/04_install_qubes_fc21.sh
@ -0,0 +1,13 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+echo "-->  Creating Xwrapper.config override..."
+cat > "${INSTALLDIR}/etc/X11/Xwrapper.config" <<EOF
+allowed_users = anybody
+needs_root_rights = yes
+EOF
+
+echo "--> Setting locale to utf8..."
+cat > "${INSTALLDIR}/etc/locale.conf" <<EOF
+LANG=en_US.utf8
+EOF
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-20
+++ b/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-20
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQINBFDjFIMBEACxi7RjaVkeqIIPBmCFUuVLBXNYBw9BY3tAZRfYx++kgU40aApo
+ikvpGN80lTzXrt4NlnTVMebAREgUerNyT8Or7ZDXGPv5p3Mhi43bG5N1pm1fq3Hu
+xgr6OE6JZN6rNU+qkyynaWv0kHBRHKA0QuzrmRzYPmwIip5rY2LjQ9wHeENm6Wo6
+Ykti2VN7Ij2tH1kEPDAuHF9EpPmqlfESrqNrSGbkJUifGlFDzhAZ983apy0kWoju
+lGHHUEtZtCDvn5KvroI4j8oZ1JDbNRNAYMbMAf4FL0wjQGvY+0abKHVSIahZIaQe
+A51VrQ/anUFCC3TppR6ujrOKCoM7nTPmePSBWGJ/amtLT7+MC01knOwBbtI8gBl6
+3F4EU6VX62BG7HgrJgTR0PU7Qo79rkCybuFRv6tHv3DZtCa0LXvxmKK6xTfWAF1T
+klPaVKUh4qI8IeG5iqfmePxvaIkQt7Jp2K9/We/FXElzwJsRfpStfYBgAWvXSTRJ
+Fohy2OHVC33eInPB1y/uUlmZ24vSisNdMK5et5KKO1Xa0Gm+sS+cJyj+ChFGBfLx
+sZbAitf8suvJTs6ZHOKY6yc0xg4AU7fthMwcZYLGM+IlTTyS+BAp3I2ipSSS3TT3
+hkHvZONSJ7doAauYJy+DjkhFxp4rObWh5CVfUNcaDxRA4piPql8qG++JPwARAQAB
+tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMCkgPHJw
+bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC
+UOMUgwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQljqISK5ogiN+SRAA
+iUQ07hzO+dWdOUI/rSSE3ZKNePSQKl72/7aFeceuJKcTv9RuLb3PjbYqt8xDl3xJ
+sVXLoEqWPkEiXv16Y8mESxMsEAqe5JrvS/LjZ2GCZGr3nCvOi39n73tcgfL7CZn2
+ShnetMG7xQlbhgPQbevrxn+4p5j8rwFc/d8BITjBZUS8nozNgNgElwGPj52pEhyG
+yfha+VjfNXEAHLuAWUZJDQqIyJ9EJ2glU4VgUD/HH91dFq6AL6+vd6hj8iIpChiS
+dl5xLlJ3qqKExYwUbDdO8Zr7FPMw2n5ClE8X/0tO2YdcKHQdjqjzfqXIVkK/4+Hr
+dQ1grSCYq/O7MZwTJCqgbwwL7SbJWmAQVGH9trjzVZ1uTcSX/IaciGShaOzWucfM
+TYVYD0p9n/KSiwvWJySTIVxWAef9FegmgGgZ+FpwN8btRHrD/wN057W8lQ7ZD4U4
+5TkgQZSVj7u4kjzWq0/sb9dyURPZILMsfqDtvbLzAO88/WQz9Y2p59sXQumZOno3
+0ZNYTgDzag7ot51iYnPMNXlGfKYz2/h14RxIPo0hzZ3b8ckWOUOlbtGLw+JVGUlz
+B9iPme5TgNuX6umU12992kN6lJ4Es6o+a3DDlk3Q5/bU8Yq+vP/l7AQz1JYbCVLw
+e6LYuhJ0mGfGyE8zUxJdnmAoZZyhZG1naFDLCu0b5l8=
+=Ceg5
+-----END PGP PUBLIC KEY BLOCK-----
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-21
+++ b/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-21
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+mQINBFHN/E8BEADC4tpuU6vRz5FTDcbiZrhpWkhjtA3QIPGm9qlOt/woOisra6Gh
+lriua9LzkLRnj5fTpbgciGjE5qM5Jy/YLZeHsqtHOt2DSWYoEcQbeRYJDO//aKtC
+vw/rOH1s5rkfdtaIjcIjaVo3vW8nmoSfUMBP7p+uvzjo6OcOPhZlD9DOWgeZfo0N
+J4mPuxMmi/uK5PirW1HC1XVHnpdS2a9wM4KzrddOA6aA6Gdu88VyG2pb3k41U2ox
+8GA6mxJ06XwKNqKD15cyty5fG5mWIdRvMeP0nUShxTUw6lt6qH8MWr/Xj6BPiHcf
+xNdLi9SsojRy4W38StWLKfYRtwLnGoylw2PX74wsMkBuliGpWM8nHLCb4Y2hhs5M
+mzy4c8Nu8/pPCTcREu2zhS4mbHhzA8RAqaR5uBG6Uj2GKmU7BP0WviSCUTCNf30z
+XJeGYWDk9GZJFiBAa/S9qLKUX5rRwvPaF2m8PM2Hwaafsm9cQQUu8I1uTkEkwZer
+iRQJe0UPcjrxKsWrCtl1x3mcVLqtRlK8TWAyTM/W9uf90Q3bTnfJqN8QVdPQNz/M
+bR4dNLuVQWr0PvwzmOEn/yWVBqv9tFJHXsbQXr98lupZL+kPz53DW/9VIYIk0kFM
+Aj75XtbX+mm0PmA+Te3DnMWC3QqLDXZIx/nHzjdYLTGCOUPJpFAHKHvKmwARAQAB
+tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkgPHJw
+bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC
+Uc38TwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQPIN9DWRG2FkaaQ/7
+BxsoRJKz4nIgjgi5L0qXmY0DNl2A+dk5PDE8bYOvLMB48EE9FhFbtRt8xbbE3iHT
+IUcWT4ABJtktqeuzJ3UcAkac6asy+260oQOj8ripM8myZLZGMGmMExj2i02RDxq1
+OtT68FH4yvacTPKbSgN6D6xSpKHlQL5yurQQBQLZ2i/+MdyM6btG6Ebv/2nHapQJ
+PvC+AIwgvUFt8iFf4p4HfkQ94ZtZopdDGAMFazwGGpp+sCFpCondsunMLjbEMn51
+WHJNv82jmoop2NBoWWQVdTsAZumRSpjB7jxev8S7vk30iii8oivewVNwDbz9pHAv
+5HdRBFB203w+aA8TqGj9WfMyWyrxWABSYEJhVUGNVKcy0XqWO+iB9ufGN6zsXXoo
+AHYw6oC1EJVEgU0DBIMmPeSDmUmhRlalcgQYSnLC00lMETfaO5w4lLi7PS5xkTzK
+gELzCmoWPBoqD2trfGx4lFRjzLZttKPdW0dFvqpd/E2cRdclz/WHyi718F6iyHOf
+MG2T+mMz5nURokQX5onfB+IX82ADZXSntD/1qsDno4EO2BDItpnV3rrXz3Lnnfyi
+ac20V6CeKenFNo2aBu2aS8A46rxpdrg8H0ZglwO7GQ0NpJe2Vrbl1vB224WbnABx
+x9PKNaZo0RGgx0WqZtEv6Wk68cpnZ+HvClWoaT7P4BA=
+=OMMM
+-----END PGP PUBLIC KEY BLOCK-----
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-20
+++ b/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-20
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mQINBFDjFwEBEADZMa0qnUSLgJ96uYL4VdbRQebbr2IeCweDWJbADZA462uXXu/i
+UO0hZOxE1oXogMRFWAZOcFQeg2NgSv+zStLGaB0ojon/zMsRa99uEDDzc8zZsJm0
+n0ssUjQHginGrhUpqAxHiy8iUNbUzrRvwNT37Jq3qTh9g9+Z4GqFRQdcLSyTKqQ7
+RZE1Kbx1dGq6EzmGhzHZNjacU8A/GtIHQT/zXNFtqtMKBzGoWuwm2kc1yqmIS6sg
+ryiZ6ESlaqS/GQBd2pRmQO/+VlnZqBQyWvxJ4KiP+Ck0CGx8vJNQk2Z1Ug0uExdu
+Z1H1Ml9QpZRx6T2QTu/4DmocdTzgXouNJl1u9jVpPPrg4dGmrEpIXF4PNmkQEqQT
+4zLi30MDIWwaZ16hmvOMlGJTuH825en5pS0oeUtexLe3qR8IhMicoMYda7WXZ6WN
+C1V8ZMu6O9mRcYgVk7dKgm09XoIYmnPR/yaQduNYIAEPRs7krPNBHi/++CNMcdJo
+/qfD8u+znJds1bv+hjMolzZenIrhc3GM5tP2FSmZsyOIQV3v5aZsFI3g4LO3GF+4
+HYONnD3yxZIpXSaJJ36AFzSJM7dFx+OjxzUJP8aOCgc3jM0dhFNodhAl+/aqCzaJ
+KBCzumqblAsYGXldzpAwGs1QhD3BjBTuyuwKoMFLGmgGSI3pxDNX6VeoeQARAQAB
+tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMCkg
+PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA
+IgUCUOMXAQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQY8DejLXymIPg
+EBAApGuEq6bIBhkdUmBsbDFDA6HzdgEV3YeWfFc3FubhCcSmPV5yC1sCD/GPW7XX
+M8iOCmLgEFz9sfN9hSppgMLVQSk30AKxf7gAV58XCjaM17wtbU7SNaX3PSYWTnwc
+U2KDY9C77cE9atr7cvg8GNW5QHwzTIMez7zqI7reeF+6Me7m6N8ZsawKp6NRtJzs
+gnq1Lhz26Al6uhR5GrrvbmxIieWR40areJECKV1wKkWW/EaB8dkyn0DZJCcuxciV
+hpV9O+5Ze1mvBZ6DORj/7iNWfrHUurXYDuM+Xuc41SdX9XaMqB9Hb0KwHVz7ZCUo
+O6ULDrtP+9OGhNqSDN11/8j3Wqih98PP63b+UwWGNTvbiglgUmd7kodqIawQfqtw
+d9oCgD67Qky83rxT9sZh5hz6ZLfuRNJb61R9h2lzZze8SyzKqRDCuYW6Y6c2Jp8q
+2NMMD2Njb5WC/+4xjr6ihRU0qz3nIV9F73mVX0mZekT3hNxnszT4KlV5QMZ31tok
+AvN1wH+wYoUxKQxw+zphgNNZLD1wEYDD/zkjKxnj3z3A74M2wsVLu322iEOXS/Ec
+SoXGra0D53LURrXGS7KzVrF0kdVPoXY20O1i5FlgdO0+y+jbjV3hVYlW1XOSc2h+
+XW6jUiO8fQF8PTF1f42m12Ywyq3DETyoubpv5dvKredYVBk=
+=3dNj
+-----END PGP PUBLIC KEY BLOCK-----
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-21
+++ b/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-21
@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+mQINBFHN/o4BEADYs5qmEKG5ORh7vXN2NUStj3YMpS5RdjlgBG3PUyLpzSYYrvlF
+kBHa9xGrT7LQfTmhT9TtN0fpHA8/343oExO/lZKhDmtgE7/yFUv8LUtHiSxt/sO5
+oPaRKZmuHzgJahRwX3kkwCOGcos8GOgJLQF3DojuwH6sScKnB9J+8sBsKQ26WrmE
+0mtEcGD0ZxurGEAGeu2D4zA4XWAGukJl4NJDsjoHdVpZyow66AREo9/JV4dXZdd6
+jHvUMpOleO1YQyTIoODxPyx2qqUycerZ4QD4kBXW6j8p5gUW9+rIFoqGjrDOfgr8
+PwzMJNOlTPNVWRtr4+nN5TgD0WB4WnkY4dM/9le5KECb2neQo11ujj000Jh30Pbb
+sf+wWeKu0H7rRDXG4mB15uqTnOydpeg+K1I0SeYogcjLvUfTk9ZBan3lw2t1/bjr
+7eIffy2l+FXaa2OtWSM9IkxVg+/2tOMrW2DZUA5uGlhZ+Vtr4pfPfuyAt1mSIFjj
+lbO8I2bivyrvgwdTm2YxneGNrK92htzdhq1jvliAGxCzBy4h2sK9os6ft70Jcau4
+2fIsiHhpYHk98RXhQKjt/1ULpP8KeJtKE551wtHqfixiRpSVF6DtvyYV7Ix4Ukgr
+jAgWWCnJWWF4a+i23Cuyf7hWRae0ukhqQ3UGPhOphjK5xwS3940xY7D3BwARAQAB
+tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkg
+PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA
+IgUCUc3+jgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQAXRG0aZos3ar
+uA//Syin1BOi3GPKhDeRXRy3wjfgEWF+zibXOk12o26kQEAUX6tTqOxJ8vl1nt7G
+rHnNFKmnY11IqJGb6zwP22e8kBUfUBEcLMwLe7RUdV5VTqkFvpuk+fsihYu6RCUj
+kteuwnO57s58QypAkMKRPEtx6ozepq8JUAklMQkdnpasp91r+YA2DzKDSGXCZ1uS
+f9FGgrqNLtnpoRdkCrO80mirYyYlak7u5adwH2Z4aVI9kOXPLc0LWc25eoKeo7Lb
+hhKg4T58NUDucK+qZb8lTAMQQKnnvOjmnWC0T4SQlWQeffi6xSm8euKjjdbbCd0f
+R/1+BsUWWgT+3Sw80prdG591+S5F40JU9PYP7bsCinVKmGneDCIlAISZ7dnTuLkh
+s7GuZv8iojpiGR92Ea22pMi09013ZTGwmSr7iwo+j6PRY8MmrflhBQQx8CKb/W7n
+IOlBfVHWWQ/n0/9e0iw1YcBu3nno6k8LQQS5LQclnabhq6l8k19ZgC2Y9otjDRPL
+NyvQi+5tM2uW8iKEA5bmoNpJlZKKSI7e1UzN9kB3eObRZxq6JU9nzT+E9RYwYTBY
+y9VM0pAXaeA8byREEcELhsuku+Kzjs3TF4hEY9lNDKfitr0jropeED/Tb62Z0QO1
+f6C5r5Wl8dz0fM+Fj4nstVEhAEVtAwVXl/6ATjs9qwTV+8M=
+=r0EG
+-----END PGP PUBLIC KEY BLOCK-----
--- a/scripts_fedora/3rd_party_software/google-linux_signing_key.pub
+++ b/scripts_fedora/3rd_party_software/google-linux_signing_key.pub
@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+mQGiBEXwb0YRBADQva2NLpYXxgjNkbuP0LnPoEXruGmvi3XMIxjEUFuGNCP4Rj/a
+kv2E5VixBP1vcQFDRJ+p1puh8NU0XERlhpyZrVMzzS/RdWdyXf7E5S8oqNXsoD1z
+fvmI+i9b2EhHAA19Kgw7ifV8vMa4tkwslEmcTiwiw8lyUl28Wh4Et8SxzwCggDcA
+feGqtn3PP5YAdD0km4S4XeMEAJjlrqPoPv2Gf//tfznY2UyS9PUqFCPLHgFLe80u
+QhI2U5jt6jUKN4fHauvR6z3seSAsh1YyzyZCKxJFEKXCCqnrFSoh4WSJsbFNc4PN
+b0V0SqiTCkWADZyLT5wll8sWuQ5ylTf3z1ENoHf+G3um3/wk/+xmEHvj9HCTBEXP
+78X0A/0Tqlhc2RBnEf+AqxWvM8sk8LzJI/XGjwBvKfXe+l3rnSR2kEAvGzj5Sg0X
+4XmfTg4Jl8BNjWyvm2Wmjfet41LPmYJKsux3g0b8yzQxeOA4pQKKAU3Z4+rgzGmf
+HdwCG5MNT2A5XxD/eDd+L4fRx0HbFkIQoAi1J3YWQSiTk15fw7RMR29vZ2xlLCBJ
+bmMuIExpbnV4IFBhY2thZ2UgU2lnbmluZyBLZXkgPGxpbnV4LXBhY2thZ2VzLWtl
+eW1hc3RlckBnb29nbGUuY29tPohjBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwEC
+HgECF4AFAkYVdn8CGQEACgkQoECDD3+sWZHKSgCfdq3HtNYJLv+XZleb6HN4zOcF
+AJEAniSFbuv8V5FSHxeRimHx25671az+uQINBEXwb0sQCACuA8HT2nr+FM5y/kzI
+A51ZcC46KFtIDgjQJ31Q3OrkYP8LbxOpKMRIzvOZrsjOlFmDVqitiVc7qj3lYp6U
+rgNVaFv6Qu4bo2/ctjNHDDBdv6nufmusJUWq/9TwieepM/cwnXd+HMxu1XBKRVk9
+XyAZ9SvfcW4EtxVgysI+XlptKFa5JCqFM3qJllVohMmr7lMwO8+sxTWTXqxsptJo
+pZeKz+UBEEqPyw7CUIVYGC9ENEtIMFvAvPqnhj1GS96REMpry+5s9WKuLEaclWpd
+K3krttbDlY1NaeQUCRvBYZ8iAG9YSLHUHMTuI2oea07Rh4dtIAqPwAX8xn36JAYG
+2vgLAAMFB/wKqaycjWAZwIe98Yt0qHsdkpmIbarD9fGiA6kfkK/UxjL/k7tmS4Vm
+CljrrDZkPSQ/19mpdRcGXtb0NI9+nyM5trweTvtPw+HPkDiJlTaiCcx+izg79Fj9
+KcofuNb3lPdXZb9tzf5oDnmm/B+4vkeTuEZJ//IFty8cmvCpzvY+DAz1Vo9rA+Zn
+cpWY1n6z6oSS9AsyT/IFlWWBZZ17SpMHu+h4Bxy62+AbPHKGSujEGQhWq8ZRoJAT
+G0KSObnmZ7FwFWu1e9XFoUCt0bSjiJWTIyaObMrWu/LvJ3e9I87HseSJStfw6fki
+5og9qFEkMrIrBCp3QGuQWBq/rTdMuwNFiEkEGBECAAkFAkXwb0sCGwwACgkQoECD
+D3+sWZF/WACfeNAu1/1hwZtUo1bR+MWiCjpvHtwAnA1R3IHqFLQ2X3xJ40XPuAyY
+/FJG
+=Quqp
+-----END PGP PUBLIC KEY BLOCK-----
--- a/scripts_fedora/3rd_party_software/rpmfusion-free-release-20.noarch.rpm
+++ b/scripts_fedora/3rd_party_software/rpmfusion-free-release-20.noarch.rpm
--- a/scripts_fedora/3rd_party_software/rpmfusion-free-release-21.noarch.rpm
+++ b/scripts_fedora/3rd_party_software/rpmfusion-free-release-21.noarch.rpm
--- a/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-20.noarch.rpm
+++ b/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-20.noarch.rpm
--- a/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm
+++ b/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm
--- a/scripts_fedora/add_3rd_party_software.sh
+++ b/scripts_fedora/add_3rd_party_software.sh
@ -1,11 +1,133 @@
-#!/bin/sh
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :

-INSTALLDIR=$PWD/mnt
+source "${SCRIPTSDIR}/distribution.sh"
+INSTALLDIR=${PWD}/mnt
+VERSION=${DIST/fc/}
+
+#### '----------------------------------------------------------------------
+info ' Trap ERR and EXIT signals and cleanup (umount)'
+#### '----------------------------------------------------------------------
+trap cleanup ERR
+trap cleanup EXIT
+
+# Google Chrome
+# =============
+# Key Details:
+# - Download: https://dl-ssl.google.com/linux/linux_signing_key.pub
+# - Key ID: Google, Inc. Linux Package Signing Key <linux-packages-keymaster@google.com>
+# - Fingerprint: 4CCA 1EAF 950C EE4A B839 76DC A040 830F 7FAC 5991
+#
+# sudo rpm --import linux_signing_key.pub
+#
+# You can verify the key installation by running:
+# - rpm -qi gpg-pubkey-7fac5991-*
+#
+# To manually verify an RPM package, you can run the command:
+# - rpm --checksig -v packagename.rpm
+#
+# RPMFusion
+# =========
+# RPM Fusion free for Fedora 20
+# - pub  4096R/AE688223 2013-01-01 RPM Fusion free repository for Fedora (20) <rpmfusion-buildsys@lists.rpmfusion.org>
+# Key fingerprint = 0017 DDFE FD13 2929 9D55  B1D3 963A 8848 AE68 8223
+#
+# RPM Fusion nonfree for Fedora 20
+# - pub  4096R/B5F29883 2013-01-01 RPM Fusion nonfree repository for Fedora (20) <rpmfusion-buildsys@lists.rpmfusion.org>
+# Key fingerprint = A84D CF58 46CB 10B6 5C47  6C35 63C0 DE8C B5F2 9883
+#
+# RPM Fusion free for Fedora 21
+# - pub  4096R/6446D859 2013-06-28 RPM Fusion free repository for Fedora (21) <rpmfusion-buildsys@lists.rpmfusion.org>
+#   Key fingerprint = E9AF 4932 31E2 DF6F FDFE  0852 3C83 7D0D 6446 D859
+#
+# RPM Fusion nonfree for Fedora 21
+# - pub  4096R/A668B376 2013-06-28 RPM Fusion nonfree repository for Fedora (21) <rpmfusion-buildsys@lists.rpmfusion.org>
+# Key fingerprint = E160 058E F06F A4C3 C15D  0F86 0174 46D1 A668 B376
+
+#### '----------------------------------------------------------------------
+info ' Copying 3rd party software to "tmp" directory to prepare for installation'
+#### '----------------------------------------------------------------------
+cp -rp ${SCRIPTSDIR}/3rd_party_software ${INSTALLDIR}/tmp
+
+#### '----------------------------------------------------------------------
+info ' Installing google-chrome repos'
+#### '----------------------------------------------------------------------
+cp ${SCRIPTSDIR}/3rd_party_software/google-linux_signing_key.pub ${INSTALLDIR}/etc/pki/rpm-gpg/
+cat << EOF > ${INSTALLDIR}/etc/yum.repos.d/google-chrome.repo
+[google-chrome]
+name=google-chrome - \$basearch
+baseurl=http://dl.google.com/linux/chrome/rpm/stable/\$basearch
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/google-linux_signing_key.pub
+EOF
+ 
+#### '----------------------------------------------------------------------
+info ' Installing adobe repo'
+#### '----------------------------------------------------------------------
+rpm -i --root=${INSTALLDIR} ${SCRIPTSDIR}/3rd_party_software/adobe-release-x86_64-*.noarch.rpm || exit 1

-rpm -i --root=$INSTALLDIR $SCRIPTSDIR/3rd_party_software/adobe-release-x86_64-*.noarch.rpm || exit 1
 if [ "$TEMPLATE_FLAVOR" == "fullyloaded" ]; then
-    rpm --import --root=$INSTALLDIR mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux
-    yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR flash-plugin || exit 1
+    #### '------------------------------------------------------------------
+    info ' Installing 3rd party software'
+    #### '------------------------------------------------------------------
+    mount --bind /etc/resolv.conf ${INSTALLDIR}/etc/resolv.conf
+    chroot yum install $YUM_OPTS -y google-chrome-stable
+    rpm --import --root=${INSTALLDIR} ${INSTALLDIR}/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux
+    yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=${INSTALLDIR} flash-plugin || exit 1
 else
-    yum-config-manager -c $PWD/yum.conf --installroot=$INSTALLDIR --disable adobe-linux-x86_64 > /dev/null
+    chroot yum-config-manager --disable google-chrome > /dev/null
+    chroot yum-config-manager --disable adobe-linux-x86_64 > /dev/null
 fi
+
+#### '----------------------------------------------------------------------
+info ' Installing rpmfusion repos'
+#### '----------------------------------------------------------------------
+if [ ${VERSION} -ge 20 ]; then
+    # Import repo keys
+    chroot rpm --import /tmp/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-21
+    chroot rpm --import /tmp/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-21
+
+    # Verify repos
+    chroot rpm --checksig /tmp/3rd_party_software/rpmfusion-free-release-21.noarch.rpm
+    chroot rpm --checksig /tmp/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm
+
+    # Install repos
+    chroot rpm -i /tmp/3rd_party_software/rpmfusion-free-release-21.noarch.rpm
+    chroot rpm -i /tmp/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm
+
+    # Disable rpmfusion-free repos
+    chroot yum-config-manager --disable rpmfusion-free > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-source > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-updates > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-updates-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-updates-source > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-updates-testing > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-updates-testing-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-updates-testing-source > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-rawhide > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-rawhide-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-free-rawhide-source > /dev/null
+
+    # Disable rpmfusion-nonfree repos
+    chroot yum-config-manager --disable rpmfusion-nonfree > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-source > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-updates > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-updates-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-updates-source > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-updates-testing > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-updates-testing-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-updates-testing-source > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-rawhide > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-rawhide-debuginfo > /dev/null
+    chroot yum-config-manager --disable rpmfusion-nonfree-rawhide-source > /dev/null
+fi
+
+#### '----------------------------------------------------------------------
+info ' Cleanup'
+#### '----------------------------------------------------------------------
+rm -rf ${INSTALLDIR}/tmp/3rd_party_software
+trap - ERR EXIT
+trap
--- a/scripts_fedora/distribution.sh
+++ b/scripts_fedora/distribution.sh
@ -0,0 +1,84 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source ./functions.sh >/dev/null
+source ./umount_kill.sh >/dev/null
+
+setVerboseMode
+output "${bold}${under}INFO: ${SCRIPTSDIR}/distribution.sh imported by: ${0}${reset}"
+
+# ==============================================================================
+# Cleanup function
+# ==============================================================================
+function cleanup() {
+    errval=$?
+    trap - ERR EXIT
+    trap
+    error "${1:-"${0}: Error.  Cleaning up and un-mounting any existing mounts"}"
+    umount_kill "${INSTALLDIR}" || true
+
+    # Return xtrace to original state
+    [[ -n "${XTRACE}" ]] && [[ "${XTRACE}" -eq 0 ]] && set -x || set +x
+
+    exit $errval
+}
+
+# ==============================================================================
+# Create system mount points
+# ==============================================================================
+function prepareChroot() {
+    info "--> Preparing environment..."
+    mount -t proc proc "${INSTALLDIR}/proc"
+}
+
+# ==============================================================================
+# Yum install package(s)
+# ==============================================================================
+function yumInstall() {
+    files="$@"
+    mount --bind /etc/resolv.conf ${INSTALLDIR}/etc/resolv.conf
+    if [ -e "${INSTALLDIR}/usr/bin/yum" ]; then
+        chroot yum install ${YUM_OPTS} -y ${files[@]} || exit 1
+    else
+        yum install -c ${PWD}/yum.conf ${YUM_OPTS} -y --installroot=${INSTALLDIR} ${files[@]} || exit 1
+    fi
+    umount ${INSTALLDIR}/etc/resolv.conf
+}
+
+# ==============================================================================
+# Install extra packages in script_${DIST}/packages.list file
+# -and / or- TEMPLATE_FLAVOR directories
+# ==============================================================================
+function installPackages() {
+    if [ -n "${1}" ]; then
+        # Locate packages within sub dirs
+        if [ ${#@} == "1" ]; then
+            getFileLocations packages_list "${1}" ""
+        else
+            packages_list="$@"
+        fi
+    else
+        # TODO:  Add into template flavor handler the ability to 
+        #        detect flavors that will not append recursive values
+        # Only file 'minimal' package lists
+        if [ "$TEMPLATE_FLAVOR" == "minimal" ]; then
+            getFileLocations packages_list "packages.list" "${DIST}_minimal"
+        else
+            getFileLocations packages_list "packages.list" "${DIST}"
+        fi
+        if [ -z "${packages_list}" ]; then
+            error "Can not locate a package.list file!"
+            umount_all || true
+            exit 1
+        fi
+    fi
+
+    for package_list in ${packages_list[@]}; do
+        debug "Installing extra packages from: ${package_list}"
+        declare -a packages
+        readarray -t packages < "${package_list}"
+
+        info "Packages: "${packages[@]}""
+        yumInstall "${packages[@]}" || return $?
+    done
+}
--- a/scripts_fedora/keys_fc21/RPM-GPG-KEY-fedora-21-primary
+++ b/scripts_fedora/keys_fc21/RPM-GPG-KEY-fedora-21-primary
@ -0,0 +1,31 @@
+pub  4096R/95A43F54 2013-11-14 Fedora (21) <fedora@fedoraproject.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQINBFKEQVoBEADOb9mKZZtTIVRMMejO9dco+dsv6L2ZvnlidMVaudoD7pN9hl35
+xUZFwQxzATy2iCoFY92WU1zIKxCg9fa0gS9jGGl9rOI/1uQm+i/KxkzJCKW0CYpA
+QVNNYHewQa7JHuTYbaN+kWEBGG0RWJw6BN2NxR3zDkLT2tgcf0zBobeUMi6XwFg4
+jikJ/vi84MEX4Gky/OtVXuzk0fGnP7xYPYfBkfG5FbMj3UxbfAAn1Sr9PxIFdCxP
+c06h9kkO+gJPD7Cis1pNg9HWpssIEHIk0ZaL0sssMSpSsgP0f44UpKVCq0+JDJmM
+EEu2KfeV9r2dEiEude+Gg4U3rbUh2PTZpQKKwPyggQwk6nPHbrqrr9zBIH5iyYuU
+vdTVO7YrDqYK5o3WhqKYG19oNbtCziNuC9x8RLFkerr0amQjy1dZsofGYSLjZ8Er
+3PgtUMunH4Y7O6FbRljniqYoQl8GDMaxhptvrOY+NqRAQiRLzpT6BB3nZhO9iSk9
+Lvb9hwjMFsN5xh2wCxYV+XNjnMSO+LZisJimKhyMVhimcYK1P0sU49RcglmS2mhP
+OGb14pH+B94lMve/kQu4unnhKhtkPA0mOyeH8BGl63vvEbJtMzpMqbHvzr60h8PA
+H7EsAsYJZp4Xa+F1wBRBJ3xKaUTQ7r7mmpFsdgzlI2wjNgLbyEV4YSNVjwARAQAB
+tCZGZWRvcmEgKDIxKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCUoRBWgIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQia1Oh5WkP1S+
+rQ//V5WOPjl0UjEgRYsjwm6LGZe8/P4muXdKX1OuRF+MLZxW1Pbr43zjvfY9tZlD
+v4QpI5uECX5To9phrOXI8ghFpI4aQbRe2enk4dksgdhzdBW0JgM3JRf8F+tPLKEF
+kB2/tGqi/irp+Hij/tiHwUZjx8qKGbF0r2bxAkSS5qkmalTs6PwcWwEN4a6sKPgw
+iVGL2VRM46YoNDORwH7HYeODbJtyJyX3NvcluNKf/D3OZFaNYH+nUISlaPAbC5HJ
+sVmZD9vm2E2ypErbZzrY3N8PRgHuIrDmO+LmksWteofpWZO84lyuvgYgXPy8Q3Ls
+p0zfE5zv8EbX4WG+l1SF7hVdPC7UEPUuHmlm81Fi69tSvwO+N4PrDU094VHT+UQ
+rKmtSGDOfSx6FvrEqMakiEyBgKNwhsVJbi6/LXHMBImbSN3tOxSMBxGEi2cSn/KF
+LRukmMoEw4PHZK+gPpwsP1cTfxezs/aH/PMBaPUgg1qCu9uNNFmEs3d5LLSee9RM
+U+gwECX+D44vqJUAT7xM1A4yij3rPF2RegOmNhu5wg4zNSGKoVV8QsMOKrjIZHmG
+pFVvYFP4OxLEwh6OYZj9qfaw445ryqfcxSNzZ3m+VSwHuZ049v7u8fndZ8TREVXx
+hdjPHxjtaiJ1R0Zb4ZvycUcDLl2Xc1CRJAMVvFJcg1SNrGs=
+=xtMc
+-----END PGP PUBLIC KEY BLOCK-----
--- a/scripts_fedora/packages_fc21.list
+++ b/scripts_fedora/packages_fc21.list
@ -0,0 +1,32 @@
+@^workstation-product-environment
+@libreoffice
+emacs
+vim-enhanced
+gnupg
+xterm
+firefox
+thunderbird
+keepassx
+perl-File-MimeInfo
+network-manager-applet
+xfce4-terminal
+exo
+--exclude=kdegames
+--exclude=firstboot
+--exclude=xorg-x11-drv-nouveau
+--exclude=firewall-config,firewalld*
+--exclude=gnome-boxes
+--exclude=qemu-img,qemu-common,qemu-system
+--exclude=qemu-*,libvirt*,spice-glib,spice-gtk3,vinagre
+git
+createrepo
+rpm-build
+qubes-core-vm-kernel-placeholder
+linux-firmware
+ltrace
+strace
+haveged
+mate-notification-daemon
+sudo
+xorg-x11-fonts-100dpi
+xorg-x11-fonts-Type1
--- a/scripts_fedora/packages_fc21_default.list
+++ b/scripts_fedora/packages_fc21_default.list
@ -0,0 +1 @@
+packages_fc21.list
--- a/scripts_fedora/packages_fc21_minimal.list
+++ b/scripts_fedora/packages_fc21_minimal.list
@ -0,0 +1,6 @@
+xterm
+--exclude=kdegames
+--exclude=firstboot
+--exclude=xorg-x11-drv-nouveau
+--exclude=firewall-config,firewalld
+--exclude=gnome-boxes