diff --git a/.gitignore b/.gitignore
index 0b821ac..5252ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
*~
appmenus
build_timestamp_*
-cache_*
-mnt_*
*.iso
-*.fs
*.img
install-templates.sh
-yum_repo_qubes/*
-scripts_fedora/base_rpms_fc21/*
+pkgs-for-template/*
diff --git a/Makefile b/Makefile
index d88b39c..6574243 100644
--- a/Makefile
+++ b/Makefile
@@ -3,24 +3,21 @@ $(error "You must set DIST variable, e.g. DIST=fc14")
endif
export DIST
-dist_ver := $(shell DIST=$(DIST) ./builder_setup)
-DISTRIBUTION := $(word 1,$(dist_ver))
-DIST_VERSION := $(word 2,$(dist_ver))
-TEMPLATE_NAME := $(word 3,$(dist_ver))
+TEMPLATE_BUILDER = 1
+-include $(addsuffix /Makefile.builder,$(BUILDER_PLUGINS_DIRS))
-ifeq (,$(TEMPLATE_NAME))
-TEMPLATE_NAME := $(DISTRIBUTION)-$(DIST_VERSION)-x64
+TEMPLATE_NAME := $(DIST)
ifdef TEMPLATE_FLAVOR
TEMPLATE_NAME := $(TEMPLATE_NAME)-$(TEMPLATE_FLAVOR)
endif
-endif
# Make sure names are < 32 characters, process aliases
fix_up := $(shell TEMPLATE_NAME=$(TEMPLATE_NAME) ./builder_fix_filenames)
TEMPLATE_NAME := $(word 1,$(fix_up))
-export DISTRIBUTION
export TEMPLATE_NAME
+export TEMPLATE_SCRIPTS
+export DISTRIBUTION
VERSION := $(shell cat version)
TIMESTAMP := $(shell date -u +%Y%m%d%H%M)
@@ -32,7 +29,7 @@ help:
prepare:
- @echo $(TIMESTAMP) > build_timestamp_$(DIST)
+ @echo $(TIMESTAMP) > build_timestamp_$(TEMPLATE_NAME)
rpms: prepare rootimg-build
@echo "Building template: $(TEMPLATE_NAME)"
@@ -40,7 +37,10 @@ rpms: prepare rootimg-build
./create_template_list.sh || :
rootimg-build:
- sudo -E ./prepare_image prepared_images/$(TEMPLATE_NAME).img && \
+ifeq (,$(TEMPLATE_SCRIPTS))
+ $(error Building template $(DIST) not supported by any of configured plugins)
+endif
+ sudo -E ./prepare_image prepared_images/$(TEMPLATE_NAME).img
sudo -E ./qubeize_image prepared_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME)
update-repo-installer:
@@ -48,8 +48,8 @@ update-repo-installer:
ln -f rpm/noarch/qubes-template-$(TEMPLATE_NAME)-$(VERSION)-$(shell cat build_timestamp_$(DIST))*.noarch.rpm $$UPDATE_REPO/rpm
prepare-repo-template:
- rm -rf yum_repo_qubes/$(DIST)
- mkdir -p yum_repo_qubes/$(DIST)/rpm yum_repo_qubes/$(DIST)/repodata
+ rm -rf pkgs-for-template/$(DIST)
+ mkdir -p pkgs-for-template/$(DIST)
clean:
sudo rm -fr qubeized_images/root.img.*
diff --git a/appmenus_fc17/netvm-whitelisted-appmenus.list b/appmenus_fc17/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_fc17/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_fc17/vm-whitelisted-appmenus.list b/appmenus_fc17/vm-whitelisted-appmenus.list
deleted file mode 100644
index 8db3e1e..0000000
--- a/appmenus_fc17/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-firefox.desktop
-mozilla-thunderbird.desktop
-libreoffice-startcenter.desktop
diff --git a/appmenus_fc17/whitelisted-appmenus.list b/appmenus_fc17/whitelisted-appmenus.list
deleted file mode 100644
index 23268c8..0000000
--- a/appmenus_fc17/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-prefs.desktop
-gpk-update-viewer.desktop
-system-config-date.desktop
-system-config-printer.desktop
diff --git a/appmenus_fc18/netvm-whitelisted-appmenus.list b/appmenus_fc18/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_fc18/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_fc18/vm-whitelisted-appmenus.list b/appmenus_fc18/vm-whitelisted-appmenus.list
deleted file mode 100644
index 8db3e1e..0000000
--- a/appmenus_fc18/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-firefox.desktop
-mozilla-thunderbird.desktop
-libreoffice-startcenter.desktop
diff --git a/appmenus_fc18/whitelisted-appmenus.list b/appmenus_fc18/whitelisted-appmenus.list
deleted file mode 100644
index 23268c8..0000000
--- a/appmenus_fc18/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-prefs.desktop
-gpk-update-viewer.desktop
-system-config-date.desktop
-system-config-printer.desktop
diff --git a/appmenus_fc20/netvm-whitelisted-appmenus.list b/appmenus_fc20/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_fc20/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_fc20/vm-whitelisted-appmenus.list b/appmenus_fc20/vm-whitelisted-appmenus.list
deleted file mode 100644
index 1711aed..0000000
--- a/appmenus_fc20/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,3 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-firefox.desktop
diff --git a/appmenus_fc20/whitelisted-appmenus.list b/appmenus_fc20/whitelisted-appmenus.list
deleted file mode 100644
index 107badc..0000000
--- a/appmenus_fc20/whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-prefs.desktop
-system-config-date.desktop
-system-config-printer.desktop
diff --git a/appmenus_fc20_minimal/netvm-whitelisted-appmenus.list b/appmenus_fc20_minimal/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 24cbff5..0000000
--- a/appmenus_fc20_minimal/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-xterm.desktop
diff --git a/appmenus_fc20_minimal/vm-whitelisted-appmenus.list b/appmenus_fc20_minimal/vm-whitelisted-appmenus.list
deleted file mode 100644
index 24cbff5..0000000
--- a/appmenus_fc20_minimal/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-xterm.desktop
diff --git a/appmenus_fc20_minimal/whitelisted-appmenus.list b/appmenus_fc20_minimal/whitelisted-appmenus.list
deleted file mode 100644
index 24cbff5..0000000
--- a/appmenus_fc20_minimal/whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-xterm.desktop
diff --git a/appmenus_fc21/netvm-whitelisted-appmenus.list b/appmenus_fc21/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_fc21/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_fc21/vm-whitelisted-appmenus.list b/appmenus_fc21/vm-whitelisted-appmenus.list
deleted file mode 100644
index 1711aed..0000000
--- a/appmenus_fc21/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,3 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-firefox.desktop
diff --git a/appmenus_fc21/whitelisted-appmenus.list b/appmenus_fc21/whitelisted-appmenus.list
deleted file mode 100644
index 107badc..0000000
--- a/appmenus_fc21/whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-prefs.desktop
-system-config-date.desktop
-system-config-printer.desktop
diff --git a/appmenus_fc21_minimal/netvm-whitelisted-appmenus.list b/appmenus_fc21_minimal/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 24cbff5..0000000
--- a/appmenus_fc21_minimal/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-xterm.desktop
diff --git a/appmenus_fc21_minimal/vm-whitelisted-appmenus.list b/appmenus_fc21_minimal/vm-whitelisted-appmenus.list
deleted file mode 100644
index 24cbff5..0000000
--- a/appmenus_fc21_minimal/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-xterm.desktop
diff --git a/appmenus_fc21_minimal/whitelisted-appmenus.list b/appmenus_fc21_minimal/whitelisted-appmenus.list
deleted file mode 100644
index 24cbff5..0000000
--- a/appmenus_fc21_minimal/whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-xterm.desktop
diff --git a/appmenus_jessie/netvm-whitelisted-appmenus.list b/appmenus_jessie/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_jessie/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_jessie/vm-whitelisted-appmenus.list b/appmenus_jessie/vm-whitelisted-appmenus.list
deleted file mode 100644
index c6d575c..0000000
--- a/appmenus_jessie/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-org.gnome.Nautilus.desktop
-iceweasel.desktop
-icedove.desktop
-yelp.desktop
diff --git a/appmenus_jessie/whitelisted-appmenus.list b/appmenus_jessie/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_jessie/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_jessie_gnome/netvm-whitelisted-appmenus.list b/appmenus_jessie_gnome/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_jessie_gnome/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_jessie_gnome/vm-whitelisted-appmenus.list b/appmenus_jessie_gnome/vm-whitelisted-appmenus.list
deleted file mode 100644
index 0f893ba..0000000
--- a/appmenus_jessie_gnome/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,16 +0,0 @@
-evolution.desktop
-gimp.desktop
-yelp.desktop
-iceweasel.desktop
-eog.desktop
-rhythmbox.desktop
-gnome-system-log.desktop
-gnome-terminal.desktop
-gnome-calculator.desktop
-org.gnome.Cheese.desktop
-org.gnome.Nautilus.desktop
-org.gnome.gedit.desktop
-shotwell.desktop
-org.gnome.Totem.desktop
-libreoffice-startcenter.desktop
-session-properties.desktop
diff --git a/appmenus_jessie_gnome/whitelisted-appmenus.list b/appmenus_jessie_gnome/whitelisted-appmenus.list
deleted file mode 100644
index a325bd9..0000000
--- a/appmenus_jessie_gnome/whitelisted-appmenus.list
+++ /dev/null
@@ -1,10 +0,0 @@
-gdebi.desktop
-yelp.desktop
-gpk-log.desktop
-gpk-prefs.desktop
-gpk-update-viewer.desktop
-gpk-application.desktop
-gnome-printers-panel.desktop
-tracker-preferences.desktop
-gnome-system-log.desktop
-gnome-terminal.desktop
diff --git a/appmenus_trusty/netvm-whitelisted-appmenus.list b/appmenus_trusty/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_trusty/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_trusty/vm-whitelisted-appmenus.list b/appmenus_trusty/vm-whitelisted-appmenus.list
deleted file mode 100644
index 85d045c..0000000
--- a/appmenus_trusty/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-firefox.desktop
-thunderbird.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_trusty/whitelisted-appmenus.list b/appmenus_trusty/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_trusty/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_trusty_desktop/netvm-whitelisted-appmenus.list b/appmenus_trusty_desktop/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_trusty_desktop/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_trusty_desktop/vm-whitelisted-appmenus.list b/appmenus_trusty_desktop/vm-whitelisted-appmenus.list
deleted file mode 100644
index 85d045c..0000000
--- a/appmenus_trusty_desktop/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-firefox.desktop
-thunderbird.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_trusty_desktop/whitelisted-appmenus.list b/appmenus_trusty_desktop/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_trusty_desktop/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_utopic/netvm-whitelisted-appmenus.list b/appmenus_utopic/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_utopic/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_utopic/vm-whitelisted-appmenus.list b/appmenus_utopic/vm-whitelisted-appmenus.list
deleted file mode 100644
index 85d045c..0000000
--- a/appmenus_utopic/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-firefox.desktop
-thunderbird.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_utopic/whitelisted-appmenus.list b/appmenus_utopic/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_utopic/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_utopic_desktop/netvm-whitelisted-appmenus.list b/appmenus_utopic_desktop/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_utopic_desktop/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_utopic_desktop/vm-whitelisted-appmenus.list b/appmenus_utopic_desktop/vm-whitelisted-appmenus.list
deleted file mode 100644
index 85d045c..0000000
--- a/appmenus_utopic_desktop/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-firefox.desktop
-thunderbird.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_utopic_desktop/whitelisted-appmenus.list b/appmenus_utopic_desktop/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_utopic_desktop/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_vivid/netvm-whitelisted-appmenus.list b/appmenus_vivid/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_vivid/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_vivid/vm-whitelisted-appmenus.list b/appmenus_vivid/vm-whitelisted-appmenus.list
deleted file mode 100644
index 85d045c..0000000
--- a/appmenus_vivid/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-firefox.desktop
-thunderbird.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_vivid/whitelisted-appmenus.list b/appmenus_vivid/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_vivid/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_vivid_desktop/netvm-whitelisted-appmenus.list b/appmenus_vivid_desktop/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_vivid_desktop/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_vivid_desktop/vm-whitelisted-appmenus.list b/appmenus_vivid_desktop/vm-whitelisted-appmenus.list
deleted file mode 100644
index 85d045c..0000000
--- a/appmenus_vivid_desktop/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-firefox.desktop
-thunderbird.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_vivid_desktop/whitelisted-appmenus.list b/appmenus_vivid_desktop/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_vivid_desktop/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_wheezy/netvm-whitelisted-appmenus.list b/appmenus_wheezy/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_wheezy/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_wheezy/vm-whitelisted-appmenus.list b/appmenus_wheezy/vm-whitelisted-appmenus.list
deleted file mode 100644
index d479755..0000000
--- a/appmenus_wheezy/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,5 +0,0 @@
-gnome-terminal.desktop
-iceweasel.desktop
-icedove.desktop
-nautilus.desktop
-yelp.desktop
diff --git a/appmenus_wheezy/whitelisted-appmenus.list b/appmenus_wheezy/whitelisted-appmenus.list
deleted file mode 100644
index 84a4b50..0000000
--- a/appmenus_wheezy/whitelisted-appmenus.list
+++ /dev/null
@@ -1,6 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
diff --git a/appmenus_wheezy_gnome/netvm-whitelisted-appmenus.list b/appmenus_wheezy_gnome/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_wheezy_gnome/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_wheezy_gnome/vm-whitelisted-appmenus.list b/appmenus_wheezy_gnome/vm-whitelisted-appmenus.list
deleted file mode 100644
index 33843f3..0000000
--- a/appmenus_wheezy_gnome/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,15 +0,0 @@
-gnome-terminal.desktop
-gcalctool.desktop
-evolution.desktop
-nautilus.desktop
-iceweasel.desktop
-libreoffice-startcenter.desktop
-gedit.desktop
-gimp.desktop
-eog.desktop
-totem.desktop
-rhythmbox.desktop
-gnome-system-log.desktop
-cheese.desktop
-session-properties.desktop
-yelp.desktop
diff --git a/appmenus_wheezy_gnome/whitelisted-appmenus.list b/appmenus_wheezy_gnome/whitelisted-appmenus.list
deleted file mode 100644
index 89d9525..0000000
--- a/appmenus_wheezy_gnome/whitelisted-appmenus.list
+++ /dev/null
@@ -1,11 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-gnome-panel.desktop
-gnome-printers-panel.desktop
-gnome-system-log.desktop
-gdebi.desktop
-tracker-preferences.desktop
-yelp.desktop
diff --git a/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 1bb50df..0000000
--- a/appmenus_wheezy_whonix-gateway/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,16 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
-gateway-firewall30default.desktop
-gateway-firewall50user.desktop
-gateway-torrc.desktop
-gateway-torrcexamples.desktop
-gateway-firewall30default.desktop
-gateway-firewall50user.desktop
-gateway-firsttimesetup.desktop
-gateway-torrc.desktop
-gateway-torrcexamples.desktop
-whonix_repository.desktop
diff --git a/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list
deleted file mode 100644
index ba57bde..0000000
--- a/appmenus_wheezy_whonix-gateway/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,10 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-yelp.desktop
-gateway-arm.desktop
-gateway-reloadfirewall.desktop
-gateway-reloadtor.desktop
-gateway-restarttor.desktop
-gateway-stoptor.desktop
-timesync.desktop
-whonixcheck.desktop
diff --git a/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list b/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list
deleted file mode 100644
index 1bb50df..0000000
--- a/appmenus_wheezy_whonix-gateway/whitelisted-appmenus.list
+++ /dev/null
@@ -1,16 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
-gateway-firewall30default.desktop
-gateway-firewall50user.desktop
-gateway-torrc.desktop
-gateway-torrcexamples.desktop
-gateway-firewall30default.desktop
-gateway-firewall50user.desktop
-gateway-firsttimesetup.desktop
-gateway-torrc.desktop
-gateway-torrcexamples.desktop
-whonix_repository.desktop
diff --git a/appmenus_wheezy_whonix-workstation/netvm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_wheezy_whonix-workstation/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list
deleted file mode 100644
index 5bd390a..0000000
--- a/appmenus_wheezy_whonix-workstation/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,14 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-yelp.desktop
-anondist-torbrowser.desktop
-timesync.desktop
-whonixcheck.desktop
-whonix-contribute.desktop
-whonix-documentation.desktop
-whonix-donate.desktop
-whonix-featureblog.desktop
-whonix-forum.desktop
-whonix-importantblog.desktop
-whonix-irc-chat-support.desktop
-whonix-mailinglist.desktop
diff --git a/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list
deleted file mode 100644
index cf2ba64..0000000
--- a/appmenus_wheezy_whonix-workstation/whitelisted-appmenus.list
+++ /dev/null
@@ -1,12 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-yelp.desktop
-gnome-panel.desktop
-gnome-printers-panel.desktop
-gnome-system-log.desktop
-tracker-preferences.desktop
-anondist-torbrowser_update.desktop
-whonix_repository.desktop
diff --git a/appmenus_wheezy_whonix-workstation_gnome/netvm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation_gnome/netvm-whitelisted-appmenus.list
deleted file mode 100644
index 4b744f7..0000000
--- a/appmenus_wheezy_whonix-workstation_gnome/netvm-whitelisted-appmenus.list
+++ /dev/null
@@ -1 +0,0 @@
-gnome-terminal.desktop
diff --git a/appmenus_wheezy_whonix-workstation_gnome/vm-whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation_gnome/vm-whitelisted-appmenus.list
deleted file mode 100644
index 501abce..0000000
--- a/appmenus_wheezy_whonix-workstation_gnome/vm-whitelisted-appmenus.list
+++ /dev/null
@@ -1,22 +0,0 @@
-gnome-terminal.desktop
-nautilus.desktop
-gcalctool.desktop
-evolution.desktop
-libreoffice-startcenter.desktop
-gimp.desktop
-eog.desktop
-totem.desktop
-shotwell.desktop
-rhythmbox.desktop
-anondist-torbrowser.desktop
-timesync.desktop
-whonixcheck.desktop
-whonix-contribute.desktop
-whonix-documentation.desktop
-whonix-donate.desktop
-whonix-featureblog.desktop
-whonix-forum.desktop
-whonix-importantblog.desktop
-whonix-irc-chat-support.desktop
-whonix-mailinglist.desktop
-yelp.desktop
diff --git a/appmenus_wheezy_whonix-workstation_gnome/whitelisted-appmenus.list b/appmenus_wheezy_whonix-workstation_gnome/whitelisted-appmenus.list
deleted file mode 100644
index ab251b6..0000000
--- a/appmenus_wheezy_whonix-workstation_gnome/whitelisted-appmenus.list
+++ /dev/null
@@ -1,14 +0,0 @@
-gnome-terminal.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gpk-log.desktop
-gpk-application.desktop
-gpk-update-viewer.desktop
-gpk-prefs.desktop
-gnome-panel.desktop
-gnome-printers-panel.desktop
-gnome-system-log.desktop
-tracker-preferences.desktop
-anondist-torbrowser_update.desktop
-yelp.desktop
diff --git a/build_template_rpm b/build_template_rpm
index d17e75b..4f43ed6 100755
--- a/build_template_rpm
+++ b/build_template_rpm
@@ -11,8 +11,6 @@ fi
rpmbuild --target noarch \
--define "template_name $NAME" \
--define "DIST $DIST" \
- --define "DISTRIBUTION $DISTRIBUTION" \
- --define "VERSION $VERSION" \
--define "_topdir $PWD/rpmbuild" \
--define "_tmppath $PWD/rpmbuild/tmp" \
-bb templates.spec
diff --git a/builder_setup b/builder_setup
index 61d4354..2fd69da 100755
--- a/builder_setup
+++ b/builder_setup
@@ -2,44 +2,14 @@
# Setup env variables
-case "$DIST" in
- fc*)
- DISTRIBUTION=fedora
- VERSION=${DIST/fc/}
- ;;
- wheezy)
- DISTRIBUTION=debian
- VERSION=7
- ;;
- jessie)
- DISTRIBUTION=debian
- VERSION=8
- ;;
- trusty)
- DISTRIBUTION=qubuntu
- VERSION=14.04
- ;;
- utopic)
- DISTRIBUTION=qubuntu
- VERSION=14.10
- ;;
- vivid)
- DISTRIBUTION=qubuntu
- VERSION=15.04
- ;;
- *)
- DISTRIBUTION="$DIST"
- VERSION=
- ;;
-esac
-
-if [ -d "scripts_$DIST" ]; then
- SCRIPTSDIR="scripts_$DIST"
-else
- SCRIPTSDIR="scripts_$DISTRIBUTION"
+SCRIPTSDIR=$TEMPLATE_SCRIPTS
+if [ ! -d "$SCRIPTSDIR" ]; then
+ echo "Scripts directory $SCRIPTSDIR does not exists"
+ exit 1
fi
-CACHEDIR=cache_$DIST
+if [ -z "$CACHEDIR" ]; then
+ CACHEDIR=cache_$DIST
+fi
export SCRIPTSDIR CACHEDIR
-echo $DISTRIBUTION $VERSION
diff --git a/clean-volatile.img.tar b/clean-volatile.img.tar
deleted file mode 100644
index 5257a10..0000000
Binary files a/clean-volatile.img.tar and /dev/null differ
diff --git a/comps-qubes-template.xml b/comps-qubes-template.xml
deleted file mode 100644
index 4ed9406..0000000
--- a/comps-qubes-template.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- qubes-vm
- Qubes Environment
- true
-
- qubes-core-vm-systemd
- qubes-core-vm
- qubes-gui-vm
- xen-libs
- xen-qubes-vm-essentials
- qubes-doc-vm
- thunderbird-qubes
- qubes-pdf-converter
- qubes-gpg-split
-
-
-
diff --git a/prepare_image b/prepare_image
index d2b4549..a292199 100755
--- a/prepare_image
+++ b/prepare_image
@@ -10,15 +10,15 @@ RETCODE=0
: ${DIST=fc14}
-. ./builder_setup >/dev/null
-. ./umount_kill.sh >/dev/null
-
if [ "${VERBOSE}" -ge 2 -o "${DEBUG}" == "1" ]; then
set -x
else
set -e
fi
+. ./builder_setup >/dev/null
+. ./umount_kill.sh >/dev/null
+
if ! [ $# -eq 1 ]; then
echo "usage ${0} "
exit
diff --git a/qubeize_image b/qubeize_image
index 64c533b..2612799 100755
--- a/qubeize_image
+++ b/qubeize_image
@@ -78,10 +78,12 @@ export INSTALLDIR=mnt
# ------------------------------------------------------------------------------
echo "--> Choosing appmenus whitelists..."
rm -f appmenus
-if [ -d "appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then
- ln -s "appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus
-elif [ -d "appmenus_$DIST" ]; then
- ln -s "appmenus_$DIST" appmenus
+if [ -d "${SCRIPTSDIR}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then
+ ln -s "${SCRIPTSDIR}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus
+elif [ -d "${SCRIPTSDIR}/appmenus_$DIST" ]; then
+ ln -s "${SCRIPTSDIR}/appmenus_$DIST" appmenus
+elif [ -d "${SCRIPTSDIR}/appmenus" ]; then
+ ln -s "${SCRIPTSDIR}/appmenus" appmenus
else
ln -s "appmenus_generic" appmenus
fi
@@ -91,17 +93,12 @@ fi
# ------------------------------------------------------------------------------
echo "--> Linking /home to /rw/home..."
mv mnt/home mnt/home.orig
-ln -sf /rw/home mnt/home
+mkdir mnt/home
echo "--> Linking /usr/local to /rw/usrlocal..."
mv mnt/usr/local mnt/usr/local.orig
ln -sf /rw/usrlocal mnt/usr/local
-if [ -e mnt/etc/sysconfig/i18n ]; then
- echo "--> Setting up default locale..."
- echo LC_CTYPE=en_US.UTF-8 > mnt/etc/sysconfig/i18n
-fi
-
# ------------------------------------------------------------------------------
# Finsh - unmount image
# ------------------------------------------------------------------------------
@@ -112,3 +109,4 @@ echo "Qubeized image stored at: $IMG"
echo "Reducing image size (calling cleanup_image)..."
./cleanup_image "$IMG"
+chown -R --reference=. qubeized_images/$NAME
diff --git a/qubeized_images/.gitignore b/qubeized_images/.gitignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/qubeized_images/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/scripts_archlinux/00_prepare.sh b/scripts_archlinux/00_prepare.sh
deleted file mode 100755
index 03826d8..0000000
--- a/scripts_archlinux/00_prepare.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-ISO_VERSION=`date +%Y.%m`.01
-
-mkdir -p $CACHEDIR
-
-echo "Downloading Archlinux dvd..."
-wget -N -P $CACHEDIR "http://mir.archlinux.fr/iso/$ISO_VERSION/archlinux-$ISO_VERSION-dual.iso"
-wget -N -P $CACHEDIR "http://mir.archlinux.fr/iso/$ISO_VERSION/archlinux-$ISO_VERSION-dual.iso.sig"
-
-echo "Verifying dvd..."
-gpg --import "$SCRIPTSDIR/archlinux-master-keys.asc"
-
-gpg --verify "$CACHEDIR/archlinux-$ISO_VERSION-dual.iso.sig" "$CACHEDIR/archlinux-$ISO_VERSION-dual.iso" || exit
-
-if [ "$CACHEDIR/archlinux-$ISO_VERSION-dual.iso" -nt $CACHEDIR/root-image.fs ]; then
- echo "Extracting squash filesystem from DVD..."
- mkdir mnt_archlinux_dvd
- mount -o loop "$CACHEDIR/archlinux-$ISO_VERSION-dual.iso" mnt_archlinux_dvd || echo "!!Error mounting iso to mnt_archlinux_dvd"
- cp mnt_archlinux_dvd/arch/x86_64/airootfs.sfs $CACHEDIR/ || echo "!!Error copying root sfs file to \$CACHEDIR"
- umount mnt_archlinux_dvd
- mount -o loop $CACHEDIR/airootfs.sfs mnt_archlinux_dvd || echo "!!Error mounting root sfs"
- cp mnt_archlinux_dvd/airootfs.img $CACHEDIR/ || echo "!!Error copying root fs file"
- umount mnt_archlinux_dvd
- rm $CACHEDIR/airootfs.sfs
-fi
diff --git a/scripts_archlinux/01_install_core.sh b/scripts_archlinux/01_install_core.sh
deleted file mode 100755
index cfe4a8e..0000000
--- a/scripts_archlinux/01_install_core.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Mounting archlinux install system into mnt_archlinux_dvd..."
-mkdir -p mnt_archlinux_dvd
-mount $CACHEDIR/airootfs.img mnt_archlinux_dvd
-
-echo "Fix bug intruduced in arch-chroot causing arguments not to be passed"
-sed "s/unshare --fork --pid//" -i mnt_archlinux_dvd/usr/bin/arch-chroot
-
-echo "Fix chroot cannot be umounted because of gpg-agent started by pacman"
-sed "/chroot_umount() {/a pkill gpg-agent" -i mnt_archlinux_dvd/usr/bin/arch-chroot
-cat mnt_archlinux_dvd/usr/bin/arch-chroot
-
-echo "Creating chroot bootstrap environment"
-
-mount --bind $INSTALLDIR mnt_archlinux_dvd/mnt
-cp /etc/resolv.conf mnt_archlinux_dvd/etc
-
-echo "-> Initializing pacman keychain"
-# Note: pacman-key starts gpg-agent automatically, which locks /dev
-./mnt_archlinux_dvd/usr/bin/arch-chroot mnt_archlinux_dvd/ pacman-key --init
-./mnt_archlinux_dvd/usr/bin/arch-chroot mnt_archlinux_dvd/ pacman-key --populate
-
-echo "-> Installing core pacman packages..."
-./mnt_archlinux_dvd/usr/bin/arch-chroot mnt_archlinux_dvd/ sh -c 'pacstrap /mnt base'
-
-echo "--> Removing non required linux kernel (can be added manually through a package)"
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc linux
-
-echo "-> Cleaning up bootstrap environment"
-
-umount mnt_archlinux_dvd/mnt
-
-umount mnt_archlinux_dvd
-
-cp $SCRIPTSDIR/resolv.conf $INSTALLDIR/etc
diff --git a/scripts_archlinux/02_install_groups.sh b/scripts_archlinux/02_install_groups.sh
deleted file mode 100755
index 5222d74..0000000
--- a/scripts_archlinux/02_install_groups.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-if [ -n "${TEMPLATE_FLAVOR}" ]; then
- PKGLISTFILE="$SCRIPTSDIR/packages_${TEMPLATE_FLAVOR}.list"
- if ! [ -r "${PKGLISTFILE}" ]; then
- echo "ERROR: ${PKGLISTFILE} does not exists!"
- exit 1
- fi
-else
- PKGLISTFILE="$SCRIPTSDIR/packages.list"
-fi
-
-set -e
-
-echo "Mounting archlinux install system into mnt_archlinux_dvd..."
-mount $CACHEDIR/airootfs.img mnt_archlinux_dvd
-
-echo "Fix bug intruduced in arch-chroot causing arguments not to be passed"
-sed "s/unshare --fork --pid//" -i mnt_archlinux_dvd/usr/bin/arch-chroot
-
-PKGGROUPS=`cat $PKGLISTFILE`
-
-echo "-> Installing archlinux package groups..."
-echo "-> Selected packages:"
-echo "$PKGGROUPS"
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --needed --noconfirm -S $PKGGROUPS
-
-umount mnt_archlinux_dvd
diff --git a/scripts_archlinux/04_install_qubes.sh b/scripts_archlinux/04_install_qubes.sh
deleted file mode 100755
index 5153d71..0000000
--- a/scripts_archlinux/04_install_qubes.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Mounting archlinux install system into mnt_archlinux_dvd..."
-mkdir -p mnt_archlinux_dvd
-mount $CACHEDIR/airootfs.img mnt_archlinux_dvd
-
-echo "Fix bug intruduced in arch-chroot causing arguments not to be passed"
-sed "s/unshare --fork --pid//" -i mnt_archlinux_dvd/usr/bin/arch-chroot
-
-# Note: Enable x86 repos
-su -c "echo '[multilib]' >> $INSTALLDIR/etc/pacman.conf"
-su -c "echo 'SigLevel = PackageRequired' >> $INSTALLDIR/etc/pacman.conf"
-su -c "echo 'Include = /etc/pacman.d/mirrorlist' >> $INSTALLDIR/etc/pacman.conf"
-
-echo "--> Registering Qubes custom repository"
-
-cat >> $INSTALLDIR/etc/pacman.conf < Installing qubes-packages..."
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c "pacman -S --noconfirm qubes-vm-xen"
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c "pacman -S --noconfirm qubes-vm-core"
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c "pacman -S --noconfirm qubes-vm-gui"
-
-echo "--> Updating template fstab file..."
-cat >> $INSTALLDIR/etc/fstab < Configuring system to our preferences"
-# Name network devices using simple names (ethX)
-ln -s /dev/null $INSTALLDIR/etc/udev/rules.d/80-net-name-slot.rules
-# Initialize encoding to qubes standards
-ln -s /etc/sysconfig/i18n $INSTALLDIR/etc/locale.conf
-# Enable some locales (incl. UTF-8
-sed 's/#en_US/en_US/g' -i $INSTALLDIR/etc/locale.gen
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR sh -c "locale-gen"
-
-# Creating a random file in /lib/modules to ensure that the directory in never deleted when packages are removed
-mkdir -p $INSTALLDIR/lib/modules
-touch $INSTALLDIR/lib/modules/QUBES
-
-# Ensure os-release is setup correctly or Fedora dracut will fail when displaying the OS
-# also ensure that the path is relative, because root is in /newroot before dracut switch root
-ln -s ../usr/lib/os-release $INSTALLDIR/etc/os-release
-
-# Disable qubes local repository
-sed '/QubesTMP/d' -i $INSTALLDIR/etc/pacman.conf
-
-# Reregistering qubes repository to the remote version
-echo "--> Registering Qubes remote repository"
-cat >> $INSTALLDIR/etc/pacman.conf < Cleaning up..."
-umount $INSTALLDIR/mnt/qubes-rpms-mirror-repo
-umount mnt_archlinux_dvd
diff --git a/scripts_archlinux/09_cleanup.sh b/scripts_archlinux/09_cleanup.sh
deleted file mode 100755
index 4298b66..0000000
--- a/scripts_archlinux/09_cleanup.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-echo "Mounting archlinux install system into mnt_archlinux_dvd..."
-mount $CACHEDIR/airootfs.img mnt_archlinux_dvd
-
-echo "Fix bug intruduced in arch-chroot causing arguments not to be passed"
-sed "s/unshare --fork --pid//" -i mnt_archlinux_dvd/usr/bin/arch-chroot
-
-echo "--> Starting cleanup actions"
-# Remove unused packages and their dependencies (make dependencies)
-cleanuppkgs=`./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman -Qdt | grep -v kernel | cut -d " " -f 1`
-echo "--> Packages that can be cleaned up: $cleanuppkgs"
-if [ -n "$cleanuppkgs" ] ; then
- ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc $cleanuppkgs
-fi
-
-# Remove video plugins
-echo "--> Removing video plugins"
-VIDEOPKGS=`./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman -Qs -q xf86-video`
-echo $VIDEOPKGS | ./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc -
-
-# Remove other font package
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Rsc xorg-fonts-100dpi xorg-fonts-75dpi
-
-# Clean pacman cache
-./mnt_archlinux_dvd/usr/bin/arch-chroot $INSTALLDIR pacman --noconfirm -Scc
-
-umount mnt_archlinux_dvd
-
-#rm -f $INSTALLDIR/var/lib/rpm/__db.00* $INSTALLDIR/var/lib/rpm/.rpm.lock
-#yum -c $PWD/yum.conf $YUM_OPTS clean packages --installroot=$INSTALLDIR
-
-# Make sure that rpm database has right format (for rpm version in template, not host)
-#echo "--> Rebuilding rpm database..."
-#chroot `pwd`/mnt /bin/rpm --rebuilddb 2> /dev/null
diff --git a/scripts_archlinux/archlinux-master-keys.asc b/scripts_archlinux/archlinux-master-keys.asc
deleted file mode 100644
index f5a976a..0000000
--- a/scripts_archlinux/archlinux-master-keys.asc
+++ /dev/null
@@ -1,411 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.13 (GNU/Linux)
-
-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
-OP4OxbDk+sFwmPm1eZ7qwWoguTTmhHBq8u1qCQ+GMUY9BUS7gTxmOVfIM1ieZ+GD
-rLrAK+sPKUuIypJR7p2yrH5FPsYTrUpTnA4e0OkFZ8uwk+m723VE00SsX6k2+K4k
-MloWiALRvwFBEiXalOjQ8JJZ5Qom/eudwxGLtwoQn+g0lD5FppMPILTIGz9hPp9N
-Y1qXvVh4XOixwBW6wnYzQ/k/7eHgx0HP/N3iTkdnFxF+i4+BPnkfyP6oCFQwx34V
-KqO0aJPQecl0TU8MWIOg3RoYG+7lW4keY356iQE1icm8N/1TVJgvPTi7qNLH1MKo
-V3FB0o0exwGVWvXlwfOpp9dAz36hil7fdVjkdzfncfiTbK0l0h3zv4SA08bg0WwY
-X6h6uJ2DrEByb8H66KdqctrvBJrqeIPDhHtGQgMs/HY2MlGF+2VXls+5njcYGWGz
-5DxTas1c+amVpD/7PbpTuT/Xa8EF3Bv6kn193eJwLTdFXQop/n+Z+MOYnIa2oof5
-kDhkBn75MUMckZFOFzuq0cMfZ6B48BTboK8ZJJ7QSDWUSqIzeljmaALD1njCisIV
-YCzquW0BmPQhV9tmq7hdj4nwPmLOrra2g+f2VwqF30QFBadvtIS1jz8uiQIcBBAB
-AgAGBQJOwE4IAAoJEChPw0yOSxol1y4QAIzLUT1v6Ot9m2SyDOXMc6Qk2/e0at1j
-plSeG9dczC6nAlLufr3uOP4OxbDk+sFwmPm1eZ7qwWoguTTmhHBq8u1qCQ+GMUY9
-BUS7gTxmOVfIM1ieZ+GDrLrAK+sPKUuIypJR7p2yrH5FPsYTrUpTnA4e0OkFZ8uw
-k+m723VE00SsX6k2+K4kMloWiALRvwFBEiXalOjQ8JJZ5Qom/eudwxGLtwoQn+g0
-lD5FppMPILTIG///////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////
-////////////iQIcBBABAgAGBQJO3LhzAAoJELod+2T/+XnnaQgQALWwLfHCi/9Q
-FLHXgQ5+QYnpoJoxvsgC0iosmgjmB1MMXK+rwMqAZtgr3cajBJ+XNq7XZriFliFV
-4oXHiFdR3zjjuvvIJhYn51079YKhZV2tQqZt9NO+rvns2fMwx2iXMou1+g7byOUp
-inIkNXtTi3i3HxX+4nKjL3Hk42Qdf+wRFLSl3+DpIx9qrB5ReL8XYhMvlCodjNWP
-UNi3LcsLEl47+m4qBSBmQb0mvy1oobaNLXT8+0cT5UHQAqQkB1LIWcC8Hek0iJ4o
-TjwpmU/36NH71fif6ypDWU28pbuRxHvXjrYuSi4C++110ShQdTEMe2wt9MpRIkp3
-0aIfWUCq6uCmUR5DO8QJM3CPtwlpEzXIXojp4ALfKOYx5xg1UOGxILErCE4O4EYz
-QM7pLBqFvMg3rdEu7vrnRrilzHZVWPeeXbJG+uzYbhicydh4UULF2Hz6L/vMEJ/i
-rxdELV/h8fykJKE5wFigxZL1VgmWMIAISGZ+N4Npr19u1UmT3GyM4q+ImLOubWHU
-3VqVGs5alZQWZvi72sYEKUBqUY7/wfIvFPdXJ4BCPJZqxSCuLy5mpLEeaGpnhFSB
-gZHzBwwPyvl3Zc9P21rJD0p8NbMp+shCteWfadMnmBfLGkHUhP6rGZk7g2cjuFas
-Tndpuv8+lS9NipNt6uejrg/G+NWFAEH5uQENBE2heeUBCADDxPCizcrOhH12RbIk
-8enSsrbATbQnSgpU3DHF76j2gVItsBzpfjYgQCeD5KasXuFmFFph2pY73qCuoDQx
-FTo4gJNZt90/oV7C/vPEwMY5MkHdK2bB3BlZznshkpHNmWRBKvCrHJ09jZxmCICe
-NymhMyAYBGWM7MTCzEsKk9CuplxF5QApCbWwtlZVpgxra90MzBVlQT+ErXiLlXt8
-RG673RlGeFpOdxWK4USbr1AvqYxMV6Y4s/mKpcAJQBdL5IeRT8BnaG5mVjS0UgN8
-MeN6c+NlvfnFBZF9XFZXfFJ1QrDaneyT181guKB4apxmvtyXxD9OYdW/EXGbGpdb
-F3OxABEBAAGJAR8EGAECAAkFAk2heeUCGwwACgkQfy1DS5dB6Ky85gf9HtPMsnJI
-qizJd5s2oRkpYxPiyLKpq+0lH2R+yPo1Qyt7zpR1SV8iSVDaTiaxfF4BwZQz0Qt0
-FnIprzWuIw2FjElE/tVFH+Fw9SW5t31ly+v/jXa+iGcMXIblDX5I0gqffXVJRGzZ
-zPQDV0Yv4zyP/2Hsv0F250N2N8/cZqPaX5J0dKrOhDmi5yc5WoYJzzZVzXRuXwzC
-ncn0ymZteOGwcaW4kmaTQPb33idmTE89pXnskgQFpftAdvPw9Qf/zjVhTtFX95wt
-oNPcYOtMIARp/OejazBHaRW+NIWyCvj78MRoy9s0TOAzwcyOCWpjzHuPvslg/U0H
-ErbDGhNsa8/dnA==
-=TmI0
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_archlinux/network b/scripts_archlinux/network
deleted file mode 100644
index 61c4a5a..0000000
--- a/scripts_archlinux/network
+++ /dev/null
@@ -1 +0,0 @@
-NETWORKING=yes
diff --git a/scripts_archlinux/packages.list b/scripts_archlinux/packages.list
deleted file mode 100644
index 4b21116..0000000
--- a/scripts_archlinux/packages.list
+++ /dev/null
@@ -1,25 +0,0 @@
-xorg
-xterm
-python2
-artwiz-fonts
-ethtool
-font-bitstream-speedo
-net-tools
-sudo
-ttf-dejavu
-ttf-freefont
-wget
-zsh
-networkmanager
-network-manager-applet
-linux-firmware
-gnome-settings-daemon
-gvfs
-lxappearance
-gtk-engines
-firefox
-thunderbird
-xfce4-terminal
-leafpad
-thunar
-thunar-volman
diff --git a/scripts_archlinux/packages_minimal.list b/scripts_archlinux/packages_minimal.list
deleted file mode 100644
index a3fd8c2..0000000
--- a/scripts_archlinux/packages_minimal.list
+++ /dev/null
@@ -1,8 +0,0 @@
-xorg
-xterm
-python2
-sudo
-wget
-zsh
-ethtool
-net-tools
diff --git a/scripts_archlinux/part.bin b/scripts_archlinux/part.bin
deleted file mode 100644
index 47970d1..0000000
Binary files a/scripts_archlinux/part.bin and /dev/null differ
diff --git a/scripts_archlinux/resolv.conf b/scripts_archlinux/resolv.conf
deleted file mode 100644
index 6e7633b..0000000
--- a/scripts_archlinux/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/scripts_debian/00_prepare.sh b/scripts_debian/00_prepare.sh
deleted file mode 100755
index b12bb82..0000000
--- a/scripts_debian/00_prepare.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-# Source external scripts
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-INSTALLDIR="$(readlink -m mnt)"
-
-# Make sure ${INSTALLDIR} is not mounted
-umount_all "${INSTALLDIR}" || true
-
-# ==============================================================================
-# Execute any template flavor or sub flavor 'pre' scripts
-# ==============================================================================
-buildStep "${0}" "pre"
-
-# ==============================================================================
-# Use a snapshot of the debootstraped debian image
-# ==============================================================================
-manage_snapshot() {
- local snapshot="${1}"
-
- umount_kill "${INSTALLDIR}" || true
- mount -o loop "${IMG}" "${INSTALLDIR}" || exit 1
-
- # Remove old snapshots if groups completed
- if [ -e "${INSTALLDIR}/${TMPDIR}/.prepared_groups" ]; then
- outputc stout "Removing stale snapshots"
- umount_kill "${INSTALLDIR}" || true
- rm -rf "${debootstrap_snapshot}"
- rm -rf "${packages_snapshot}"
- return
- fi
-
- outputc stout "Replacing ${IMG} with snapshot ${snapshot}"
- umount_kill "${INSTALLDIR}" || true
- cp -f "${snapshot}" "${IMG}"
-}
-
-# ==============================================================================
-# Determine if a snapshot should be used, reuse an existing image or
-# delete the existing image to start fresh based on configuration options
-#
-# SNAPSHOT=1 - Use snapshots; Will remove after successful build
-# If debootstrap did not complete, the existing image will be deleted
-# ==============================================================================
-splitPath "${IMG}" path_parts
-packages_snapshot="${path_parts[dir]}${path_parts[base]}-packages${path_parts[dotext]}"
-debootstrap_snapshot="${path_parts[dir]}${path_parts[base]}-debootstrap${path_parts[dotext]}"
-
-if [ -f "${IMG}" ]; then
- if [ -f "${packages_snapshot}" -a "${SNAPSHOT}" == "1" ]; then
- # Use 'packages' snapshot
- manage_snapshot "${packages_snapshot}"
-
- elif [ -f "${debootstrap_snapshot}" -a "${SNAPSHOT}" == "1" ]; then
- # Use 'debootstrap' snapshot
- manage_snapshot "${debootstrap_snapshot}"
-
- else
- # Use '$IMG' if debootstrap did not fail
- mount -o loop "${IMG}" "${INSTALLDIR}" || exit 1
-
- # Assume a failed debootstrap installation if .prepared_debootstrap does not exist
- if [ -e "${INSTALLDIR}/${TMPDIR}/.prepared_debootstrap" ]; then
- debug "Reusing existing image ${IMG}"
- else
- outputc stout "Removing stale or incomplete ${IMG}"
- umount_kill "${INSTALLDIR}" || true
- rm -f "${IMG}"
- fi
-
- # Umount image; don't fail if its already umounted
- umount_kill "${INSTALLDIR}" || true
- fi
-fi
-
-# ==============================================================================
-# Execute any template flavor or sub flavor 'post' scripts
-# ==============================================================================
-buildStep "${0}" "post"
diff --git a/scripts_debian/01_install_core.sh b/scripts_debian/01_install_core.sh
deleted file mode 100755
index 7fccc36..0000000
--- a/scripts_debian/01_install_core.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-# Source external scripts
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-##### '-------------------------------------------------------------------------
-debug ' Installing base system using debootstrap'
-##### '-------------------------------------------------------------------------
-
-# ==============================================================================
-# Execute any template flavor or sub flavor 'pre' scripts
-# ==============================================================================
-buildStep "${0}" "pre"
-
-if ! [ -f "${INSTALLDIR}/${TMPDIR}/.prepared_debootstrap" ]; then
- #### "------------------------------------------------------------------
- info " $(templateName): Installing base '${DISTRIBUTION}-${DIST}' system"
- #### "------------------------------------------------------------------
- COMPONENTS="" debootstrap \
- --arch=amd64 \
- --include="ncurses-term locales tasksel" \
- --components=main \
- --keyring="${SCRIPTSDIR}/keys/${DIST}-${DISTRIBUTION}-archive-keyring.gpg" \
- "${DIST}" "${INSTALLDIR}" "${DEBIAN_MIRROR}" || {
- error "Debootstrap failed!";
- exit 1;
- }
-
- #### '----------------------------------------------------------------------
- info ' Configure keyboard'
- #### '----------------------------------------------------------------------
- configureKeyboard
-
- #### '----------------------------------------------------------------------
- info ' Update locales'
- #### '----------------------------------------------------------------------
- updateLocale
-
- #### '----------------------------------------------------------------------
- info 'Link mtab'
- #### '----------------------------------------------------------------------
- chroot rm -f /etc/mtab
- chroot ln -s /proc/self/mounts /etc/mtab
-
- # TMPDIR is set in vars. /tmp should not be used since it will be cleared
- # if building template with LXC contaniners on a reboot
- mkdir -p "${INSTALLDIR}/${TMPDIR}"
-
- # Mark section as complete
- touch "${INSTALLDIR}/${TMPDIR}/.prepared_debootstrap"
-
- # If SNAPSHOT=1, Create a snapshot of the already debootstraped image
- createSnapshot "debootstrap"
-fi
-
-# ==============================================================================
-# Execute any template flavor or sub flavor 'post' scripts
-# ==============================================================================
-buildStep "${0}" "post"
diff --git a/scripts_debian/02_install_groups.sh b/scripts_debian/02_install_groups.sh
deleted file mode 100755
index 3dc12e2..0000000
--- a/scripts_debian/02_install_groups.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-##### "=========================================================================
-debug " Configuring and Installing packages for ${DIST}"
-##### "=========================================================================
-
-# If .prepared_debootstrap has not been completed, don't continue
-exitOnNoFile "${INSTALLDIR}/${TMPDIR}/.prepared_debootstrap" "prepared_debootstrap installataion has not completed!... Exiting"
-
-# Create system mount points
-prepareChroot
-
-# Make sure there is a resolv.conf with network of this AppVM for building
-createResolvConf
-
-# ==============================================================================
-# Execute any template flavor or sub flavor 'pre' scripts
-# ==============================================================================
-buildStep "${0}" "pre"
-
-# ==============================================================================
-# Configure base system and install any adddtional packages which could
-# include +TEMPLATE_FLAVOR such as gnome as set in configuration file
-# ==============================================================================
-if ! [ -f "${INSTALLDIR}/${TMPDIR}/.prepared_groups" ]; then
- #### '----------------------------------------------------------------------
- info ' Trap ERR and EXIT signals and cleanup (umount)'
- #### '----------------------------------------------------------------------
- trap cleanup ERR
- trap cleanup EXIT
-
- #### '----------------------------------------------------------------------
- info 'Install standard Debian packages'
- #### '----------------------------------------------------------------------
- if ! [ -f "${INSTALLDIR}/${TMPDIR}/.debian_packages" ]; then
- packages="$(chroot tasksel --new-install --task-packages standard)"
- aptInstall ${packages}
- touch "${INSTALLDIR}/${TMPDIR}/.debian_packages"
- fi
-
- #### '----------------------------------------------------------------------
- info ' Distribution specific steps (install systemd, add sources, etc)'
- #### '----------------------------------------------------------------------
- buildStep "$0" "${DIST}"
-
- #### '----------------------------------------------------------------------
- info " Installing extra packages in script_${DIST}/packages.list file"
- #### '----------------------------------------------------------------------
- installPackages
- createSnapshot "packages"
- touch "${INSTALLDIR}/${TMPDIR}/.prepared_packages"
-
- #### '----------------------------------------------------------------------
- info ' Execute any template flavor or sub flavor scripts after packages are installed'
- #### '----------------------------------------------------------------------
- buildStep "$0" "packages_installed"
-
- #### '----------------------------------------------------------------------
- info ' apt-get dist-upgrade'
- #### '----------------------------------------------------------------------
- aptDistUpgrade
-
- #### '----------------------------------------------------------------------
- info ' Cleanup'
- #### '----------------------------------------------------------------------
- touch "${INSTALLDIR}/${TMPDIR}/.prepared_groups"
- trap - ERR EXIT
- trap
-fi
-
-# ==============================================================================
-# Execute any template flavor or sub flavor 'post' scripts
-# ==============================================================================
-buildStep "${0}" "post"
-
-# ==============================================================================
-# Kill all processes and umount all mounts within ${INSTALLDIR}, but not
-# ${INSTALLDIR} itself (extra '/' prevents ${INSTALLDIR} from being umounted)
-# ==============================================================================
-umount_all "${INSTALLDIR}/" || true
diff --git a/scripts_debian/02_install_groups_jessie.sh b/scripts_debian/02_install_groups_jessie.sh
deleted file mode 100755
index 51a82b5..0000000
--- a/scripts_debian/02_install_groups_jessie.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-##### "=========================================================================
-debug " Installing custom packages and customizing ${DIST}"
-##### "=========================================================================
-
-#### '--------------------------------------------------------------------------
-info ' Adding contrib, non-free and Debian security to repository.'
-#### '--------------------------------------------------------------------------
-updateDebianSourceList
-aptUpdate
-
-##### '=========================================================================
-debug ' Replacing sysvinit with systemd'
-##### '=========================================================================
-
-#### '--------------------------------------------------------------------------
-info ' Remove sysvinit'
-#### '--------------------------------------------------------------------------
-aptRemove sysvinit
-
-#### '--------------------------------------------------------------------------
-info ' Install Systemd'
-#### '--------------------------------------------------------------------------
-aptUpdate
-aptInstall systemd-sysv
-
-#### '--------------------------------------------------------------------------
-info ' Set multu-user.target as the default target (runlevel 3)'
-#### '--------------------------------------------------------------------------
-chroot rm -f /etc/systemd/system/default.target
-chroot ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
diff --git a/scripts_debian/02_install_groups_wheezy.sh b/scripts_debian/02_install_groups_wheezy.sh
deleted file mode 100755
index 541b9a9..0000000
--- a/scripts_debian/02_install_groups_wheezy.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-##### "=========================================================================
-debug " Installing custom packages and customizing ${DIST}"
-##### "=========================================================================
-
-#### '--------------------------------------------------------------------------
-info ' Adding contrib, non-free and Debian security to repository.'
-#### '--------------------------------------------------------------------------
-updateDebianSourceList
-
-#### '----------------------------------------------------------------------
-info ' Adding wheezy backports repository.'
-#### '----------------------------------------------------------------------
-source="deb ${DEBIAN_MIRROR} wheezy-backports main"
-if ! grep -r -q "$source" "${INSTALLDIR}/etc/apt/sources.list"*; then
- touch "${INSTALLDIR}/etc/apt/sources.list"
- echo "$source" >> "${INSTALLDIR}/etc/apt/sources.list"
-fi
-aptUpdate
-
-##### '=========================================================================
-debug ' Replace sysvinit with systemd'
-##### '=========================================================================
-
-#### '----------------------------------------------------------------------
-info ' Remove sysvinit'
-#### '----------------------------------------------------------------------
-echo 'Yes, do as I say!' | aptRemove sysvinit
-
-#### '----------------------------------------------------------------------
-info ' Preventing sysvinit re-installation'
-#### '----------------------------------------------------------------------
-chroot apt-mark hold sysvinit
-
-#### '----------------------------------------------------------------------
-info ' Pin sysvinit to prevent being re-installed'
-#### '----------------------------------------------------------------------
-cat > "${INSTALLDIR}/etc/apt/preferences.d/qubes_sysvinit" </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_all || true
-
- # Return xtrace to original state
- [[ -n "${XTRACE}" ]] && [[ "${XTRACE}" -eq 0 ]] && set -x || set +x
-
- exit $errval
-}
-
-# ==============================================================================
-# If .prepared_debootstrap has not been completed, don't continue
-# ==============================================================================
-function exitOnNoFile() {
- file="${1}"
- message="${2}"
-
- if ! [ -f "${file}" ]; then
- error "${message}"
- umount_all || true
- exit 1
- fi
-}
-
-# ==============================================================================
-# Umount everthing within INSTALLDIR or $1 but kill all processes within first
-# ==============================================================================
-function umount_all() {
- directory="${1:-"${INSTALLDIR}"}"
-
- # Only remove dirvert policies, etc if base INSTALLDIR mount is being umounted
- if [ "${directory}" == "${INSTALLDIR}" -o "${directory}" == "${INSTALLDIR}/" ]; then
- if [ -n "$(mountPoints)" ]; then
- removeDbusUuid
- removeDivertPolicy
- fi
- fi
-
- umount_kill "${directory}" || true
-}
-
-# ==============================================================================
-# Create snapshot
-# ==============================================================================
-function createSnapshot() {
- snapshot_name="${1}"
-
- if [ "${SNAPSHOT}" == "1" ]; then
- splitPath "${IMG}" path_parts
- snapshot_path="${path_parts[dir]}${path_parts[base]}-${snapshot_name}${path_parts[dotext]}"
-
- # create snapshot
- info "Creating snapshot of ${IMG} to ${snapshot_path}"
- sync
- cp -f "${IMG}" "${snapshot_path}"
- fi
-}
-
-# ==============================================================================
-# Create DBUS uuid
-# ==============================================================================
-function createDbusUuid() {
- outputc green "Creating DBUS uuid..."
- removeDbusUuid
- if [ -e "${INSTALLDIR}/bin/dbus-uuidgen" ]; then
- chroot dbus-uuidgen --ensure 1>/dev/null 2>&1
- fi
-}
-
-# ==============================================================================
-# Remove DBUS uuid
-# ==============================================================================
-function removeDbusUuid() {
- if [ -e "${INSTALLDIR}"/var/lib/dbus/machine-id ]; then
- outputc red "Removing generated machine uuid..."
- rm -f "${INSTALLDIR}/var/lib/dbus/machine-id"
- fi
-}
-
-# ==============================================================================
-# Set up a temporary dpkg-divert policy to prevent apt from starting services
-# on package installation
-# ==============================================================================
-function addDivertPolicy() {
- outputc green "Deactivating initctl..."
- chroot dpkg-divert --local --rename --add /sbin/initctl || true
-
- # utopic systemd install still broken...
- outputc green "Hacking invoke-rc.d to ignore missing init scripts..."
- chroot sed -i -e "s/exit 100/exit 0 #exit 100/" /usr/sbin/invoke-rc.d
-}
-
-# ==============================================================================
-# Remove temporary dpkg-divert policy
-# ==============================================================================
-function removeDivertPolicy() {
- outputc red "Reactivating initctl..."
- chroot dpkg-divert --local --rename --remove /sbin/initctl || true
-
- outputc red "Restoring invoke-rc.d..."
- chroot sed -i -e "s/exit 0 #exit 100/exit 100/" /usr/sbin/invoke-rc.d
-}
-
-# ==============================================================================
-# Create system mount points
-# ==============================================================================
-function prepareChroot() {
- # Make sure nothing is mounted within $INSTALLDIR
- umount_kill "${INSTALLDIR}/"
-
- mount -t tmpfs none "${INSTALLDIR}/run"
- if [ "${SYSTEMD_NSPAWN_ENABLE}" != "1" ]; then
- mount -t proc proc "${INSTALLDIR}/proc"
- mount -t sysfs sys "${INSTALLDIR}/sys"
- fi
- createDbusUuid
- addDivertPolicy
-}
-
-# ==============================================================================
-# apt-get upgrade
-# ==============================================================================
-function aptUpgrade() {
- aptUpdate
- DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" DEBCONF_NOWARNINGS="yes" \
- chroot env APT_LISTCHANGES_FRONTEND=none apt-get dist-upgrade -u -y --force-yes
-}
-
-# ==============================================================================
-# apt-get dist-upgrade
-# ==============================================================================
-function aptDistUpgrade() {
- aptUpdate
- DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" DEBCONF_NOWARNINGS="yes" \
- chroot env APT_LISTCHANGES_FRONTEND=none apt-get dist-upgrade -u -y --force-yes
-}
-
-# ==============================================================================
-# apt-get update
-# ==============================================================================
-function aptUpdate() {
- debug "Updating system"
- DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" DEBCONF_NOWARNINGS="yes" \
- chroot apt-get update
-}
-
-# ==============================================================================
-# apt-get remove
-# ==============================================================================
-function aptRemove() {
- files="$@"
- DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" DEBCONF_NOWARNINGS="yes" \
- chroot apt-get ${APT_GET_OPTIONS} remove ${files[@]}
-}
-
-# ==============================================================================
-# apt-get install
-# ==============================================================================
-function aptInstall() {
- files="$@"
- DEBIAN_FRONTEND="noninteractive" DEBIAN_PRIORITY="critical" DEBCONF_NOWARNINGS="yes" \
- chroot apt-get ${APT_GET_OPTIONS} install ${files[@]}
-}
-
-# ==============================================================================
-# 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
- getFileLocations packages_list "packages.list" "${DIST}"
- 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[@]}""
- aptInstall "${packages[@]}" || return $?
- done
-}
-
-# ==============================================================================
-# Install Systemd
-# ==============================================================================
-function installSystemd() {
- buildStep "$0" "pre-systemd"
- chroot apt-get update
-
- aptInstall systemd
- createDbusUuid
-
- # Set multi-user.target as default target
- chroot rm -f /etc/systemd/system/default.target
- chroot ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-
- # XXX: TEMP lets see how stuff work with upstart in control for now
- # Boot using systemd
- chroot rm -f /sbin/init
- chroot ln -sf /lib/systemd/systemd /sbin/init
-
- buildStep "$0" "post-systemd"
-}
-
-# ==============================================================================
-# ------------------------------------------------------------------------------
-# C O N F I G U R A T I O N R E L A T E D
-# ------------------------------------------------------------------------------
-# ==============================================================================
-
-# ==============================================================================
-# Add universe to sources.list
-# ==============================================================================
-function updateDebianSourceList() {
- # Add contrib and non-free component to repository
- touch "${INSTALLDIR}/etc/apt/sources.list"
- sed -i "s/${DIST} main$/${DIST} main contrib non-free/g" "${INSTALLDIR}/etc/apt/sources.list"
-
- # Add Debian security repositories
- source="deb http://security.debian.org ${DEBIANVERSION}/updates main"
- if ! grep -r -q "$source" "${INSTALLDIR}/etc/apt/sources.list"*; then
- touch "${INSTALLDIR}/etc/apt/sources.list"
- echo "$source" >> "${INSTALLDIR}/etc/apt/sources.list"
- fi
- source="deb-src http://security.debian.org ${DEBIANVERSION}/updates main"
- if ! grep -r -q "$source" "${INSTALLDIR}/etc/apt/sources.list"*; then
- touch "${INSTALLDIR}/etc/apt/sources.list"
- echo "$source" >> "${INSTALLDIR}/etc/apt/sources.list"
- fi
-}
-
-# ==============================================================================
-# Add universe to sources.list
-# ==============================================================================
-function updateQubuntuSourceList() {
- sed -i "s/${DIST} main$/${DIST} main universe multiverse restricted/g" "${INSTALLDIR}/etc/apt/sources.list"
- source="deb http://archive.canonical.com/ubuntu ${DIST} partner"
- if ! grep -r -q "$source" "${INSTALLDIR}/etc/apt/sources.list"*; then
- touch "${INSTALLDIR}/etc/apt/sources.list"
- echo "$source" >> "${INSTALLDIR}/etc/apt/sources.list"
- fi
- source="deb-src http://archive.canonical.com/ubuntu ${DIST} partner"
- if ! grep -r -q "$source" "${INSTALLDIR}/etc/apt/sources.list"*; then
- touch "${INSTALLDIR}/etc/apt/sources.list"
- echo "$source" >> "${INSTALLDIR}/etc/apt/sources.list"
- fi
- chroot apt-get update
-}
-
-# ==============================================================================
-# Make sure there is a resolv.conf with network of this AppVM for building
-# ==============================================================================
-function createResolvConf() {
- rm -f "${INSTALLDIR}/etc/resolv.conf"
- cp /etc/resolv.conf "${INSTALLDIR}/etc/resolv.conf"
-}
-
-# ==============================================================================
-# Ensure umask set in /etc/login.defs is used (022)
-# ==============================================================================
-function configureUmask() {
- echo "session optional pam_umask.so" >> "${INSTALLDIR}/etc/pam.d/common-session"
-}
-
-# ==============================================================================
-# Configure keyboard
-# ==============================================================================
-function configureKeyboard() {
- debug "Setting keyboard layout"
- cat > "${INSTALLDIR}/tmp/keyboard.conf" <<'EOF'
-keyboard-configuration keyboard-configuration/variant select English (US)
-keyboard-configuration keyboard-configuration/layout select English (US)
-keyboard-configuration keyboard-configuration/model select Generic 105-key (Intl) PC
-keyboard-configuration keyboard-configuration/modelcode string pc105
-keyboard-configuration keyboard-configuration/layoutcode string us
-keyboard-configuration keyboard-configuration/variantcode string
-keyboard-configuration keyboard-configuration/optionscode string
-EOF
- chroot debconf-set-selections /tmp/keyboard.conf
-}
-
-# ==============================================================================
-# Update locale
-# ==============================================================================
-function updateLocale() {
- debug "Updating locales"
- chroot localedef -f UTF-8 -i en_US -c en_US.UTF-8
- chroot update-locale LC_ALL=en_US.UTF-8
-}
-
-
-# ==============================================================================
-# ------------------------------------------------------------------------------
-# Q U B E S S P E C I F I C F U N C T I O N S
-# ------------------------------------------------------------------------------
-# ==============================================================================
-
-
-# ==============================================================================
-# Install Keyrings
-# ==============================================================================
-function installKeyrings() {
- if ! [ -e "${CACHEDIR}/repo-secring.gpg" ]; then
- mkdir -p "${CACHEDIR}"
- gpg --gen-key --batch < "${INSTALLDIR}/etc/apt/sources.list.d/qubes-builder.list" </dev/null 2>&1 || \
- {
- # UID needs match host user to have access to Whonix sources
- chroot groupadd -f user
- [ -n "$SUDO_UID" ] && USER_OPTS="-u $SUDO_UID"
- chroot useradd -g user $USER_OPTS -G sudo,audio -m -s /bin/bash user
- if [ `chroot id -u user` != 1000 ]; then
- chroot useradd -g user -u 1000 -M -s /bin/bash user-placeholder
- fi
- }
-
- #### '----------------------------------------------------------------------
- info ' Installing Whonix build scripts'
- #### '----------------------------------------------------------------------
- echo "${WHONIX_BUILD_SCRIPT}" > "${INSTALLDIR}/home/user/whonix_build.sh"
- chmod 0755 "${INSTALLDIR}/home/user/whonix_build.sh"
-
- #### '----------------------------------------------------------------------
- info ' Removing apt-listchanges if it exists,so no prompts appear'
- #### '----------------------------------------------------------------------
- # Whonix does not handle this properly, but aptInstall packages will
- aptRemove apt-listchanges || true
-
- #### '----------------------------------------------------------------------
- info ' Copying additional files required for build'
- #### '----------------------------------------------------------------------
- copyTree "files"
-
- touch "${INSTALLDIR}/${TMPDIR}/.whonix_prepared"
-fi
-
-
-##### '-------------------------------------------------------------------------
-debug ' Installing Whonix code base'
-##### '-------------------------------------------------------------------------
-if [ -f "${INSTALLDIR}/${TMPDIR}/.whonix_prepared" ] && ! [ -f "${INSTALLDIR}/${TMPDIR}/.whonix_installed" ]; then
- if ! [ -d "${INSTALLDIR}/home/user/Whonix" ]; then
- chroot su user -c 'mkdir /home/user/Whonix'
- fi
-
- mount --bind "../Whonix" "${INSTALLDIR}/home/user/Whonix"
-
- if [ "${TEMPLATE_FLAVOR}" == "whonix-gateway" ]; then
- BUILD_TYPE="--torgateway"
- elif [ "${TEMPLATE_FLAVOR}" == "whonix-workstation" ]; then
- BUILD_TYPE="--torworkstation"
- else
- error "Incorrent Whonix type \"${TEMPLATE_FLAVOR}\" selected. Not building Whonix modules"
- error "You need to set TEMPLATE_FLAVOR environment variable to either"
- error "whonix-gateway OR whonix-workstation"
- exit 1
- fi
-
- # Whonix needs /dev/pts mounted during build
- mount --bind /dev "${INSTALLDIR}/dev"
- mount --bind /dev/pts "${INSTALLDIR}/dev/pts"
-
- chroot su user -c "cd ~; ./whonix_build.sh ${BUILD_TYPE} ${DIST}" || { exit 1; }
-
- touch "${INSTALLDIR}/${TMPDIR}/.whonix_installed"
-fi
-
-
-##### '-------------------------------------------------------------------------
-debug ' Whonix Post Installation Configurations'
-##### '-------------------------------------------------------------------------
-if [ -f "${INSTALLDIR}/${TMPDIR}/.whonix_installed" ] && ! [ -f "${INSTALLDIR}/${TMPDIR}/.whonix_post" ]; then
-
- #### '----------------------------------------------------------------------
- info ' Restoring original network interfaces'
- #### '----------------------------------------------------------------------
- pushd "${INSTALLDIR}/etc/network"
- {
- rm -f interfaces;
- ln -s interfaces.backup interfaces;
- }
- popd
-
- #### '----------------------------------------------------------------------
- info ' Temporarily retore original resolv.conf for remainder of install process'
- info ' (Will be restored back in wheezy+whonix/04_qubes_install_post.sh)'
- #### '----------------------------------------------------------------------
- pushd "${INSTALLDIR}/etc"
- {
- rm -f resolv.conf;
- cp -p resolv.conf.backup resolv.conf;
- }
- popd
-
- #### '----------------------------------------------------------------------
- info ' Temporarily retore original hosts for remainder of install process'
- info ' (Will be restored on initial boot)'
- #### '----------------------------------------------------------------------
- pushd "${INSTALLDIR}/etc"
- {
- rm -f hosts;
- cp -p hosts.anondist-orig hosts;
- }
- popd
-
- #### '----------------------------------------------------------------------
- info ' Restore default user UID set to so same in all builds regardless of build host'
- #### '----------------------------------------------------------------------
- if [ -n "`chroot id -u user-placeholder`" ]; then
- chroot userdel user-placeholder
- chroot usermod -u 1000 user
- fi
-
- #### '----------------------------------------------------------------------
- info ' Enable some aliases in .bashrc'
- #### '----------------------------------------------------------------------
- sed -i "s/^# export/export/g" "${INSTALLDIR}/root/.bashrc"
- sed -i "s/^# eval/eval/g" "${INSTALLDIR}/root/.bashrc"
- sed -i "s/^# alias/alias/g" "${INSTALLDIR}/root/.bashrc"
- sed -i "s/^#force_color_prompt/force_color_prompt/g" "${INSTALLDIR}/home/user/.bashrc"
- sed -i "s/#alias/alias/g" "${INSTALLDIR}/home/user/.bashrc"
- sed -i "s/alias l='ls -CF'/alias l='ls -l'/g" "${INSTALLDIR}/home/user/.bashrc"
-
- #### '----------------------------------------------------------------------
- info ' Remove apt-cacher-ng'
- #### '----------------------------------------------------------------------
- chroot service apt-cacher-ng stop || :
- chroot update-rc.d apt-cacher-ng disable || :
- DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
- chroot apt-get.anondist-orig -y --force-yes remove --purge apt-cacher-ng
-
- #### '----------------------------------------------------------------------
- info ' Remove original sources.list (Whonix copied them to .../debian.list)'
- #### '----------------------------------------------------------------------
- rm -f "${INSTALLDIR}/etc/apt/sources.list"
-
- DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
- chroot apt-get.anondist-orig update
-
- touch "${INSTALLDIR}/${TMPDIR}/.whonix_post"
-fi
-
-
-##### '-------------------------------------------------------------------------
-debug ' Temporarily retore original apt-get for remainder of install process'
-##### '-------------------------------------------------------------------------
-pushd "${INSTALLDIR}/usr/bin"
-{
- rm -f apt-get;
- cp -p apt-get.anondist-orig apt-get;
-}
-popd
-
-#### '----------------------------------------------------------------------
-info ' Cleanup'
-#### '----------------------------------------------------------------------
-trap - ERR EXIT
-trap
diff --git a/scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh b/scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh
deleted file mode 100755
index b97dcd1..0000000
--- a/scripts_debian/wheezy+whonix-gateway/04_install_qubes_post.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-##### '-------------------------------------------------------------------------
-debug ' Installing qubes-whonix package(s)'
-##### '-------------------------------------------------------------------------
-
-
-# If .prepared_debootstrap has not been completed, don't continue
-exitOnNoFile "${INSTALLDIR}/${TMPDIR}/.prepared_qubes" "prepared_qubes installataion has not completed!... Exiting"
-
-# Create system mount points.
-prepareChroot
-
-
-#### '--------------------------------------------------------------------------
-info ' Trap ERR and EXIT signals and cleanup (umount)'
-#### '--------------------------------------------------------------------------
-trap cleanup ERR
-trap cleanup EXIT
-
-#### '--------------------------------------------------------------------------
-info ' Installing qubes-whonix and other required packages'
-#### '--------------------------------------------------------------------------
-# whonix-setup-wizard expects '/usr/local/share/applications' directory to exist
-chroot mkdir -p '/usr/local/share/applications' # whonix-setup-wizard needs this
-
-installQubesRepo
-aptInstall python-guimessages whonix-setup-wizard qubes-whonix
-uninstallQubesRepo
-
-#### '--------------------------------------------------------------------------
-info ' Cleanup'
-#### '--------------------------------------------------------------------------
-umount_all "${INSTALLDIR}/" || true
-trap - ERR EXIT
-trap
diff --git a/scripts_debian/wheezy+whonix-gateway/09_cleanup_post.sh b/scripts_debian/wheezy+whonix-gateway/09_cleanup_post.sh
deleted file mode 100755
index 34a1bdb..0000000
--- a/scripts_debian/wheezy+whonix-gateway/09_cleanup_post.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/vars.sh"
-source "${SCRIPTSDIR}/distribution.sh"
-
-##### '-------------------------------------------------------------------------
-debug ' Whonix post installation cleanup'
-##### '-------------------------------------------------------------------------
-
-
-#### '--------------------------------------------------------------------------
-info ' Restoring Whonix apt-get'
-#### '--------------------------------------------------------------------------
-pushd "${INSTALLDIR}/usr/bin"
-{
- rm -f apt-get;
- cp -p apt-get.anondist apt-get;
-}
-popd
-
-#### '--------------------------------------------------------------------------
-info ' Restoring Whonix resolv.conf'
-#### '--------------------------------------------------------------------------
-pushd "${INSTALLDIR}/etc"
-{
- rm -f resolv.conf;
- cp -p resolv.conf.anondist resolv.conf;
-}
-popd
-
-#### '--------------------------------------------------------------------------
-info ' Removing files created during installation that are no longer required'
-#### '--------------------------------------------------------------------------
-rm -rf "${INSTALLDIR}/home.orig/user/Whonix"
-rm -rf "${INSTALLDIR}/home.orig/user/whonix_binary"
-rm -f "${INSTALLDIR}/home.orig/user/whonix_fix"
-rm -f "${INSTALLDIR}/home.orig/user/whonix_build.sh"
-rm -f "${INSTALLDIR}/etc/sudoers.d/whonix-build"
-rm -f "${TMPDIR}/etc/sudoers.d/whonix-build"
diff --git a/scripts_debian/wheezy+whonix-gateway/files/.facl b/scripts_debian/wheezy+whonix-gateway/files/.facl
deleted file mode 100644
index 3544554..0000000
--- a/scripts_debian/wheezy+whonix-gateway/files/.facl
+++ /dev/null
@@ -1,21 +0,0 @@
-# file: etc/hostname
-# owner: root
-# group: root
-user::rw-
-group::r--
-other::r--
-
-# file: etc/sudoers.d
-# owner: root
-# group: root
-user::rwx
-group::--x
-other::---
-
-# file: etc/sudoers.d/whonix-build
-# owner: root
-# group: root
-user::r--
-group::r--
-other::---
-
diff --git a/scripts_debian/wheezy+whonix-gateway/files/etc/hostname b/scripts_debian/wheezy+whonix-gateway/files/etc/hostname
deleted file mode 100644
index c70dc2d..0000000
--- a/scripts_debian/wheezy+whonix-gateway/files/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host
diff --git a/scripts_debian/wheezy+whonix-gateway/files/etc/sudoers.d/whonix-build b/scripts_debian/wheezy+whonix-gateway/files/etc/sudoers.d/whonix-build
deleted file mode 100644
index 5841129..0000000
--- a/scripts_debian/wheezy+whonix-gateway/files/etc/sudoers.d/whonix-build
+++ /dev/null
@@ -1 +0,0 @@
-user ALL=(ALL) NOPASSWD: ALL
diff --git a/scripts_debian/wheezy+whonix-gateway/packages_whonix.list b/scripts_debian/wheezy+whonix-gateway/packages_whonix.list
deleted file mode 100644
index 8d44c4c..0000000
--- a/scripts_debian/wheezy+whonix-gateway/packages_whonix.list
+++ /dev/null
@@ -1,26 +0,0 @@
-sudo
-locales
-haveged
-
-curl
-console-data
-console-common
-initramfs-tools
-os-prober
-bzip2
-file
-less
-lsof
-most
-pciutils
-sysfsutils
-usbutils
-lsb-release
-
-build-essential:native
-gcc
-fakeroot
-lintian
-rsync
-grub-pc
-
diff --git a/scripts_debian/wheezy+whonix-workstation b/scripts_debian/wheezy+whonix-workstation
deleted file mode 120000
index 1a4e27a..0000000
--- a/scripts_debian/wheezy+whonix-workstation
+++ /dev/null
@@ -1 +0,0 @@
-wheezy+whonix-gateway
\ No newline at end of file
diff --git a/scripts_fedora/.gitignore b/scripts_fedora/.gitignore
deleted file mode 100644
index da1ecb8..0000000
--- a/scripts_fedora/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-keys
-base_rpms
diff --git a/scripts_fedora/00_prepare.sh b/scripts_fedora/00_prepare.sh
deleted file mode 100755
index f7a9fa5..0000000
--- a/scripts_fedora/00_prepare.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-pushd $SCRIPTSDIR
-rm -f keys base_rpms
-ln -sf keys_$DIST keys
-ln -sf base_rpms_$DIST base_rpms
-popd
-
-createrepo -q -g $PWD/comps-qubes-template.xml yum_repo_qubes/$DIST -o yum_repo_qubes/$DIST
-chown -R --reference=yum_repo_qubes/$DIST yum_repo_qubes/$DIST
diff --git a/scripts_fedora/01_install_core.sh b/scripts_fedora/01_install_core.sh
deleted file mode 100755
index 760d73c..0000000
--- a/scripts_fedora/01_install_core.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/distribution.sh"
-
-if ! [ -f "${INSTALLDIR}/tmp/.prepared_base" ]; then
- echo "-> Initializing RPM database..."
- 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}
-
- verifyPackages "${SCRIPTSDIR}/base_rpms_${DIST}"/* || exit 1
- fi
-
- echo "-> Installing core RPM packages..."
- rpm -i --root="${INSTALLDIR}" "${SCRIPTSDIR}/base_rpms/"*.rpm || exit 1
-
- touch "${INSTALLDIR}/tmp/.prepared_base"
-fi
-
-cp "${SCRIPTSDIR}/resolv.conf" "${INSTALLDIR}/etc"
-cp "${SCRIPTSDIR}/network" "${INSTALLDIR}/etc/sysconfig"
-cp -a /dev/null /dev/zero /dev/random /dev/urandom "${INSTALLDIR}/dev/"
diff --git a/scripts_fedora/02_install_groups.sh b/scripts_fedora/02_install_groups.sh
deleted file mode 100755
index 0daa8f7..0000000
--- a/scripts_fedora/02_install_groups.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-source "${SCRIPTSDIR}/distribution.sh"
-
-# Create system mount points
-prepareChroot
-
-#### '----------------------------------------------------------------------
-info ' Trap ERR and EXIT signals and cleanup (umount)'
-#### '----------------------------------------------------------------------
-trap cleanup ERR
-trap cleanup EXIT
-
-#### '----------------------------------------------------------------------
-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
-
-#### '----------------------------------------------------------------------
-info ' Cleanup'
-#### '----------------------------------------------------------------------
-trap - ERR EXIT
-trap
diff --git a/scripts_fedora/04_install_qubes.sh b/scripts_fedora/04_install_qubes.sh
deleted file mode 100755
index fbb855f..0000000
--- a/scripts_fedora/04_install_qubes.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-echo "--> Preparing environment..."
-mount -t proc proc $PWD/mnt/proc
-
-trap "umount $PWD/mnt/proc" EXIT
-
-export YUM0=$PWD/yum_repo_qubes
-if [ "$TEMPLATE_FLAVOR" == "minimal" ]; then
- YUM_OPTS="$YUM_OPTS --setopt=group_package_types=mandatory"
- rpmbuild -bb --define "_rpmdir $CACHEDIR" $SCRIPTSDIR/qubes-template-minimal-stub.spec || exit 1
- yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt $CACHEDIR/*/qubes-template-minimal-stub*rpm || exit 1
-else
- YUM_OPTS="$YUM_OPTS --setopt=group_package_types=mandatory,default,optional"
-fi
-
-echo "--> Installing RPMs..."
-yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt @qubes-vm || RETCODE=1
-
-rpm --root=$PWD/mnt --import $PWD/mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-*
-
-if [ "$TEMPLATE_FLAVOR" != "minimal" ]; then
- echo "--> Installing 3rd party apps"
- $SCRIPTSDIR/add_3rd_party_software.sh || RETCODE=1
-fi
-
-# Distribution specific steps
-source ./functions.sh
-buildStep "${0}" "${DIST}"
-
-exit $RETCODE
diff --git a/scripts_fedora/04_install_qubes_fc21.sh b/scripts_fedora/04_install_qubes_fc21.sh
deleted file mode 100755
index e17dbef..0000000
--- a/scripts_fedora/04_install_qubes_fc21.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-echo "--> Creating Xwrapper.config override..."
-cat > "${INSTALLDIR}/etc/X11/Xwrapper.config" < Setting locale to utf8..."
-cat > "${INSTALLDIR}/etc/locale.conf" < Rebuilding rpm database..."
-chroot `pwd`/mnt /bin/rpm --rebuilddb 2> /dev/null
diff --git 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
deleted file mode 100644
index 141fd72..0000000
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-20
+++ /dev/null
@@ -1,30 +0,0 @@
------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-----
diff --git 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
deleted file mode 100644
index 03b33ec..0000000
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-free-fedora-21
+++ /dev/null
@@ -1,30 +0,0 @@
------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-----
diff --git 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
deleted file mode 100644
index 7ecc168..0000000
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-20
+++ /dev/null
@@ -1,30 +0,0 @@
------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-----
diff --git 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
deleted file mode 100644
index dfe5941..0000000
--- a/scripts_fedora/3rd_party_software/RPM-GPG-KEY-rpmfusion-nonfree-fedora-21
+++ /dev/null
@@ -1,30 +0,0 @@
------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-----
diff --git a/scripts_fedora/3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm b/scripts_fedora/3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm
deleted file mode 100644
index 96c03f7..0000000
Binary files a/scripts_fedora/3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/3rd_party_software/adobe-release-x86_64.noarch.rpm b/scripts_fedora/3rd_party_software/adobe-release-x86_64.noarch.rpm
deleted file mode 120000
index bcd2ca3..0000000
--- a/scripts_fedora/3rd_party_software/adobe-release-x86_64.noarch.rpm
+++ /dev/null
@@ -1 +0,0 @@
-adobe-release-x86_64-1.0-1.noarch.rpm
\ No newline at end of file
diff --git a/scripts_fedora/3rd_party_software/google-linux_signing_key.pub b/scripts_fedora/3rd_party_software/google-linux_signing_key.pub
deleted file mode 100644
index c7fbdde..0000000
--- a/scripts_fedora/3rd_party_software/google-linux_signing_key.pub
+++ /dev/null
@@ -1,31 +0,0 @@
------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-----
diff --git a/scripts_fedora/3rd_party_software/rpmfusion-free-release-20.noarch.rpm b/scripts_fedora/3rd_party_software/rpmfusion-free-release-20.noarch.rpm
deleted file mode 100644
index a2025e1..0000000
Binary files a/scripts_fedora/3rd_party_software/rpmfusion-free-release-20.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/3rd_party_software/rpmfusion-free-release-21.noarch.rpm b/scripts_fedora/3rd_party_software/rpmfusion-free-release-21.noarch.rpm
deleted file mode 100644
index 163ef4d..0000000
Binary files a/scripts_fedora/3rd_party_software/rpmfusion-free-release-21.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-20.noarch.rpm b/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-20.noarch.rpm
deleted file mode 100644
index bc878de..0000000
Binary files a/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-20.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm b/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm
deleted file mode 100644
index dc276be..0000000
Binary files a/scripts_fedora/3rd_party_software/rpmfusion-nonfree-release-21.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/add_3rd_party_software.sh b/scripts_fedora/add_3rd_party_software.sh
deleted file mode 100755
index 56ea23b..0000000
--- a/scripts_fedora/add_3rd_party_software.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash -e
-# vim: set ts=4 sw=4 sts=4 et :
-
-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
-# - 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)
-# 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)
-# 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)
-# 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)
-# 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 -a "${SCRIPTSDIR}/3rd_party_software" "${INSTALLDIR}/tmp"
-
-#### '----------------------------------------------------------------------
-info ' Installing google-chrome repos'
-#### '----------------------------------------------------------------------
-install -m 0644 "${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'
-#### '----------------------------------------------------------------------
-yumInstall /tmp/3rd_party_software/adobe-release-x86_64.noarch.rpm
-
-if [ "$TEMPLATE_FLAVOR" == "fullyloaded" ]; then
- #### '------------------------------------------------------------------
- info ' Installing 3rd party software'
- #### '------------------------------------------------------------------
- yumInstall google-chrome-stable
- yumInstall flash-plugin
-else
- 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
- # Install repos
- yumInstall /tmp/3rd_party_software/rpmfusion-free-release-${VERSION}.noarch.rpm
- yumInstall /tmp/3rd_party_software/rpmfusion-nonfree-release-${VERSION}.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
diff --git a/scripts_fedora/base_rpms_fc13/fedora-release-13-1.noarch.rpm b/scripts_fedora/base_rpms_fc13/fedora-release-13-1.noarch.rpm
deleted file mode 100644
index bb37258..0000000
Binary files a/scripts_fedora/base_rpms_fc13/fedora-release-13-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm b/scripts_fedora/base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm
deleted file mode 100644
index deb6c0f..0000000
Binary files a/scripts_fedora/base_rpms_fc13/filesystem-2.4.31-1.fc13.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm b/scripts_fedora/base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm
deleted file mode 100644
index e1b0bfb..0000000
Binary files a/scripts_fedora/base_rpms_fc13/setup-2.8.17-1.fc13.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc14/fedora-release-14-1.noarch.rpm b/scripts_fedora/base_rpms_fc14/fedora-release-14-1.noarch.rpm
deleted file mode 100644
index 1bc1189..0000000
Binary files a/scripts_fedora/base_rpms_fc14/fedora-release-14-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm b/scripts_fedora/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm
deleted file mode 100644
index e56fa32..0000000
Binary files a/scripts_fedora/base_rpms_fc14/filesystem-2.4.35-1.fc14.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm b/scripts_fedora/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm
deleted file mode 100644
index e4c2ae7..0000000
Binary files a/scripts_fedora/base_rpms_fc14/setup-2.8.23-1.fc14.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc15/fedora-release-15-3.noarch.rpm b/scripts_fedora/base_rpms_fc15/fedora-release-15-3.noarch.rpm
deleted file mode 100644
index aa5830b..0000000
Binary files a/scripts_fedora/base_rpms_fc15/fedora-release-15-3.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm b/scripts_fedora/base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm
deleted file mode 100644
index d56210f..0000000
Binary files a/scripts_fedora/base_rpms_fc15/filesystem-2.4.41-1.fc15.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm b/scripts_fedora/base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm
deleted file mode 100644
index 2e4398a..0000000
Binary files a/scripts_fedora/base_rpms_fc15/setup-2.8.31-2.fc15.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc16/fedora-release-16-1.noarch.rpm b/scripts_fedora/base_rpms_fc16/fedora-release-16-1.noarch.rpm
deleted file mode 100644
index c06927a..0000000
Binary files a/scripts_fedora/base_rpms_fc16/fedora-release-16-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm b/scripts_fedora/base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm
deleted file mode 100644
index 6e911dc..0000000
Binary files a/scripts_fedora/base_rpms_fc16/filesystem-2.4.44-1.fc16.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm b/scripts_fedora/base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm
deleted file mode 100644
index 53079a7..0000000
Binary files a/scripts_fedora/base_rpms_fc16/setup-2.8.36-2.fc16.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc17/fedora-release-17-1.noarch.rpm b/scripts_fedora/base_rpms_fc17/fedora-release-17-1.noarch.rpm
deleted file mode 100644
index b4390db..0000000
Binary files a/scripts_fedora/base_rpms_fc17/fedora-release-17-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm b/scripts_fedora/base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm
deleted file mode 100644
index 43bd029..0000000
Binary files a/scripts_fedora/base_rpms_fc17/filesystem-3-2.fc17.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm b/scripts_fedora/base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm
deleted file mode 100644
index 6662b6f..0000000
Binary files a/scripts_fedora/base_rpms_fc17/setup-2.8.48-1.fc17.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc18/fedora-release-18-1.noarch.rpm b/scripts_fedora/base_rpms_fc18/fedora-release-18-1.noarch.rpm
deleted file mode 100644
index 635def3..0000000
Binary files a/scripts_fedora/base_rpms_fc18/fedora-release-18-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm b/scripts_fedora/base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm
deleted file mode 100644
index a733db6..0000000
Binary files a/scripts_fedora/base_rpms_fc18/filesystem-3.1-2.fc18.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm b/scripts_fedora/base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm
deleted file mode 100644
index 4d2bc8a..0000000
Binary files a/scripts_fedora/base_rpms_fc18/setup-2.8.57-1.fc18.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc19/fedora-release-19-5.noarch.rpm b/scripts_fedora/base_rpms_fc19/fedora-release-19-5.noarch.rpm
deleted file mode 100644
index 71d592d..0000000
Binary files a/scripts_fedora/base_rpms_fc19/fedora-release-19-5.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc19/filesystem-3.2-13.fc19.x86_64.rpm b/scripts_fedora/base_rpms_fc19/filesystem-3.2-13.fc19.x86_64.rpm
deleted file mode 100644
index 482bc57..0000000
Binary files a/scripts_fedora/base_rpms_fc19/filesystem-3.2-13.fc19.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc19/setup-2.8.71-1.fc19.noarch.rpm b/scripts_fedora/base_rpms_fc19/setup-2.8.71-1.fc19.noarch.rpm
deleted file mode 100644
index bc27086..0000000
Binary files a/scripts_fedora/base_rpms_fc19/setup-2.8.71-1.fc19.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc20/fedora-release-20-1.noarch.rpm b/scripts_fedora/base_rpms_fc20/fedora-release-20-1.noarch.rpm
deleted file mode 100644
index e693f27..0000000
Binary files a/scripts_fedora/base_rpms_fc20/fedora-release-20-1.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc20/filesystem-3.2-19.fc20.x86_64.rpm b/scripts_fedora/base_rpms_fc20/filesystem-3.2-19.fc20.x86_64.rpm
deleted file mode 100644
index dd21d3e..0000000
Binary files a/scripts_fedora/base_rpms_fc20/filesystem-3.2-19.fc20.x86_64.rpm and /dev/null differ
diff --git a/scripts_fedora/base_rpms_fc20/setup-2.8.71-2.fc20.noarch.rpm b/scripts_fedora/base_rpms_fc20/setup-2.8.71-2.fc20.noarch.rpm
deleted file mode 100644
index 7ebc2ea..0000000
Binary files a/scripts_fedora/base_rpms_fc20/setup-2.8.71-2.fc20.noarch.rpm and /dev/null differ
diff --git a/scripts_fedora/distribution.sh b/scripts_fedora/distribution.sh
deleted file mode 100644
index abc8cc2..0000000
--- a/scripts_fedora/distribution.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/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
-}
-
-# ==============================================================================
-# Verify RPM packages
-# ==============================================================================
-function verifyPackages() {
- for file in $@; do
- result=$(rpm --root="${INSTALLDIR}" --checksig "${file}") || {
- echo "Filename: ${file} failed verification. Exiting!"
- exit 1
- }
- result_status="${result##*:}"
- echo "${result_status}" | grep -q 'PGP' && {
- echo "Filename: ${file} contains an invalid PGP signature. Exiting!"
- exit 1
- }
- echo "${result_status}" | grep -q 'pgp' || {
- echo "Filename: ${file} is not signed. Exiting!"
- exit 1
- }
- done
-
- return 0
-}
-
-# ==============================================================================
-# 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
-}
diff --git a/scripts_fedora/keys_fc13/RPM-GPG-KEY-fedora-13-primary b/scripts_fedora/keys_fc13/RPM-GPG-KEY-fedora-13-primary
deleted file mode 100644
index 8da5ae3..0000000
--- a/scripts_fedora/keys_fc13/RPM-GPG-KEY-fedora-13-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBEtWPNwBEADjDowYLqGZJevWtPil9jpwrN2gUE5YdKSpdN+FmeS4PaBjM293
-O56WY1vElOFbD/wO0+UsYsSU3J+Wfz/6hNnC953mNN4d6luT2tMs0Qc5LZ4Xmsod
-a5BWlr1tASUBA/DPiS1mtdKm3n6WuW3fZYydRK2EBskv9tuA3LKgmm9e9OcbTJjC
-lUdtw7868WqR2aU383l9G9HPoN6aR4EKgNgSefdNPTsxD04xbLo/aSHAG85fvXmg
-2z2sVOw3v2oEALCIaL0QPWZ3gcCyY+FUmF8fWofSEqnHWhdrmbqvsitX+BGWte5o
-F0M5m1JIDIBu7JxEeB0t0ZNoeZnWBWsXTY50qUSZjLRSsgkiSNaaaEAOvu4TJe79
-B6xfv8zn2P98lnBEuuAH5GtFsAAf/7htchKbQ72ePGLjIow4BSAr2ZTIhaRnrd6v
-fKSZsL0lKp8rutUTYncm/EM6xB+fApf+BlDtsw2HWZqi14ADGM8pVOwq4rwhWWFd
-em9pGosy4fW8Oug0T+WIXmYx3TRh1o2U7kBDrKUqZu6Gm57YFAAARPjgeg0Pu5+P
-JEtRinhfm57s6YieefzBY/rha48sWk5jbXFKqbOCNInE9rerWnpscvSVaIhGQZYW
-Za3FGhjAHU5ZEDVHT+du5X+aKqj2NZmi+5G/DBg2322d0++exyRHIU//6QARAQAB
-tCZGZWRvcmEgKDEzKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
-IAUCS1Y83AIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEH7catbo5A/egacP
-/1rDtOD5YhVhxJr2rcVyMF0yFERtRVP+nb4vb5HGxms6C4nI8b0jYwLe/OAkdS5g
-xdw+MVKVx1RcnN83N5YBwcCJiNiaN/SXUb+SbIWNCbfZq0s7jm9OWtZLE+WRkY8F
-NKfogR+rd27YfkdI+Y/5at4e9J0c6HyiczNMfUaahZhl+XeodZwaGdjhNpiKD/LC
-V/Ouhq46HUEuos5bHtk2Pz+1EUhsCuih/eeIHU2bRtRGjYF9jGffs4O9b+G/QfI2
-42IDoNqVotyLndiJBiR67iUGG8NLYARi9sDeD+B7pQ1b+LptYq1ltn4/3gbngKza
-SqXFdcjx2SOjpRPOGRc/pPchoAOZS2dYr8aSVkwc6A0VRLb8FGLaVkQa3o0eAq/N
-95wCE9XSFtGWIiCLjsygrTaXjOKdLzOAhaShk4KOdD2phHQ+cwz/Z9fDvtAozPvQ
-o36uB0d6Y1mdDjCmtfNfYTumL1z40/evLOlLXadQjY/+GoidBh+BotSCAeQLAMMH
-+yDaTBFhUIER76OVfpMTja2D2s5YmcD01LhLF4Q3DsfNCSiwe8vhiN1KzyVnrwJi
-T6HwcX68lc0zXhIOADUohs950Drm3btOJP0vZTc0KT8Bvxy/ru+vkdFoqUL3Cw54
-g9fxqLowt3WXdBXuTdM9wlrBXXrSLpGFuuiv4Yzo2u3Q
-=0lqj
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc13/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc13/qubes-release-1-signing-key.asc
deleted file mode 100644
index 2b8504e..0000000
--- a/scripts_fedora/keys_fc13/qubes-release-1-signing-key.asc
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=f2Ro
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc14/RPM-GPG-KEY-fedora-14-primary b/scripts_fedora/keys_fc14/RPM-GPG-KEY-fedora-14-primary
deleted file mode 100644
index ecebb44..0000000
--- a/scripts_fedora/keys_fc14/RPM-GPG-KEY-fedora-14-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBExJ1v4BEACnj/1xlkAkz2/1a6fOS4/WFHui2yWzE3deHAAkPpLnOqR487xd
-kulaGM982Np1HnZ2xDhP7cKOumI7P0dwzHW2KVMEzyYbivvJyP/XrLtc2tfzuA3+
-tJRSwIH4YTkCFkRb/aj81+HTI0olulq0WHx9tBTxOSA4PvdRGDHetkpT4loNGQoB
-2SWul2BLDxKmv0HP9CDa83AOt0UG00ecWQkJM2PYqR6wLfcOIKAZ8EGnJfQnj8iD
-1BzH2hsP08tD4NKbSPchcRlTqTtohHQIE2aT3LvzyJ/TTeK8x05YlPXQN3a1A2t1
-jEppn/7uoWdJCUjZpVzS1VcTJvK2uPjMHlUsmtl5o36NoGxKSlZDoNdqxcOVjTWA
-C9fHVqcEBTeehGMi6nLtMopYVbmYfZT8XCkHPg1/oecDffnRNCMi4AGJBRAt9+py
-oE9wy5G6dOQSFfynAIdioDF5oY+yUtHjPs036+InXHh1YnHIU1LhJdlZUlowmhqT
-mTSmHjD9f9+qMh+yfmdGMxhA0dxyJg/NYvZdp3p3pq3apps5jgm3m9WGpBmGkhLN
-hjrcTgw6INFs5iAuLxV2fRQ4NMoBO8yhSOTgXBlUwLW9G5MJxzxMea/mgEV4fGr7
-oteg/h/d8qVelV+Zh46EFEwEWbeHNiiM0HRIEdd0U5tYmk9h56COGowKuQARAQAB
-tCZGZWRvcmEgKDE0KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
-IAUCTEnW/gIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEEIcrduXoQcfhfEP
-/jbcG3dgeSZ2CO4gzulkAQZVMMKKMHSOtoNMfKIi2ib7h6A2W3hA2JLfPlDUObvX
-cmZ4XVIXmBr7sxgWwf4W53S9S3OKgBseI0F/nnZYS/iKEgCg9GRzUOi9j9l0rviR
-yn3OmHCSr6R8ZAqCAnQBeGSP/rzdtaMf/HCxuOX0MsZASpmhQHxXDUJdhNT7aTUU
-JC4fOvCRYaRocZBQf8yexQnCPeoL65YusSq0D8+2Cg+HUX72vckAH3BoYYIsQZ6h
-/nPGHMru2nafF2deL0omTbtjJW5OUczJcEY/15MPrD55jyuZLnWwAQzjz0uMcaVi
-h9zwzy1EGB06OxpwKDipH7wjohIFKgJ1TSakiEVU14CzqJ2afvS8tVPDxIsuXgr+
-UvBmvatvRslyfdySQoHf8fqJiSYHpWhjw4S1+VU5NBSk1oTPqHobcEKTDXb9DdLI
-XMUpkOm+O6kVZ0VX9fFbJbaKlq/fT2bG6HzM8icDt3lnwm9eAPztr6f2nUfy/mqK
-iKYWPmRIiU14zc50vjVdDxx80DNZHUE/chz0WBeUSLzw8NQpY26o02LrPee2bQ88
-gwMcKde0lzJbwfND0JR58+tVEJIglxWn5I9JmYdJ9DYJIJlqXJv2CmDqVXUEMlez
-NRAnpOmXzGuNYYlBj3ZI+Zyk18AuA29xhWWud2zlw3a0
-=Zk4V
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc14/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc14/qubes-release-1-signing-key.asc
deleted file mode 100644
index 2b8504e..0000000
--- a/scripts_fedora/keys_fc14/qubes-release-1-signing-key.asc
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=f2Ro
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc15/RPM-GPG-KEY-fedora-15-primary b/scripts_fedora/keys_fc15/RPM-GPG-KEY-fedora-15-primary
deleted file mode 100644
index fa4146a..0000000
--- a/scripts_fedora/keys_fc15/RPM-GPG-KEY-fedora-15-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE1QZ78BEACdoNoYP9uIvFBJJ4Tg5Vn2gSFRDuKbj0qkifBdGT8co5Lfdgg2
-UnCximfJUxkul82RBu75AJ/VU6vgDvgnP4m5vhY+f/vV1scMeZbKzlJuW9YAIHqe
-CK2W1zEVfx4OqxdGJpFWiE4q0M74FDRkYMSQzb3FQWpVI2enmJCvGTMSx3cwhus0
-ck0H16sOGflcNeQVeZ/fiUzQ65WOIn7NWwc/ZQyNxLE3JMAY4Z805c2GgpnP4orC
-9YLH+fL7D+axL/Pd5cX6B0dy7mvVzBOPA0LL4qdvkss7vLCYlwR6urTgGAZHX4AW
-myJg16Bq6JOrvtQ1TxEChQYYkVOmPXcpC5xBiZzA9TqHVHfXrjnfWjpsA2N1TH8y
-VqkjOq40TDEwuSDDzX3f1xX9TaajmVwmKz9wTeBSw/UeLVMbiWhLzmHtD7UYKgdH
-X9HxN2v6mOErrEdBLjhD7hTfkwOtBO8Lgd5a5VnAcnBJ0PcEEISOOsLGJPkr3HQX
-Qxs4luSza8zq0/wnZc+cA6luDekj5JcuZvQAtej3xtQxI88MELNJfB5QvxwccwCC
-OKTpEcNzF9VwB3qhWleV6ZETF0Usi/M6yk2XsoKXUy0aGfPhV/nVQ8mokbbQTQkB
-cZ1jLSrbKqtrKOeZ8UvtJ1QGhrLtdw6CkTYk2oCxHPPSU+Naj536OpVFswARAQAB
-tCZGZWRvcmEgKDE1KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
-IAUCTVBnvwIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJELTr9XkGnIRghwAP
-/RIIxLdPOr2dxQRRJ0Kd7pM2sDZaCuiplBGUU1Aslsjv5L1m4HjA1JwT/NDs2AvP
-1B97rV7n9UDzudH5pnhUHLJeAd4Oxw2ngoNN6IA/6UHFw+MDjUCz2x16iQi0IpCX
-o3lmIm9+ZM9761wvvzZWPEvZsUVVfaIWdML/FPagNi/JwICo2k7yyRPZUEOfmfsz
-bRO8YTWP6Cz0YJ5QGO6MZbfCiRqkv11PAXmio39YchGHNXKmVsbzVSVz6CF3LU1o
-5Y34R9UCWXXTk9U+koSPaUyn/oxnFMhFjklUB8PaFC67/Hr0wlP57xKMKdZkVR/O
-l+vgJPwk9ZirFfHuwanfCjGRNTcY9bNgCPXB6sOIp27IoN8kVarEqnvzgJQWQVZ+
-ACmu3oPEZ9Aaywe17fkGHzQaKOCBxl+rvfBEpd+Mck4C4qecRqyXS5Ftiop77mbG
-I1gGChBTG35YQUywZ+5DBYZ8PzWmYtPTTMelmaXcF1BYWFNgJuXpzkB2b70VMS4Q
-e0Jq/1iB57lfaQ1617YhlAP1LhgTJmv6HSXX+eXS4w+vYN0VxAtK2RI8WYk8UDw9
-W2g4vQYi29H1ldWHmIx3leiB+JKpCKcqpbeGmblQ0zwbBZUsm083PJM2bTlv3mVC
-RpNDMjs84DmneHRN9swSfC6fr8BeEXhS3tVCZriKoBfO
-=TOl+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc15/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc15/qubes-release-1-signing-key.asc
deleted file mode 100644
index 2b8504e..0000000
--- a/scripts_fedora/keys_fc15/qubes-release-1-signing-key.asc
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=f2Ro
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc16/RPM-GPG-KEY-Fedora-16-primary b/scripts_fedora/keys_fc16/RPM-GPG-KEY-Fedora-16-primary
deleted file mode 100644
index fa3f53e..0000000
--- a/scripts_fedora/keys_fc16/RPM-GPG-KEY-Fedora-16-primary
+++ /dev/null
@@ -1,31 +0,0 @@
-pub 4096R/A82BA4B7 2011-07-25 Fedora (16)
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQINBE4t9H0BEADKYcbvLVHkBat2JuxWgRsSdXawP0zOXe3WwwBwENWTQoyw0vId
-gwEaITRECvx94E6CqKYSh30hkAr4o0WVMsuTwW6mAcHI7kiLUES9mX7q9YpbWzIK
-gxf5LNU7+uV4fw3TYAdp6WIlwRBbBZ6KIAOdvA+2O+BWrIumLfKSxvfZ2NrFqb/o
-axxVBaq6QWp9yivhU8QqNk+4smcsheDv4UNZz57TQcBRxTmGbosu9vsCLstTQfhm
-DV9xISAfd2mjNO/zH48nAcbO2EKHlD78LFB63nbHFK6cvVboFURo+oExDdC//bEm
-myXmTAzTAr7diRu8+yP3py+XPrT8qrTjnvG24CyDWsv0i6bsS1S1PwX1iFzSrmQF
-5BJrrPeQPLfcLe/BKNV03glWRI1QZLqN2JXwSxB0MfmUu5N5Y2P5XIjHSQIy4aUr
-sGiFNDweghYC0YnYC04viHdOMaQlMFLqJU9JB01nelkAxOh9mCOCnlRnm71Rk0Hy
-vPjjA/aiHHaE/tTNOEPbxo0d/RRd0Tx5uYoYjVewWp6ingnmodnmJDIJgHF0csyh
-qyFmWCeTku5nTZeJyTds1/MmwMDcMHNJDbZnHw/7sbaS+OF/O9jo6eyJ7kcyu6XQ
-cZZkSdOoMs5ogr1UB1Y74Mo2E5USq+2s7NVMnOnGl9kJ/59xl7/qT7dliQARAQAB
-tCZGZWRvcmEgKDE2KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
-IAUCTi30fQIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEAZ/ALaoK6S333UP
-/0+4x6bf+IbrOOATlmwt1hdF2A11ZJ/xTrG8exUmis64dajGP28nOs5L0NjQkpfi
-xU8xKlDyCtdlFzoEeUI3kxvab6NOB4B5qICojMeVHOxn8nfqyQS/yYLdrQqoHPR7
-r1jrqBfKxEYH6i88UclpG7kgMgq2uENsH8mUu2Tsq+kR0y3gGJ/w1hdU6klpNL/s
-tzQe/AtTcj+571XTPUDcbGHU6ZYWwJN7uVNuZ/AhxIlXUt9GAJd1FLm2/UC7xFlM
-UK3e3k41TgJz/QwLRtjgIzEXY9CNWLBlSfxJjx2Iq94S/C5a5DWDIM2ue6Ci84PO
-57P0LleC+sjIMGSCU3NgPz3pfbuz7rJDYkVkmX6Vs00mETNe85zE4BNS3bigQ2B1
-WALjTZEAeE8nsrE2hH51kXKV+Rm3f2aV9GXRK5Uuuavr3nyrIvUh4J1oR27RHz25
-+JF37yX9iCGqspk/CHlx8UGrHqOe/5UbqiRXHmzIpR4L/zq1MHJWzESJkmlr67ub
-he2nC3vgL9Fb43qm6Q4aeHBUNF9jfwBGH5JdTShsrbcoeXnKvLI/poPcnpXODdWN
-Ck6WNtP2A3n2bp7PCtKlybWyI7O+FFfAO8P6DYTYs27na3L8/Trr1VFk/24vSnTk
-ZfBQafh2YuMdMhrVwfn7Ow7w2qm7y9yvxbA1nv/i+JST
-=UuYc
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc16/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc16/qubes-release-1-signing-key.asc
deleted file mode 100644
index 2b8504e..0000000
--- a/scripts_fedora/keys_fc16/qubes-release-1-signing-key.asc
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=f2Ro
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc17/RPM-GPG-KEY-Fedora-17-primary b/scripts_fedora/keys_fc17/RPM-GPG-KEY-Fedora-17-primary
deleted file mode 100644
index cdf9697..0000000
--- a/scripts_fedora/keys_fc17/RPM-GPG-KEY-Fedora-17-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBE8MkeIBEADfn8QtElquxUAVvS8th7UnVmfkExw7jC7SVy7dGlXo5rgxqETM
-AZorpDIvAtKX5VMr/lUfODB6sSymh0e6EdvYQfHrpImO05F7WBq2DhRW74j1DRNu
-8vohKPTsSZTEZo/mrUBDAAGtGOXcrsQxx4J2Ur73+r18ODd+v6O33YevlFmwmFYT
-uDcgdhxyxBdpJVES8MdxO349uP9bvrU+3KjpDDGHb/hMbY8az7lwLtBufRrAekhN
-5Cg7+zm+I+wVGzgzSw0yrIh4hdVts4RKZIrl2N3VeZcCY4IrNZFd2Do6HhIwA7l/
-/xpTEBTZ4BmnGP9iufUVa2h97/JmKy38rM88IovIcTSnYDG68k/NxUkC+dLriI4T
-BNc9kJLVo821x77WYViNXHscF8ujlf73HilfCnhEtNwViGO7x41guQrdv5k79UDf
-1CylSZ+76vKXziz6uNHzIagiViNOvYHOoEH8jDNnubqFTxYXUNks5l3/byllQ0XK
-Oj9RarmjsMS3udRB6RCiEnzDbPge2S9gmdmY8MA3QeZ3aWoZJqygDQ0WNUOjPZ0E
-80x+xbUyAK06/SCzs6bUx6GMXd5Iy5r3Gc+6LRt4WEG5r/vJEHPSj3qAoVqydsY0
-GjASPIQmYduCdi7Inf0w+2n+nJGPcK1k432xHD0z0kp1Q/xcOH/Tul3bcQARAQAB
-tCZGZWRvcmEgKDE3KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCNgQTAQIA
-IAUCTwyR4gIbDwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEFDpTJkayjRlKxAQ
-AICtQT+j8Sum1J86yBwso1wuzK2sHOXbfC1LCdQw2u6QLfKSUsCnQ5AL+oCnS491
-5fjrYksT2siclLhgZX7/yF76XuYHHhRTO65NaPSCxxhN6S9zbExUPRoxFL1ay0cH
-p14WYI1/SGmKPcJmigV6n8+wGYl+zWlH9eiiFP/+JCxJ0ZvRg3mgT5zcPdIzTDOz
-4rTE3WfH3qqxYhw2ttDPomBSdbgJw2N6bj46t8rljIDGdeKpFHYMVXpUp0gDkEoY
-bAiQhvZaa2F6mGMfXRdr4Phs562+tF/Qy/JaK8uafYZPHTtC16NHf87DYceLzvci
-W1KNBYGrEHm5NMguBlqP348FYMp+6hJDYMl38Qx3BK9bz6lW0G75tgaAZ+sxAFGs
-/MUcjChkF9OcF7Y7W6hY3IQb/+FgB5eNpBqfmZZ76ywpS+D0sIqxzWoILtlXdHeN
-eM4YiX0gvVQXwn9S89O5vWKxWYspywfgV/aXHk14O6k7oi8wInJOvgxZKEHUT4XU
-K7DyogL45VV9iYoWYIym2L17VBnINE/Kwmc/81nYigE0tTOwaR+qMFBSRlkOA4+X
-ZlIvb5Cft7CdC183FYLIM+B6xNSKE/OhavHZsRJrLZC1aAP8MNh8Cy7Jqrn1/Qjj
-6sncrqaj/Yis4yAaINk4MrnbImN2MwzU70q0eR3kA6PY
-=3+4G
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc17/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc17/qubes-release-1-signing-key.asc
deleted file mode 100644
index 2b8504e..0000000
--- a/scripts_fedora/keys_fc17/qubes-release-1-signing-key.asc
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=f2Ro
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc18/RPM-GPG-KEY-Fedora-18-primary b/scripts_fedora/keys_fc18/RPM-GPG-KEY-Fedora-18-primary
deleted file mode 100644
index 7f54bf8..0000000
--- a/scripts_fedora/keys_fc18/RPM-GPG-KEY-Fedora-18-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFAfSWQBEADCxcZGtV5xGYGOKIOlidZ1Kj9ymFNCk/3+HkK9dpRqFdoIpx7o
-ZqXFWFWktMeH5iUarCAzhIZlNJ6hsOXHQ6yPASsNR8XATCtaf2P+tz50Rvo6R2OK
-2/KRIrRjBL0GQNGlJ3QX+WLkZXYYuf47TNiESJ8ooMp52t2IV+PXc//cdHnBoS2i
-LOO/5PkhhnvOgANmj/YrO2OA9p8NC/LoMa0Oa0u+EmBO3dddRqobRKV1+fA725Ij
-TXP5C8K3xWKo+vhmFN/k2IrcETAy79Gtwj1leMqM4m8AG5XLdjv8wjziNtEyBDz6
-5MyYG8bMoVVpeTt8erWtSWOyeAxH8MeIkXbAmaTt/4actgTPm8/tvuB1cP1S4VW5
-fbBtV5G912xX6vz8WGc1SjnHaNzQJ1xBufxewkcesN1BdN+vqSE4UOR47h4E+R+3
-aN7chjYWRuz4zicBBVTv26Zti0REY7FP0EBa4goxf/zC0FQADQRhsqoZKcuATa6L
-2j930rp0jGHO0WPgQOMDdd/rzp/oJjhjZsChbj1ktzwfEE5gL7QnQ/mm12C1/2Gu
-tIRXVrMCxsyO47L39eqc+KfvnFXF3DuGEeaC8Iko3fF79FL7fREZ+GKWSzM/JKjk
-KLTHaew03qQi4EhX5cthRmDMfQ7MJA2sk64djvTvh5fJmyANEfDhw3i1mQARAQAB
-tCZGZWRvcmEgKDE4KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
-IgUCUB9JZAIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ/wESXN5/OL2W
-7g/5AVNvfFwLFUcav+cj/gMscI9+rMbzwf8XY2TuXautacMhb2RP3B1taEFwzHvq
-THXLxVgO+wZDIPsZrdVEjRQLion6DxOp9EnhJUysSXHzfp0LFOQzfI5YvBkqpf7V
-ew8K6nM1+hTyLBQWKnxsAolaglB2YULoIYY6q7eJpza8Er9z4MWmyuY//SUT4t27
-+8vmg00MNx1W1xoJlpF1L2T6rhiYmeYlYQn0KO0eEGBLdDZvWQjW7Kmpnt2Z/QzY
-smNLUuWxtwEXNbJ4lWehHMAocoQFJ2geFC3hOxyC2Ahfk3AlTdh0HYCrtr592Y07
-cMRqrSAM2+Z6sE/LuHUjYX3sQu1+/by9aTKqhajpgHq2DKYmW4x5+2PF75slU1Lr
-QiFyogXAU0poQjt2QWvo6jwNxSkbQpsQ1R4gkxb7TkI/fR4G8/txOIpwtepiFBGH
-ALqIMx+sMQEUMWZlArBf78Hf9JjV5J8g+eDbirWKYJvpb50IYnGNbS1IVUcF6k4G
-lcBV4UFMytptxYVOthxg0eMlprfhzC+kQJy1iockVjfjq/g/akFF1JfK/oOEVuuz
-ESZ1CDA18AAktEFEcefKcx9wLqmim9udirDjpMu3aH3HfCouwjX0Bhwf5kLgVyz1
-fsBILFvv9KXz10kfmgnEwhJ0ArFuHW5kk/LUEcHORdO41z4=
-=Xlbx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc18/qubes-release-1-signing-key.asc b/scripts_fedora/keys_fc18/qubes-release-1-signing-key.asc
deleted file mode 100644
index 2b8504e..0000000
--- a/scripts_fedora/keys_fc18/qubes-release-1-signing-key.asc
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=f2Ro
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc19/RPM-GPG-KEY-fedora-19-primary b/scripts_fedora/keys_fc19/RPM-GPG-KEY-fedora-19-primary
deleted file mode 100644
index 9787950..0000000
--- a/scripts_fedora/keys_fc19/RPM-GPG-KEY-fedora-19-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFC5a/0BEAD3LjUH329eJjBCdQ60m5wG9U/QToy/sEsx6+q/012wXPMFBMCW
-1h53ISj1uEyHd++qMn71u/GtWnRTwvPaxUUqdNiFQpTMAmY41JIdXmOzUYj9u3h/
-dLQJT7wKbKHQrfDnapT2O3eIyYuj07iPTtaIrUE8AZ/wVmrJ0xnLDeir2FfC3h3V
-mqFo7OAK193FdufYYT5YQlY4jJrgwo7KDjLEh9ZrB42Fj4+MXgjeX3K+gel/GwiS
-b/KahgB9bywUcstvDWoXfbhHmf0fw3SmRY+5B0wWp1un7uepsE+JJ69G4gwfgcln
-49JrYBGFdMBuvX6e3Dw5hUZ+rRtUn911qIO9uPR+SCJqf4ttzs9U0VSdLDUfFAv+
-Isb4WOXF8UF0QbN/Cl+EMs9eiN+MNCvYWRDcnsGTeEmIDhABqwfkrOXNpMHm1FNa
-P98QVc9TpBojes3KwmkTolAW92lgznYbpeN9nsv4BLT+hnBJGIegsgq78E1fa557
-l+am+qerljlHWapVB+107qdNBNxeOAUA6DdXH9B6XZju1+M4kjYrtzKraUCUMZZ9
-JebOKMerF++fjdSqmJM8LbNIwcfDtqBqMBBrbiIhlysiFBIItBOK+KCOQ+s95had
-J/kFbo1doFUc+k4+ltMwsQGhRoWeSpr3Xl5ohGCnF9k9PwnlBzGx8I+xWwARAQAB
-tCZGZWRvcmEgKDE5KSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
-IgUCULlr/QIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQB0d+ZftLGOYR
-mA/+KAam9+c6wmJauLOY5dHMxd5UxsfPz3YsTKNLVDwt/ohRze4hXcH/Wt4bOfk8
-FSO35xzP4ynXpUZDfrDJsz4QNOpGTIyQCJdCHr8n+RR6IDMSVF9e8uOMoCfwE/Nw
-erLD4KGI6S1+bffcEA6YTxQod+4WMEJlkLToTfEBtxksxGMoW3xdwINDT13jQivm
-zktoGbOQE6zSSNVaaA94xSw5AbiYXUqfIvvJBmCPeM89ctTC5tTyNsQAN8n0QJtD
-lKT3hPfT8H4gacqiecXBJ6fpuWMXY4t044JBPmOk5Nlr0TEJ3m0jmPc1A6f+h+/Y
-flBLVIGx+Bw+LIrfxAfrn03XLyleDEO9kvC7q1zxnezKdcxtVXfI5bDQZELWMT1b
-KVQvje3KuEZ0IrRwV3qKKucBNqd0k2F6O0ovLMorenLMyBl9SDpOWt67roJeANiq
-BFFJkNuDqBtHgzgY7053Lj7VMoIeOtBpRf6WM7m8MaI0gXTgjZrhPPynqdFmDtvd
-6IqBYVFvUgIqPM36Scev2CMpok/g8KBzaHKljim+xSI4wziu3Kfxb854P/Df9WZd
-bCDWpFdPY5/dCnoMgTHGKLUumUMlfXif+fEykNt4Ic9Fibkzv+QSHQ5YYtoTfp9i
-o7puEJiQxkQsuX/CcXU9NDL6MeBBNS/b67EqnObAIRzroHY=
-=apZ8
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc20/RPM-GPG-KEY-fedora-20-primary b/scripts_fedora/keys_fc20/RPM-GPG-KEY-fedora-20-primary
deleted file mode 100644
index 96dae1d..0000000
--- a/scripts_fedora/keys_fc20/RPM-GPG-KEY-fedora-20-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFGVT8oBEADiEFecKV2eDgaIoK6O/+2UxTGYHpVJYHj7Jl2EGHZWJ3jaN2xD
-slXrhgurZZaXl1Cb1vplFIrMtC4rUxyKWwGPRa3jo9MkSgpwqFsYnKsFxo9Vu/9Z
-XRAD6x4KfSl1J+c56qjKaBA3e873pcapBSWaw/gWCIxDQzhhiqYEdqFiu3PfbTvB
-YT1Zp3QqN5TW61Rs/Uq8WkoOLKhAnucuvrfqapAVN5Hc2JWeh32sLNLdXfo3XnWd
-VksqfXHnt9cr9I4ErsJ0KyBZFx36d7rQ3VoPKYDBtL8ZhwNkgJ6QVIZl1u33SPAF
-QbsetNtQhnN8Nx6ks6e5+mTOGz1HneD36wU1zeUxSFCFoD4W+bvUTpquTlDRRZXk
-GlkSqUBxxAD8vQm55+cVhrwaTRT80vJFYXNPx47zNih7xZVznwzzGCG3cWlKlhhO
-KZMXtmgW0KSi7ICb3KUU0e5njP3OBkeB7N2o9le2Qtf7t6LfJdwY13dS4c05olhe
-j7pEO+qVGBWgaC+plbiYCh1MQedb7dkjUPByTiHVpBUQH4aktLqLd/0Dt6fqxMh+
-MhxglZW7iVfTcfCqfQfNmyctD2t/fQzyfR9tYd5oIO5dep9Q2aIXlf4TJ3m392v3
-Dxz47P1L9l6kATflx1nj2tG1U6qP0ePlkDjDD9XIL9cKZ08UXaTiHYY/qQARAQAB
-tCZGZWRvcmEgKDIwKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
-IgUCUZVPygIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQLrFh+iRhEMGm
-2Q//R1h9bBgdF4w9ZWM0ny5rx/DzXQCDP4CKMEhzvJXAPZuSDtWa+PkppGp4rq49
-1GwGRs3CGF3UikX6Mqr0TbZiGpXZ+5MaXlgU59ULtvHaRGKYK5lvoeLyOZpBB0vo
-yqBuCGnHPbHyJjilwMXp91LNdbRu3yHYNFgr/ZLQcJ/66UMnawX2Hb4fTcUPKb+X
-r57gmERlRBSTbAPSM8WfCtQh1GtxLJT7rW8ayeD8DFnNB3oaTKqOyH1p2Cxxv4qi
-xUCEx0k57TfCRcBzrb4CPG15phmLbCBFm+jdDNboi+LYIHAj9XU1znJm/lHLAHNI
-cF6/9UwObs0L2i/yWqVJaj0fQ4hhhz7l2SOnzZH7SPj2irNkxGNMHrDXNESNZgzR
-AnnteEMHv3UMJfDdn0llet7sP+7wVJEpBJaU+e1rZBvgM0KvQt53xKkCgLN8kVpn
-JtbJ8DXvlt7yeCIRfhHJFvhY7+hdZqSygzOSUPeUcr+0VKgBjByUWdbAQV13TKo4
-a4B+t7Fzj5UT9xKGqebv0CEnKI210ONg9Oj2NZU2PaPLTveiGe1BbEvazdNbd7Ts
-zasvA0Wp12xIyJpeJwe6TNNR9lLDkj9fhvLUH0o+6bPyHas4hrhcZsQa/trSyiiS
-XFz25bVz+AZ0b3aEcABLDCpG8nMOPiSSE6uccRAlW7muFOw=
-=EJ/7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts_fedora/keys_fc21/RPM-GPG-KEY-fedora-21-primary b/scripts_fedora/keys_fc21/RPM-GPG-KEY-fedora-21-primary
deleted file mode 100644
index e8f1868..0000000
--- a/scripts_fedora/keys_fc21/RPM-GPG-KEY-fedora-21-primary
+++ /dev/null
@@ -1,31 +0,0 @@
-pub 4096R/95A43F54 2013-11-14 Fedora (21)
-
------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-----
diff --git a/scripts_fedora/network b/scripts_fedora/network
deleted file mode 100644
index 61c4a5a..0000000
--- a/scripts_fedora/network
+++ /dev/null
@@ -1 +0,0 @@
-NETWORKING=yes
diff --git a/scripts_fedora/packages.list b/scripts_fedora/packages.list
deleted file mode 100644
index 9ec27da..0000000
--- a/scripts_fedora/packages.list
+++ /dev/null
@@ -1,37 +0,0 @@
-@base
-@core
-@editors
-@hardware-support
-@fonts
-@base-x
-@printing
-@gnome-desktop
-@input-methods
-@system-tools
-@admin-tools
-@sound-and-video
-@office
-gnupg
-NetworkManager-gnome
-bridge-utils
-ethtool
-xterm
-stalonetray
-firefox
-thunderbird
-keepassx
-perl-File-MimeInfo
-gnome-terminal
-Terminal
---exclude=kdegames
---exclude=firstboot
---exclude=xorg-x11-drv-nouveau
-yum-plugin-post-transaction-actions
-tinyproxy
-liblzma.so.0()(64bit)
-git
-createrepo
-rpm-build
-qubes-core-vm-kernel-placeholder
-ltrace
-strace
diff --git a/scripts_fedora/packages_fc18.list b/scripts_fedora/packages_fc18.list
deleted file mode 100644
index 1d709c4..0000000
--- a/scripts_fedora/packages_fc18.list
+++ /dev/null
@@ -1,22 +0,0 @@
-@^gnome-desktop-environment
-@libreoffice
-emacs
-vim-enhanced
-gnupg
-xterm
-firefox
-thunderbird
-keepassx
-perl-File-MimeInfo
-Terminal
---exclude=kdegames
---exclude=firstboot
---exclude=xorg-x11-drv-nouveau
---exclude=firewall-config,firewalld
---exclude=gnome-boxes
-git
-createrepo
-rpm-build
-qubes-core-vm-kernel-placeholder
-ltrace
-strace
diff --git a/scripts_fedora/packages_fc19.list b/scripts_fedora/packages_fc19.list
deleted file mode 100644
index 7c95f7a..0000000
--- a/scripts_fedora/packages_fc19.list
+++ /dev/null
@@ -1,23 +0,0 @@
-@^gnome-desktop-environment
-@libreoffice
-emacs
-vim-enhanced
-gnupg
-xterm
-firefox
-thunderbird
-keepassx
-perl-File-MimeInfo
-network-manager-applet
-Terminal
---exclude=kdegames
---exclude=firstboot
---exclude=xorg-x11-drv-nouveau
---exclude=firewall-config,firewalld
---exclude=gnome-boxes
-git
-createrepo
-rpm-build
-qubes-core-vm-kernel-placeholder
-ltrace
-strace
diff --git a/scripts_fedora/packages_fc20.list b/scripts_fedora/packages_fc20.list
deleted file mode 100644
index d706e46..0000000
--- a/scripts_fedora/packages_fc20.list
+++ /dev/null
@@ -1,27 +0,0 @@
-@^gnome-desktop-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
-git
-createrepo
-rpm-build
-qubes-core-vm-kernel-placeholder
-linux-firmware
-ltrace
-strace
-haveged
-mate-notification-daemon
diff --git a/scripts_fedora/packages_fc20_default.list b/scripts_fedora/packages_fc20_default.list
deleted file mode 120000
index 852ead1..0000000
--- a/scripts_fedora/packages_fc20_default.list
+++ /dev/null
@@ -1 +0,0 @@
-packages_fc20.list
\ No newline at end of file
diff --git a/scripts_fedora/packages_fc20_minimal.list b/scripts_fedora/packages_fc20_minimal.list
deleted file mode 100644
index d58aa47..0000000
--- a/scripts_fedora/packages_fc20_minimal.list
+++ /dev/null
@@ -1,6 +0,0 @@
-xterm
---exclude=kdegames
---exclude=firstboot
---exclude=xorg-x11-drv-nouveau
---exclude=firewall-config,firewalld
---exclude=gnome-boxes
diff --git a/scripts_fedora/packages_fc21.list b/scripts_fedora/packages_fc21.list
deleted file mode 100644
index 7c6d30c..0000000
--- a/scripts_fedora/packages_fc21.list
+++ /dev/null
@@ -1,32 +0,0 @@
-@^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
diff --git a/scripts_fedora/packages_fc21_default.list b/scripts_fedora/packages_fc21_default.list
deleted file mode 120000
index 3527e47..0000000
--- a/scripts_fedora/packages_fc21_default.list
+++ /dev/null
@@ -1 +0,0 @@
-packages_fc21.list
\ No newline at end of file
diff --git a/scripts_fedora/packages_fc21_minimal.list b/scripts_fedora/packages_fc21_minimal.list
deleted file mode 100644
index d58aa47..0000000
--- a/scripts_fedora/packages_fc21_minimal.list
+++ /dev/null
@@ -1,6 +0,0 @@
-xterm
---exclude=kdegames
---exclude=firstboot
---exclude=xorg-x11-drv-nouveau
---exclude=firewall-config,firewalld
---exclude=gnome-boxes
diff --git a/scripts_fedora/part.bin b/scripts_fedora/part.bin
deleted file mode 100644
index 47970d1..0000000
Binary files a/scripts_fedora/part.bin and /dev/null differ
diff --git a/scripts_fedora/qubes-template-minimal-stub.spec b/scripts_fedora/qubes-template-minimal-stub.spec
deleted file mode 100644
index 318b326..0000000
--- a/scripts_fedora/qubes-template-minimal-stub.spec
+++ /dev/null
@@ -1,47 +0,0 @@
-Name: qubes-template-minimal-stub
-Version: 1.1
-Release: 1%{?dist}
-Summary: Placeholder package to minimize installed dependencies
-
-Group: Qubes
-License: GPL
-URL: http://www.qubes-os.org/
-
-Provides: /usr/bin/mimeopen
-Provides: nautilus-actions
-Provides: gnome-packagekit-updater
-Provides: ImageMagick
-Provides: pycairo
-Provides: notification-daemon
-Provides: desktop-notification-daemon
-Provides: tinyproxy
-# Those versions needs to be updated to match target Fedora release, when introducing new one, use ifdefs on %fedora
-Provides: NetworkManager = 0.9.9.0-38
-Provides: pulseaudio = 4.0
-Provides: pulseaudio = 5.0
-Provides: /usr/bin/pulseaudio
-
-%description
-Placeholder package, which provide ghost dependencies for qubes-core-vm to
-minimize number of packages installed in the minimal template. Note that each
-of those dependencies is required for some functionality, so without installing
-some real package (minimal replacement?) some functionality will be missing. At least those:
- - graphical updates
- - be a target of qvm-open-in-vm
- - be a DisposableVM template
- - context menu "Send to VM" entry in nautilus
- - graphical notifications
- - sending application icons to dom0 (no fancy icons in dom0 menu)
- - will not work as netvm
-
-%prep
-
-
-%build
-
-%install
-
-%files
-
-%changelog
-
diff --git a/scripts_fedora/resolv.conf b/scripts_fedora/resolv.conf
deleted file mode 100644
index 6e7633b..0000000
--- a/scripts_fedora/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/scripts_qubuntu/00_prepare.sh b/scripts_qubuntu/00_prepare.sh
deleted file mode 120000
index ffd45cb..0000000
--- a/scripts_qubuntu/00_prepare.sh
+++ /dev/null
@@ -1 +0,0 @@
-../scripts_debian/00_prepare.sh
\ No newline at end of file
diff --git a/scripts_qubuntu/01_install_core.sh b/scripts_qubuntu/01_install_core.sh
deleted file mode 120000
index d0cfd21..0000000
--- a/scripts_qubuntu/01_install_core.sh
+++ /dev/null
@@ -1 +0,0 @@
-../scripts_debian/01_install_core.sh
\ No newline at end of file
diff --git a/scripts_qubuntu/02_install_groups.sh b/scripts_qubuntu/02_install_groups.sh
deleted file mode 120000
index e2fdd1f..0000000
--- a/scripts_qubuntu/02_install_groups.sh
+++ /dev/null
@@ -1 +0,0 @@
-../scripts_debian/02_install_groups.sh
\ No newline at end of file
diff --git a/scripts_qubuntu/02_install_groups_post.sh b/scripts_qubuntu/02_install_groups_post.sh
deleted file mode 100755
index c860afd..0000000
--- a/scripts_qubuntu/02_install_groups_post.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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
diff --git a/scripts_qubuntu/02_install_groups_trusty.sh b/scripts_qubuntu/02_install_groups_trusty.sh
deleted file mode 100755
index c4d3d93..0000000
--- a/scripts_qubuntu/02_install_groups_trusty.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/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" <