From 06937f8172d680696286cc7cae4c1b55fb0795c1 Mon Sep 17 00:00:00 2001 From: Mark Korondi Date: Tue, 15 Nov 2016 15:43:18 +0100 Subject: [PATCH] xenial update --- Vagrantfile | 2 +- configure-vagrant.sh | 2 +- .../etc/lightdm/lightdm.conf.d/12-autologin.conf | 2 +- .../.config/autostart/xscreensaver.desktop | 0 .../.config/hexchat}/servlist_.conf | 0 .../.xchat2 => ubuntu/.config/hexchat}/xchat.conf | 0 .../.config/xfce4/panel/whiskermenu-7.rc | 0 .../.config/xfce4/terminal/terminalrc | 0 .../xfconf/xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfconf/xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 .../.mozilla/firefox/profiles.ini | 0 .../firefox/yncyd31n.default/places.sqlite | Bin .../firefox/yncyd31n.default/places.sqlite-shm | Bin .../firefox/yncyd31n.default/places.sqlite-wal | Bin .../.mozilla/firefox/yncyd31n.default/prefs.js | 0 .../firefox/yncyd31n.default/xulstore.json | 0 files/home/{vagrant => ubuntu}/.selected_editor | 0 .../{vagrant => ubuntu}/Desktop/firefox.desktop | 0 .../{vagrant => ubuntu}/Desktop/geany.desktop | 0 .../{vagrant => ubuntu}/Desktop/xchat.desktop | 0 .../Desktop/xfce4-terminal.desktop | 0 install-base.sh | 14 +++++++------- install-devstack.sh | 2 +- install-gui.sh | 11 ++++++----- 26 files changed, 17 insertions(+), 16 deletions(-) rename files/home/{vagrant => ubuntu}/.config/autostart/xscreensaver.desktop (100%) rename files/home/{vagrant/.xchat2 => ubuntu/.config/hexchat}/servlist_.conf (100%) rename files/home/{vagrant/.xchat2 => ubuntu/.config/hexchat}/xchat.conf (100%) rename files/home/{vagrant => ubuntu}/.config/xfce4/panel/whiskermenu-7.rc (100%) rename files/home/{vagrant => ubuntu}/.config/xfce4/terminal/terminalrc (100%) rename files/home/{vagrant => ubuntu}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename files/home/{vagrant => ubuntu}/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename files/home/{vagrant => ubuntu}/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename files/home/{vagrant => ubuntu}/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) rename files/home/{vagrant => ubuntu}/.mozilla/firefox/profiles.ini (100%) rename files/home/{vagrant => ubuntu}/.mozilla/firefox/yncyd31n.default/places.sqlite (100%) rename files/home/{vagrant => ubuntu}/.mozilla/firefox/yncyd31n.default/places.sqlite-shm (100%) rename files/home/{vagrant => ubuntu}/.mozilla/firefox/yncyd31n.default/places.sqlite-wal (100%) rename files/home/{vagrant => ubuntu}/.mozilla/firefox/yncyd31n.default/prefs.js (100%) rename files/home/{vagrant => ubuntu}/.mozilla/firefox/yncyd31n.default/xulstore.json (100%) rename files/home/{vagrant => ubuntu}/.selected_editor (100%) rename files/home/{vagrant => ubuntu}/Desktop/firefox.desktop (100%) rename files/home/{vagrant => ubuntu}/Desktop/geany.desktop (100%) rename files/home/{vagrant => ubuntu}/Desktop/xchat.desktop (100%) rename files/home/{vagrant => ubuntu}/Desktop/xfce4-terminal.desktop (100%) diff --git a/Vagrantfile b/Vagrantfile index 19dc146..d375fec 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,6 @@ Vagrant.configure(2) do |config| config.vm.hostname = "upstream-training" - config.vm.box = "ubuntu/trusty64" + config.vm.box = "ubuntu/xenial64" config.vm.provider "virtualbox" do |vb| vb.memory = "5632" vb.cpus = 2 diff --git a/configure-vagrant.sh b/configure-vagrant.sh index 131d764..1fdd2d8 100755 --- a/configure-vagrant.sh +++ b/configure-vagrant.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash # Enable shared folder access -sudo adduser vagrant vboxsf +sudo adduser ubuntu vboxsf diff --git a/files/etc/lightdm/lightdm.conf.d/12-autologin.conf b/files/etc/lightdm/lightdm.conf.d/12-autologin.conf index 041a08c..e316260 100644 --- a/files/etc/lightdm/lightdm.conf.d/12-autologin.conf +++ b/files/etc/lightdm/lightdm.conf.d/12-autologin.conf @@ -1,4 +1,4 @@ [SeatDefaults] -autologin-user=vagrant +autologin-user=ubuntu user-session=xfce diff --git a/files/home/vagrant/.config/autostart/xscreensaver.desktop b/files/home/ubuntu/.config/autostart/xscreensaver.desktop similarity index 100% rename from files/home/vagrant/.config/autostart/xscreensaver.desktop rename to files/home/ubuntu/.config/autostart/xscreensaver.desktop diff --git a/files/home/vagrant/.xchat2/servlist_.conf b/files/home/ubuntu/.config/hexchat/servlist_.conf similarity index 100% rename from files/home/vagrant/.xchat2/servlist_.conf rename to files/home/ubuntu/.config/hexchat/servlist_.conf diff --git a/files/home/vagrant/.xchat2/xchat.conf b/files/home/ubuntu/.config/hexchat/xchat.conf similarity index 100% rename from files/home/vagrant/.xchat2/xchat.conf rename to files/home/ubuntu/.config/hexchat/xchat.conf diff --git a/files/home/vagrant/.config/xfce4/panel/whiskermenu-7.rc b/files/home/ubuntu/.config/xfce4/panel/whiskermenu-7.rc similarity index 100% rename from files/home/vagrant/.config/xfce4/panel/whiskermenu-7.rc rename to files/home/ubuntu/.config/xfce4/panel/whiskermenu-7.rc diff --git a/files/home/vagrant/.config/xfce4/terminal/terminalrc b/files/home/ubuntu/.config/xfce4/terminal/terminalrc similarity index 100% rename from files/home/vagrant/.config/xfce4/terminal/terminalrc rename to files/home/ubuntu/.config/xfce4/terminal/terminalrc diff --git a/files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from files/home/vagrant/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to files/home/ubuntu/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/files/home/vagrant/.mozilla/firefox/profiles.ini b/files/home/ubuntu/.mozilla/firefox/profiles.ini similarity index 100% rename from files/home/vagrant/.mozilla/firefox/profiles.ini rename to files/home/ubuntu/.mozilla/firefox/profiles.ini diff --git a/files/home/vagrant/.mozilla/firefox/yncyd31n.default/places.sqlite b/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite similarity index 100% rename from files/home/vagrant/.mozilla/firefox/yncyd31n.default/places.sqlite rename to files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite diff --git a/files/home/vagrant/.mozilla/firefox/yncyd31n.default/places.sqlite-shm b/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite-shm similarity index 100% rename from files/home/vagrant/.mozilla/firefox/yncyd31n.default/places.sqlite-shm rename to files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite-shm diff --git a/files/home/vagrant/.mozilla/firefox/yncyd31n.default/places.sqlite-wal b/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite-wal similarity index 100% rename from files/home/vagrant/.mozilla/firefox/yncyd31n.default/places.sqlite-wal rename to files/home/ubuntu/.mozilla/firefox/yncyd31n.default/places.sqlite-wal diff --git a/files/home/vagrant/.mozilla/firefox/yncyd31n.default/prefs.js b/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js similarity index 100% rename from files/home/vagrant/.mozilla/firefox/yncyd31n.default/prefs.js rename to files/home/ubuntu/.mozilla/firefox/yncyd31n.default/prefs.js diff --git a/files/home/vagrant/.mozilla/firefox/yncyd31n.default/xulstore.json b/files/home/ubuntu/.mozilla/firefox/yncyd31n.default/xulstore.json similarity index 100% rename from files/home/vagrant/.mozilla/firefox/yncyd31n.default/xulstore.json rename to files/home/ubuntu/.mozilla/firefox/yncyd31n.default/xulstore.json diff --git a/files/home/vagrant/.selected_editor b/files/home/ubuntu/.selected_editor similarity index 100% rename from files/home/vagrant/.selected_editor rename to files/home/ubuntu/.selected_editor diff --git a/files/home/vagrant/Desktop/firefox.desktop b/files/home/ubuntu/Desktop/firefox.desktop similarity index 100% rename from files/home/vagrant/Desktop/firefox.desktop rename to files/home/ubuntu/Desktop/firefox.desktop diff --git a/files/home/vagrant/Desktop/geany.desktop b/files/home/ubuntu/Desktop/geany.desktop similarity index 100% rename from files/home/vagrant/Desktop/geany.desktop rename to files/home/ubuntu/Desktop/geany.desktop diff --git a/files/home/vagrant/Desktop/xchat.desktop b/files/home/ubuntu/Desktop/xchat.desktop similarity index 100% rename from files/home/vagrant/Desktop/xchat.desktop rename to files/home/ubuntu/Desktop/xchat.desktop diff --git a/files/home/vagrant/Desktop/xfce4-terminal.desktop b/files/home/ubuntu/Desktop/xfce4-terminal.desktop similarity index 100% rename from files/home/vagrant/Desktop/xfce4-terminal.desktop rename to files/home/ubuntu/Desktop/xfce4-terminal.desktop diff --git a/install-base.sh b/install-base.sh index 84cbb30..50f735f 100755 --- a/install-base.sh +++ b/install-base.sh @@ -7,22 +7,22 @@ export DEBIAN_FRONTEND=noninteractive REPO=$(dirname "$(readlink -f "$0")")/ sudo sed -i "s@http://archive.ubuntu.com@$APT_MIRROR@g" /etc/apt/sources.list -sudo apt-get update -sudo apt-get dist-upgrade -y +sudo apt update +sudo apt dist-upgrade -y # Fixing headless dictionaries-common install -sudo apt-get install -y dictionaries-common +sudo apt install -y dictionaries-common sudo /usr/share/debconf/fix_db.pl sudo dpkg-reconfigure dictionaries-common -sudo apt-get dist-upgrade -y +sudo apt dist-upgrade -y # Install git workflow related software -sudo apt-get install -y git gitk git-gui git-review tig +sudo apt install -y git gitk git-gui git-review tig # Install basic TUI applications -sudo apt-get install -y htop mc tmux +sudo apt install -y htop mc tmux -sudo apt-get clean +sudo apt clean # Copy configs sudo cp -ar "$REPO/files/etc" / diff --git a/install-devstack.sh b/install-devstack.sh index d0ec879..68c0033 100755 --- a/install-devstack.sh +++ b/install-devstack.sh @@ -11,7 +11,7 @@ cp -ar "$REPO/files/opt" / /opt/devstack/stack.sh -sudo apt-get clean +sudo apt clean # Enable OFFLINE mode for next invoking stack.sh to be faster sed -i 's/#OFFLINE=/OFFLINE=/' /opt/devstack/local.conf diff --git a/install-gui.sh b/install-gui.sh index a17a34a..3053c45 100755 --- a/install-gui.sh +++ b/install-gui.sh @@ -3,11 +3,12 @@ export DEBIAN_FRONTEND=noninteractive # Set up a desktop environment -sudo apt-get install -y xfce4 -sudo apt-get install -y lightdm lightdm-gtk-greeter \ +sudo apt install -y linux-image-extra-virtual +sudo apt install -y xfce4 +sudo apt install -y lightdm lightdm-gtk-greeter \ --no-install-recommends --no-install-suggests # Install basic GUI applications -sudo apt-get install -y firefox xfce4-terminal xfce4-whiskermenu-plugin \ - vim-gtk geany xchat +sudo apt install -y firefox xfce4-terminal xfce4-whiskermenu-plugin \ + vim-gtk geany hexchat -sudo apt-get clean +sudo apt clean