From 9c21dcbb6bb9831484bc395eb8396acda065d62a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 2 Nov 2016 11:53:30 +0000
Subject: [PATCH] integrate-distro.sh: Add support for config sections [fstab]
 and [pkgs.xxx.all]

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

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 6e18f51b..56e992f5 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -598,6 +598,14 @@ cfg_default()
 	[repos.special]
 	#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
+
+	[fstab]
+	proc                 /proc                proc       defaults              0 0
+	sysfs                /sys                 sysfs      noauto                0 0
+	debugfs              /sys/kernel/debug    debugfs    noauto                0 0
+	usbfs                /proc/bus/usb        usbfs      noauto                0 0
+	devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
+	/usr/share/syslinux  /srv/nfs/boot/pxe/bin auto      bind                  0 0
 	EOT
 }
 
@@ -853,26 +861,21 @@ init_root_password_file()
 	}
 }
 
-make_etc_fstab()
+pkgs()
 {
-	_cat<<EOT
-	|proc                 /proc                proc       defaults              0 0
-	|sysfs                /sys                 sysfs      noauto                0 0
-	|debugfs              /sys/kernel/debug    debugfs    noauto                0 0
-	|usbfs                /proc/bus/usb        usbfs      noauto                0 0
-	|devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
-	|/usr/share/syslinux  /srv/nfs/boot/pxe/bin auto      bind                  0 0
-EOT
-	#|/dev/sda2            /boot                auto       defaults              0 0
+	local flavour="$1"
+	# TODO: add remove, add and other package flavours
+	if have_cfg_file_section "pkgs.$flavour.all"; then
+		cfg_file_section "pkgs.$flavour.all"
+		return 0
+	fi
+	local var="$flavour"_pkgs
+	eval echo \$$var
 }
 
-make_etc_fstab_local_boot()
+make_etc_fstab()
 {
-	_cat<<EOT
-	|$run_dev_swap        swap                 swap       defaults              0 0
-	|$run_dev_root        /                    ext4       acl,user_xattr        1 1
-	|$run_dev_boot        /boot                ext3       acl,user_xattr        1 2
-EOT
+	cfg_section fstab
 }
 
 make_etc_hosts()
@@ -932,12 +935,12 @@ make_netboot_etc_openldap_ldap_conf()
 
 make_netboot_etc_fstab()
 {
-	make_etc_fstab
-	_cat<<EOT
-	|
-	|# netboot client
-	|bootsrv:/var/cores   /var/cores           nfs        rw,rsize=8192,wsize=8192,async   0 0
-EOT
+	make_etc_fstab | grep -v /dev/sd
+	cat<<-EOT
+	
+	# netboot client
+	bootsrv:/var/cores   /var/cores           nfs        rw,rsize=8192,wsize=8192,async   0 0
+	EOT
 }
 
 make_sysconfig_bootloader()
@@ -1267,13 +1270,13 @@ cmd_install()
 	echo "=== refreshing <"
 
 	echo "=== installing payload packages >"
-	run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses $payload_pkgs
+	run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses `pkgs payload`
 	echo "=== installing payload packages <"
 
 	run setup_zypper_repos special
-	run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses $special_pkgs
+	run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses `pkgs special`
 
-	# run_chroot zypper $zypper_global_opts -t srcpackage --download-only $payload_pkgs
+	# run_chroot zypper $zypper_global_opts -t srcpackage --download-only `pkgs payload`
 	#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