From 2754a9807de9c9c3b1fa09de5bd4388bfdacd060 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Tue, 3 Jul 2012 18:51:05 +0200
Subject: [PATCH] [molecules] re-enable weekly openvz template build

---
 molecules/spinbase-openvz-template.common     |  5 ++--
 scripts/iso_build.sh                          | 12 +++++++-
 .../tar_generic_inner_chroot_script_after.sh  | 30 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/molecules/spinbase-openvz-template.common b/molecules/spinbase-openvz-template.common
index f0c981c..7ebd293 100644
--- a/molecules/spinbase-openvz-template.common
+++ b/molecules/spinbase-openvz-template.common
@@ -59,6 +59,7 @@ packages_to_remove:
 	app-admin/anaconda,
 	app-admin/system-config-date,
 	app-misc/anaconda-runtime,
+	app-misc/sabayonlive-tools,
 	dev-libs/newt,
 	dev-util/pykickstart,
 	net-misc/networkmanager,
@@ -70,8 +71,8 @@ packages_to_remove:
 	sys-fs/xfsprogs,
 	sys-fs/jfsutils,
 	sys-fs/mdadm,
-	sys-libs/slang
-	
+	sys-libs/slang,
+	sys-kernel/linux-sabayon
 
 # Custom shell call to packages removal (default is: equo remove)
 # custom_packages_remove_cmd:
diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh
index 440637c..5d68d75 100755
--- a/scripts/iso_build.sh
+++ b/scripts/iso_build.sh
@@ -65,6 +65,14 @@ if [ "${ACTION}" = "weekly" ]; then
                 "Sabayon_Linux_DAILY_amd64_ForensicsXfce.iso"
                 "Sabayon_Linux_DAILY_x86_ForensicsXfce.iso"
 	)
+	REMASTER_OPENVZ_SPECS=(
+		"sabayon-x86-spinbase-openvz-template.spec"
+		"sabayon-amd64-spinbase-openvz-template.spec"
+	)
+	REMASTER_OPENVZ_SPECS_TAR=(
+		"Sabayon_Linux_SpinBase_DAILY_x86_openvz.tar.gz"
+		"Sabayon_Linux_SpinBase_DAILY_amd64_openvz.tar.gz"
+	)
 elif [ "${ACTION}" = "daily" ]; then
 	ARM_SOURCE_SPECS=()
 	ARM_SOURCE_SPECS_IMG=()
@@ -110,6 +118,8 @@ elif [ "${ACTION}" = "daily" ]; then
 		"Sabayon_Linux_ServerBase_DAILY_amd64.iso"
 		"Sabayon_Linux_ServerBase_DAILY_x86.iso"
 	)
+	REMASTER_OPENVZ_SPECS=()
+	REMASTER_OPENVZ_SPECS_TAR=()
 fi
 
 [[ -d "/sabayon/molecules/daily" ]] || mkdir -p /sabayon/molecules/daily
@@ -204,7 +214,7 @@ build_sabayon() {
 			sed -i "s/tar_name.*/tar_name: ${REMASTER_OPENVZ_SPECS_TAR[i]}/" "${dst}" || return 1
 			# tweak release version
 			sed -i "s/release_version.*/release_version: ${CUR_DATE}/" "${dst}" || return 1
-			echo "${dst}: iso: ${REMASTER_OPENVZ_SPECS_TAR[i]} date: ${CUR_DATE}"
+			echo "${dst}: tar: ${REMASTER_OPENVZ_SPECS_TAR[i]} date: ${CUR_DATE}"
 			remaster_specs+="${dst} "
 		done
 
diff --git a/scripts/tar_generic_inner_chroot_script_after.sh b/scripts/tar_generic_inner_chroot_script_after.sh
index 7593d7d..05e2d00 100755
--- a/scripts/tar_generic_inner_chroot_script_after.sh
+++ b/scripts/tar_generic_inner_chroot_script_after.sh
@@ -1,7 +1,35 @@
-#!/bin/bash
+#!/bin/sh
 
 /usr/sbin/env-update && source /etc/profile
 
+# remove sabayonuser
+userdel sabayonuser
+
+DROP_SERVICES="
+	avahi-daemon
+	fbcondecor
+	fsck
+	hotplug
+	hwclock
+	installer-gui
+	installer-text
+	keymaps
+	lvm
+	mdadm
+	netmount
+	NetworkManager
+	sabayonlive
+	swap
+	swapfiles
+	termencoding
+	x-setup
+"
+
+for serv in ${DROP_SERVICES}; do
+	rc-update del ${serv} default
+	rc-update del ${serv} boot
+done
+
 # Generate list of installed packages
 equo query list installed -qv > /etc/sabayon-pkglist