Use a prereqfiles sub directory instead of the BASE_FILE_ hack.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@556 95ad53e4-c205-0410-b2fa-d234c58c8868

18 files changed, 28 insertions, 20 deletions

diff --git a/installer/slxossetup b/installer/slxossetup
index 35c68623..e6505eda 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -131,19 +131,12 @@ function slxossetup_rpm()
 		popd >/dev/null
 	fi
 
-	# Install base system files
-	for file in ${SLX_SYSTEM_CONFIG_PATH}/BASE_FILE_*; do
-		# We might not have any BASE_FILE_* at all.
-		test -f "${file}" || continue
-		suffix="${file#${SLX_SYSTEM_CONFIG_PATH}/BASE_FILE_}"
-		dest_path=${suffix%__*}
-		dest_path="${dest_path//__//}"
-		dest_file="${suffix//__//}"
-		test -d "${SLX_STAGE1_PATH}/${dest_path}" || \
-			mkdir "${SLX_STAGE1_PATH}/${dest_path}"
-		cp -p "${file}" "${SLX_STAGE1_PATH}/${dest_file}"
-		chown root: "${SLX_STAGE1_PATH}/${dest_file}"
-	done
+	# Install prerequired files
+	cp -a "${SLX_SYSTEM_CONFIG_PATH}"/prereqfiles/* "${SLX_STAGE1_PATH}"
+	find "${SLX_STAGE1_PATH}" -type d -name .svn -print0 | \
+		xargs -0 rm -rf
+	test -x "${SLX_SYSTEM_CONFIG_PATH}"/scripts/postprereq && \
+		"${SLX_SYSTEM_CONFIG_PATH}"/scripts/postprereq "${SLX_STAGE1_PATH}"
 
 	for file in ${SLX_INSTALL_FAKE_FILE}; do
 		dir="${file%/*}"
diff --git a/installer/systems/README b/installer/systems/README
index ae3a7a63..6a1c4ed0 100644
--- a/installer/systems/README
+++ b/installer/systems/README
@@ -1,10 +1,5 @@
 In this sub directory of /etc/opt/openslx/ we store the configuration files
 for operating systems installed with slxossetup.
 
-Any file named BASE_FILE_* is installed into the destination directory before
-any package install action takes place.
-
-Therfore the suffix of BASE_FILE has the destination path encoded in the
-filename.  Any __ is replaced by a single /.  Therfore BASE_FILE_etc__passwd
-for example will be copied to the destination, stage1 directory,
-/var/opt/openslx/stage1/<system-name>/etc/passwd
+Any file from the prereqfiles sub directory is copied into the stage1 diectory
+before any install action takes place.
diff --git a/installer/systems/opensuse102/BASE_FILE_etc__group b/installer/systems/opensuse102/prereqfiles/etc/group
index 505cb221..505cb221 100644
--- a/installer/systems/opensuse102/BASE_FILE_etc__group
+++ b/installer/systems/opensuse102/prereqfiles/etc/group
diff --git a/installer/systems/opensuse102/BASE_FILE_etc__passwd b/installer/systems/opensuse102/prereqfiles/etc/passwd
index 9b8fc4fe..9b8fc4fe 100644
--- a/installer/systems/opensuse102/BASE_FILE_etc__passwd
+++ b/installer/systems/opensuse102/prereqfiles/etc/passwd
diff --git a/installer/systems/opensuse102/BASE_FILE_etc__shadow b/installer/systems/opensuse102/prereqfiles/etc/shadow
index cd100a5a..cd100a5a 100644
--- a/installer/systems/opensuse102/BASE_FILE_etc__shadow
+++ b/installer/systems/opensuse102/prereqfiles/etc/shadow
diff --git a/installer/systems/opensuse102/scripts/postprereq b/installer/systems/opensuse102/scripts/postprereq
new file mode 100755
index 00000000..b141d4b0
--- /dev/null
+++ b/installer/systems/opensuse102/scripts/postprereq
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+SLX_STAGE1_PATH=$1
+
+chown root: ${SLX_STAGE1_PATH}/etc/{group,passwd,shadow}
diff --git a/installer/systems/suse100/BASE_FILE_etc__group b/installer/systems/suse100/prereqfiles/etc/group
index 505cb221..505cb221 100644
--- a/installer/systems/suse100/BASE_FILE_etc__group
+++ b/installer/systems/suse100/prereqfiles/etc/group
diff --git a/installer/systems/suse100/BASE_FILE_etc__passwd b/installer/systems/suse100/prereqfiles/etc/passwd
index 395a7aaa..395a7aaa 100644
--- a/installer/systems/suse100/BASE_FILE_etc__passwd
+++ b/installer/systems/suse100/prereqfiles/etc/passwd
diff --git a/installer/systems/suse100/BASE_FILE_etc__shadow b/installer/systems/suse100/prereqfiles/etc/shadow
index 995b47ff..995b47ff 100644
--- a/installer/systems/suse100/BASE_FILE_etc__shadow
+++ b/installer/systems/suse100/prereqfiles/etc/shadow
diff --git a/installer/systems/suse100/scripts/postprereq b/installer/systems/suse100/scripts/postprereq
new file mode 100755
index 00000000..b141d4b0
--- /dev/null
+++ b/installer/systems/suse100/scripts/postprereq
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+SLX_STAGE1_PATH=$1
+
+chown root: ${SLX_STAGE1_PATH}/etc/{group,passwd,shadow}
diff --git a/installer/systems/suse101/BASE_FILE_etc__group b/installer/systems/suse101/prereqfiles/etc/group
index 505cb221..505cb221 100644
--- a/installer/systems/suse101/BASE_FILE_etc__group
+++ b/installer/systems/suse101/prereqfiles/etc/group
diff --git a/installer/systems/suse101/BASE_FILE_etc__passwd b/installer/systems/suse101/prereqfiles/etc/passwd
index 395a7aaa..395a7aaa 100644
--- a/installer/systems/suse101/BASE_FILE_etc__passwd
+++ b/installer/systems/suse101/prereqfiles/etc/passwd
diff --git a/installer/systems/suse101/BASE_FILE_etc__shadow b/installer/systems/suse101/prereqfiles/etc/shadow
index bde18120..bde18120 100644
--- a/installer/systems/suse101/BASE_FILE_etc__shadow
+++ b/installer/systems/suse101/prereqfiles/etc/shadow
diff --git a/installer/systems/suse101/scripts/postprereq b/installer/systems/suse101/scripts/postprereq
new file mode 100755
index 00000000..b141d4b0
--- /dev/null
+++ b/installer/systems/suse101/scripts/postprereq
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+SLX_STAGE1_PATH=$1
+
+chown root: ${SLX_STAGE1_PATH}/etc/{group,passwd,shadow}
diff --git a/installer/systems/suse93/BASE_FILE_etc__group b/installer/systems/suse93/prereqfiles/etc/group
index 452ad53a..452ad53a 100644
--- a/installer/systems/suse93/BASE_FILE_etc__group
+++ b/installer/systems/suse93/prereqfiles/etc/group
diff --git a/installer/systems/suse93/BASE_FILE_etc__passwd b/installer/systems/suse93/prereqfiles/etc/passwd
index 15e2efdd..15e2efdd 100644
--- a/installer/systems/suse93/BASE_FILE_etc__passwd
+++ b/installer/systems/suse93/prereqfiles/etc/passwd
diff --git a/installer/systems/suse93/BASE_FILE_etc__shadow b/installer/systems/suse93/prereqfiles/etc/shadow
index 0669bae5..0669bae5 100644
--- a/installer/systems/suse93/BASE_FILE_etc__shadow
+++ b/installer/systems/suse93/prereqfiles/etc/shadow
diff --git a/installer/systems/suse93/scripts/postprereq b/installer/systems/suse93/scripts/postprereq
new file mode 100755
index 00000000..b141d4b0
--- /dev/null
+++ b/installer/systems/suse93/scripts/postprereq
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+SLX_STAGE1_PATH=$1
+
+chown root: ${SLX_STAGE1_PATH}/etc/{group,passwd,shadow}