From cfeaca6fff28f5f213867db436b9e7c67359f917 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sat, 17 Sep 2016 15:34:39 +0000
Subject: [PATCH] integrate-distro.sh: Now runs through with suse-tumbleweed

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/integrate-distro.sh | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index a96bc19e..292fbbb4 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -17,6 +17,9 @@ kernel_flavour=
 
 case $suse_version in
 11.4)
+	services="
+		ldap
+	"
 	base_pkgs="
 		sysvinit
 	"
@@ -74,6 +77,9 @@ case $suse_version in
 	#rpm_kernel_version=3.2.0-1
 	;;
 12.2)
+	services="
+		ldap
+	"
 	base_pkgs="
 		sysvinit
 	"
@@ -91,6 +97,9 @@ case $suse_version in
 	rpm_kernel_version=3.7.8~jng11-1
 	;;
 12.3)
+	services="
+		ldap
+	"
 	base_pkgs="
 		module-init-tools
 		sysvinit
@@ -157,6 +166,9 @@ case $suse_version in
 	rpm_kernel_version=3.9.9~jng20-1.2
 	;;
 13.1)
+	services="
+		ldap
+	"
 	base_pkgs="
 		aaa_base
 		module-init-tools
@@ -219,6 +231,9 @@ case $suse_version in
 	rpm_kernel_version=3.12.7-jux+
 	;;
 tumbleweed)
+	services="
+		slapd
+	"
 	base_pkgs="
 		aaa_base
 		module-init-tools
@@ -235,7 +250,7 @@ tumbleweed)
 		acpid
 	"
 	special_pkgs="
-		jux-run-1.2.2-119p02
+		jux-run
 		jux-client-run
 		feedfsd-run
 		feedfs-local-run
@@ -694,7 +709,7 @@ EOT
 zypper_repos_special()
 {
 	_cat << EOT | grep -v "^ *#"
-	|jengelh          0 ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version
+	|#jengelh          0 ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version
 	|videolan         0 ftp://ftp/pub/mirror/videolan/pub/videolan/vlc/SuSE/$suse_version
 EOT
 }
@@ -1082,25 +1097,21 @@ setup_root_directory()
 
 insserv_all()
 {
-	local services="
+	local local_services="
 		boot.juxearly
 		boot.bprof
 		sshd
-		ldap
 		jux
-	"
-	services="
-		sshd
-		ldap
+		$services
 	"
 
 	case $suse_version in
 	11.4)	
-		run_chroot /sbin/insserv -de $services
+		run_chroot /sbin/insserv -de $local_services
 		;;
 	*)
 		local s
-		for s in $services; do
+		for s in $local_services; do
 			run_chroot systemctl enable $s.service
 		done
 		;;
@@ -1162,6 +1173,9 @@ cmd_install()
 	# run_chroot zypper $zypper_global_opts -t srcpackage --download-only $payload_pkgs
 	#kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'`
 
+	# TODO: should be done by package manager post install script
+	run_chroot /opt/ytools/bin/jcs init
+
 	make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf
 
 	run_chroot mkdir -p -m 700 /root/.ssh