qubuntu: Added trusty, utopic and vivid templates

Considered experimential at this stage. vivid has not had any testing trusty and utopic work as proxyvm's
9 years ago · dd70031ba0
parent 78a903b1f7
commit dd70031ba0
42 changed files with 296 additions and 0 deletions
--- a/appmenus_trusty/netvm-whitelisted-appmenus.list
+++ b/appmenus_trusty/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_trusty/vm-whitelisted-appmenus.list
+++ b/appmenus_trusty/vm-whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+firefox.desktop
+thunderbird.desktop
+nautilus.desktop
+yelp.desktop
--- a/appmenus_trusty/whitelisted-appmenus.list
+++ b/appmenus_trusty/whitelisted-appmenus.list
@ -0,0 +1,6 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+yelp.desktop
--- a/appmenus_trusty_desktop/netvm-whitelisted-appmenus.list
+++ b/appmenus_trusty_desktop/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_trusty_desktop/vm-whitelisted-appmenus.list
+++ b/appmenus_trusty_desktop/vm-whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+firefox.desktop
+thunderbird.desktop
+nautilus.desktop
+yelp.desktop
--- a/appmenus_trusty_desktop/whitelisted-appmenus.list
+++ b/appmenus_trusty_desktop/whitelisted-appmenus.list
@ -0,0 +1,6 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+yelp.desktop
--- a/appmenus_utopic/netvm-whitelisted-appmenus.list
+++ b/appmenus_utopic/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_utopic/vm-whitelisted-appmenus.list
+++ b/appmenus_utopic/vm-whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+firefox.desktop
+thunderbird.desktop
+nautilus.desktop
+yelp.desktop
--- a/appmenus_utopic/whitelisted-appmenus.list
+++ b/appmenus_utopic/whitelisted-appmenus.list
@ -0,0 +1,6 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+yelp.desktop
--- a/appmenus_utopic_desktop/netvm-whitelisted-appmenus.list
+++ b/appmenus_utopic_desktop/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_utopic_desktop/vm-whitelisted-appmenus.list
+++ b/appmenus_utopic_desktop/vm-whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+firefox.desktop
+thunderbird.desktop
+nautilus.desktop
+yelp.desktop
--- a/appmenus_utopic_desktop/whitelisted-appmenus.list
+++ b/appmenus_utopic_desktop/whitelisted-appmenus.list
@ -0,0 +1,6 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+yelp.desktop
--- a/appmenus_vivid/netvm-whitelisted-appmenus.list
+++ b/appmenus_vivid/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_vivid/vm-whitelisted-appmenus.list
+++ b/appmenus_vivid/vm-whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+firefox.desktop
+thunderbird.desktop
+nautilus.desktop
+yelp.desktop
--- a/appmenus_vivid/whitelisted-appmenus.list
+++ b/appmenus_vivid/whitelisted-appmenus.list
@ -0,0 +1,6 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+yelp.desktop
--- a/appmenus_vivid_desktop/netvm-whitelisted-appmenus.list
+++ b/appmenus_vivid_desktop/netvm-whitelisted-appmenus.list
@ -0,0 +1 @@
+gnome-terminal.desktop
--- a/appmenus_vivid_desktop/vm-whitelisted-appmenus.list
+++ b/appmenus_vivid_desktop/vm-whitelisted-appmenus.list
@ -0,0 +1,5 @@
+gnome-terminal.desktop
+firefox.desktop
+thunderbird.desktop
+nautilus.desktop
+yelp.desktop
--- a/appmenus_vivid_desktop/whitelisted-appmenus.list
+++ b/appmenus_vivid_desktop/whitelisted-appmenus.list
@ -0,0 +1,6 @@
+gnome-terminal.desktop
+gpk-application.desktop
+gpk-update-viewer.desktop
+gpk-prefs.desktop
+gpk-log.desktop
+yelp.desktop
--- a/scripts_qubuntu/00_prepare.sh
+++ b/scripts_qubuntu/00_prepare.sh
@ -0,0 +1 @@
+../scripts_debian/00_prepare.sh
--- a/scripts_qubuntu/01_install_core.sh
+++ b/scripts_qubuntu/01_install_core.sh
@ -0,0 +1 @@
+../scripts_debian/01_install_core.sh
--- a/scripts_qubuntu/02_install_groups.sh
+++ b/scripts_qubuntu/02_install_groups.sh
@ -0,0 +1 @@
+../scripts_debian/02_install_groups.sh
--- a/scripts_qubuntu/02_install_groups_post.sh
+++ b/scripts_qubuntu/02_install_groups_post.sh
@ -0,0 +1,12 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+#### '-------------------------------------------------------------------------
+info ' Installing pulseaudio 5'
+#### '-------------------------------------------------------------------------
+chroot add-apt-repository -y ppa:ubuntu-audio-dev/pulse-testing
+aptUpdate
+aptInstall pulseaudio
--- a/scripts_qubuntu/02_install_groups_trusty.sh
+++ b/scripts_qubuntu/02_install_groups_trusty.sh
@ -0,0 +1,34 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+#### '--------------------------------------------------------------------------
+info 'HACK: Copying utopic sources.list to install systemd'
+#### '--------------------------------------------------------------------------
+cat > "${INSTALLDIR}/etc/apt/sources.list.d/systemd-utopic.list" <<EOF
+deb http://mirror.csclub.uwaterloo.ca/ubuntu/ utopic main
+EOF
+
+#### '--------------------------------------------------------------------------
+info 'Add universe to sources.list'
+#### '--------------------------------------------------------------------------
+updateQubuntuSourceList
+
+#### '--------------------------------------------------------------------------
+info 'Install Systemd'
+#### '--------------------------------------------------------------------------
+aptUpdate
+installSystemd
+
+#### '--------------------------------------------------------------------------
+info 'HACK: Commenting out utopic sources.list used to install systemd'
+#### '--------------------------------------------------------------------------
+sed -i "s/^deb/#deb/" "${INSTALLDIR}"/etc/apt/sources.list.d/systemd-utopic.list
+
+#### '--------------------------------------------------------------------------
+info 'apt-get update'
+#### '--------------------------------------------------------------------------
+aptUpdate
+
--- a/scripts_qubuntu/02_install_groups_utopic.sh
+++ b/scripts_qubuntu/02_install_groups_utopic.sh
@ -0,0 +1,16 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+#### '--------------------------------------------------------------------------
+info 'Add universe to sources.list'
+#### '--------------------------------------------------------------------------
+updateQubuntuSourceList
+
+#### '--------------------------------------------------------------------------
+info 'Install Systemd'
+#### '--------------------------------------------------------------------------
+installSystemd
+
--- a/scripts_qubuntu/02_install_groups_vivid.sh
+++ b/scripts_qubuntu/02_install_groups_vivid.sh
@ -0,0 +1,16 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+#### '--------------------------------------------------------------------------
+info 'Add universe to sources.list'
+#### '--------------------------------------------------------------------------
+updateQubuntuSourceList
+
+#### '--------------------------------------------------------------------------
+info 'Install Systemd'
+#### '--------------------------------------------------------------------------
+installSystemd
+
--- a/scripts_qubuntu/04_install_qubes.sh
+++ b/scripts_qubuntu/04_install_qubes.sh
@ -0,0 +1 @@
+../scripts_debian/04_install_qubes.sh
--- a/scripts_qubuntu/04_install_qubes_post.sh
+++ b/scripts_qubuntu/04_install_qubes_post.sh
@ -0,0 +1,14 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+##### '=========================================================================
+debug ' Ubuntu post Qubes...'
+##### '=========================================================================
+
+#### '-------------------------------------------------------------------------
+info ' Cleaning up  any left over files from installation'
+#### '-------------------------------------------------------------------------
+rm -rf "${INSTALLDIR}"/etc/apt/sources.list.d/qubes-r?.list
--- a/scripts_qubuntu/09_cleanup.sh
+++ b/scripts_qubuntu/09_cleanup.sh
@ -0,0 +1 @@
+../scripts_debian/09_cleanup.sh
--- a/scripts_qubuntu/desktop/packages_trusty.list
+++ b/scripts_qubuntu/desktop/packages_trusty.list
@ -0,0 +1 @@
+ubuntu-desktop
--- a/scripts_qubuntu/desktop/packages_utopic.list
+++ b/scripts_qubuntu/desktop/packages_utopic.list
@ -0,0 +1 @@
+ubuntu-desktop
--- a/scripts_qubuntu/desktop/packages_vivid.list
+++ b/scripts_qubuntu/desktop/packages_vivid.list
@ -0,0 +1 @@
+ubuntu-desktop
--- a/scripts_qubuntu/distribution.sh
+++ b/scripts_qubuntu/distribution.sh
@ -0,0 +1 @@
+../scripts_debian/distribution.sh
--- a/scripts_qubuntu/flash/02_install_groups_packages_installed.sh
+++ b/scripts_qubuntu/flash/02_install_groups_packages_installed.sh
@ -0,0 +1,10 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+#### '----------------------------------------------------------------------
+info ' Installing flash plugin'
+#### '----------------------------------------------------------------------
+aptInstall adobe-flashplugin
--- a/scripts_qubuntu/fstab
+++ b/scripts_qubuntu/fstab
@ -0,0 +1,6 @@
+# Accessible filesystems, by reference, are maintained under '/dev/disk'
+# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
+#
+sysfs                   /sys                    sysfs   defaults        0 0
+proc                    /proc                   proc    defaults        0 0
+xen                     /proc/xen               xenfs   defaults        0 0
--- a/scripts_qubuntu/keys/trusty-qubuntu-archive-keyring.gpg
+++ b/scripts_qubuntu/keys/trusty-qubuntu-archive-keyring.gpg
--- a/scripts_qubuntu/keys/utopic-qubuntu-archive-keyring.gpg
+++ b/scripts_qubuntu/keys/utopic-qubuntu-archive-keyring.gpg
--- a/scripts_qubuntu/keys/vivid-qubuntu-archive-keyring.gpg
+++ b/scripts_qubuntu/keys/vivid-qubuntu-archive-keyring.gpg
--- a/scripts_qubuntu/packages_qubes.list
+++ b/scripts_qubuntu/packages_qubes.list
@ -0,0 +1 @@
+../scripts_debian/packages_qubes.list
--- a/scripts_qubuntu/packages_trusty.list
+++ b/scripts_qubuntu/packages_trusty.list
@ -0,0 +1,25 @@
+ubuntu-standard
+ncurses-term
+aptitude
+tasksel
+sudo
+locales
+dmsetup
+psmisc
+emacs
+vim-nox
+gnupg
+firefox
+thunderbird
+keepassx
+git
+gnome-terminal
+xterm
+libfile-mimeinfo-perl
+libglib2.0-bin
+ltrace
+strace
+haveged
+linux-firmware
+linux-firmware-nonfree
+software-properties-common
--- a/scripts_qubuntu/packages_utopic.list
+++ b/scripts_qubuntu/packages_utopic.list
@ -0,0 +1,25 @@
+ubuntu-standard
+ncurses-term
+aptitude
+tasksel
+sudo
+locales
+dmsetup
+psmisc
+emacs
+vim-nox
+gnupg
+firefox
+thunderbird
+keepassx
+git
+gnome-terminal
+xterm
+libfile-mimeinfo-perl
+libglib2.0-bin
+ltrace
+strace
+haveged
+linux-firmware
+linux-firmware-nonfree
+software-properties-common
--- a/scripts_qubuntu/packages_vivid.list
+++ b/scripts_qubuntu/packages_vivid.list
@ -0,0 +1,25 @@
+ubuntu-standard
+ncurses-term
+aptitude
+tasksel
+sudo
+locales
+dmsetup
+psmisc
+emacs
+vim-nox
+gnupg
+firefox
+thunderbird
+keepassx
+git
+gnome-terminal
+xterm
+libfile-mimeinfo-perl
+libglib2.0-bin
+ltrace
+strace
+haveged
+linux-firmware
+linux-firmware-nonfree
+software-properties-common
--- a/scripts_qubuntu/vars.sh
+++ b/scripts_qubuntu/vars.sh
@ -0,0 +1,31 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+source ./functions.sh
+
+# ==============================================================================
+# Global variables and functions
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# Temp directory to place installation files and progress markers
+# (Do not use /tmp since if built in a real VM, /tmp will be empty on a reboot)
+# ------------------------------------------------------------------------------
+TMPDIR="/var/lib/qubes-whonix/install"
+
+# Location to grab ubuntu packages
+DEBIAN_MIRROR=http://archive.ubuntu.com/ubuntu
+
+# ------------------------------------------------------------------------------
+# Location to grab Ubuntu packages
+# ------------------------------------------------------------------------------
+DEBIAN_MIRROR=http://archive.ubuntu.com/ubuntu
+
+# TODO: Not yet implemented
+DEBIAN_MIRRORS=('http://archive.ubuntu.com/ubuntu',
+		       )
+
+# ------------------------------------------------------------------------------
+# apt-get configuration options
+# ------------------------------------------------------------------------------
+APT_GET_OPTIONS="-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes --yes"