From bdb8a65f2fc72ab1bc4d96073858824502a0b331 Mon Sep 17 00:00:00 2001
From: Lars Müller
Date: Sat, 16 Dec 2006 19:43:27 +0000
Subject: 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
---
 installer/slxossetup                               | 19 ++++---------
 installer/systems/README                           |  9 ++----
 installer/systems/opensuse102/BASE_FILE_etc__group | 33 ----------------------
 .../systems/opensuse102/BASE_FILE_etc__passwd      | 14 ---------
 .../systems/opensuse102/BASE_FILE_etc__shadow      | 14 ---------
 .../systems/opensuse102/prereqfiles/etc/group      | 33 ++++++++++++++++++++++
 .../systems/opensuse102/prereqfiles/etc/passwd     | 14 +++++++++
 .../systems/opensuse102/prereqfiles/etc/shadow     | 14 +++++++++
 installer/systems/opensuse102/scripts/postprereq   |  5 ++++
 installer/systems/suse100/BASE_FILE_etc__group     | 33 ----------------------
 installer/systems/suse100/BASE_FILE_etc__passwd    | 14 ---------
 installer/systems/suse100/BASE_FILE_etc__shadow    | 14 ---------
 installer/systems/suse100/prereqfiles/etc/group    | 33 ++++++++++++++++++++++
 installer/systems/suse100/prereqfiles/etc/passwd   | 14 +++++++++
 installer/systems/suse100/prereqfiles/etc/shadow   | 14 +++++++++
 installer/systems/suse100/scripts/postprereq       |  5 ++++
 installer/systems/suse101/BASE_FILE_etc__group     | 33 ----------------------
 installer/systems/suse101/BASE_FILE_etc__passwd    | 14 ---------
 installer/systems/suse101/BASE_FILE_etc__shadow    | 14 ---------
 installer/systems/suse101/prereqfiles/etc/group    | 33 ++++++++++++++++++++++
 installer/systems/suse101/prereqfiles/etc/passwd   | 14 +++++++++
 installer/systems/suse101/prereqfiles/etc/shadow   | 14 +++++++++
 installer/systems/suse101/scripts/postprereq       |  5 ++++
 installer/systems/suse93/BASE_FILE_etc__group      | 31 --------------------
 installer/systems/suse93/BASE_FILE_etc__passwd     | 12 --------
 installer/systems/suse93/BASE_FILE_etc__shadow     | 12 --------
 installer/systems/suse93/prereqfiles/etc/group     | 31 ++++++++++++++++++++
 installer/systems/suse93/prereqfiles/etc/passwd    | 12 ++++++++
 installer/systems/suse93/prereqfiles/etc/shadow    | 12 ++++++++
 installer/systems/suse93/scripts/postprereq        |  5 ++++
 30 files changed, 266 insertions(+), 258 deletions(-)
 delete mode 100644 installer/systems/opensuse102/BASE_FILE_etc__group
 delete mode 100644 installer/systems/opensuse102/BASE_FILE_etc__passwd
 delete mode 100644 installer/systems/opensuse102/BASE_FILE_etc__shadow
 create mode 100644 installer/systems/opensuse102/prereqfiles/etc/group
 create mode 100644 installer/systems/opensuse102/prereqfiles/etc/passwd
 create mode 100644 installer/systems/opensuse102/prereqfiles/etc/shadow
 create mode 100755 installer/systems/opensuse102/scripts/postprereq
 delete mode 100644 installer/systems/suse100/BASE_FILE_etc__group
 delete mode 100644 installer/systems/suse100/BASE_FILE_etc__passwd
 delete mode 100644 installer/systems/suse100/BASE_FILE_etc__shadow
 create mode 100644 installer/systems/suse100/prereqfiles/etc/group
 create mode 100644 installer/systems/suse100/prereqfiles/etc/passwd
 create mode 100644 installer/systems/suse100/prereqfiles/etc/shadow
 create mode 100755 installer/systems/suse100/scripts/postprereq
 delete mode 100644 installer/systems/suse101/BASE_FILE_etc__group
 delete mode 100644 installer/systems/suse101/BASE_FILE_etc__passwd
 delete mode 100644 installer/systems/suse101/BASE_FILE_etc__shadow
 create mode 100644 installer/systems/suse101/prereqfiles/etc/group
 create mode 100644 installer/systems/suse101/prereqfiles/etc/passwd
 create mode 100644 installer/systems/suse101/prereqfiles/etc/shadow
 create mode 100755 installer/systems/suse101/scripts/postprereq
 delete mode 100644 installer/systems/suse93/BASE_FILE_etc__group
 delete mode 100644 installer/systems/suse93/BASE_FILE_etc__passwd
 delete mode 100644 installer/systems/suse93/BASE_FILE_etc__shadow
 create mode 100644 installer/systems/suse93/prereqfiles/etc/group
 create mode 100644 installer/systems/suse93/prereqfiles/etc/passwd
 create mode 100644 installer/systems/suse93/prereqfiles/etc/shadow
 create mode 100755 installer/systems/suse93/scripts/postprereq

(limited to 'installer')

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/BASE_FILE_etc__group
deleted file mode 100644
index 505cb221..00000000
--- a/installer/systems/opensuse102/BASE_FILE_etc__group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/installer/systems/opensuse102/BASE_FILE_etc__passwd b/installer/systems/opensuse102/BASE_FILE_etc__passwd
deleted file mode 100644
index 9b8fc4fe..00000000
--- a/installer/systems/opensuse102/BASE_FILE_etc__passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/installer/systems/opensuse102/BASE_FILE_etc__shadow b/installer/systems/opensuse102/BASE_FILE_etc__shadow
deleted file mode 100644
index cd100a5a..00000000
--- a/installer/systems/opensuse102/BASE_FILE_etc__shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13481::::::
-bin:*:13481::::::
-daemon:*:13481::::::
-lp:*:13481::::::
-mail:*:13481::::::
-news:*:13481::::::
-uucp:*:13481::::::
-games:*:13481::::::
-man:*:13481::::::
-wwwrun:*:13481::::::
-ftp:*:13481::::::
-nobody:*:13481::::::
-messagebus:!:13481:0::7:::
-haldaemon:!:13481:0::7:::
diff --git a/installer/systems/opensuse102/prereqfiles/etc/group b/installer/systems/opensuse102/prereqfiles/etc/group
new file mode 100644
index 00000000..505cb221
--- /dev/null
+++ b/installer/systems/opensuse102/prereqfiles/etc/group
@@ -0,0 +1,33 @@
+root:x:0:
+bin:x:1:daemon
+daemon:x:2:
+sys:x:3:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+www:x:8:
+kmem:x:9:
+wheel:x:10:
+mail:x:12:
+news:x:13:
+uucp:x:14:
+shadow:x:15:
+dialout:x:16:
+audio:x:17:
+floppy:x:19:
+cdrom:x:20:
+console:x:21:
+utmp:x:22:
+public:x:32:
+video:x:33:
+games:x:40:
+xok:x:41:
+trusted:x:42:
+modem:x:43:
+ftp:x:49:
+man:x:62:
+users:x:100:
+nobody:x:65533:
+nogroup:x:65534:nobody
+messagebus:!:101:
+haldaemon:!:102:
diff --git a/installer/systems/opensuse102/prereqfiles/etc/passwd b/installer/systems/opensuse102/prereqfiles/etc/passwd
new file mode 100644
index 00000000..9b8fc4fe
--- /dev/null
+++ b/installer/systems/opensuse102/prereqfiles/etc/passwd
@@ -0,0 +1,14 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/bin/bash
+daemon:x:2:2:Daemon:/sbin:/bin/bash
+lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
+mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
+news:x:9:13:News system:/etc/news:/bin/bash
+uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
+games:x:12:100:Games account:/var/games:/bin/bash
+man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
+wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
+ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
+nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
+messagebus:x:100:101:User for D-Bus:/var/run/dbus:/bin/false
+haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/installer/systems/opensuse102/prereqfiles/etc/shadow b/installer/systems/opensuse102/prereqfiles/etc/shadow
new file mode 100644
index 00000000..cd100a5a
--- /dev/null
+++ b/installer/systems/opensuse102/prereqfiles/etc/shadow
@@ -0,0 +1,14 @@
+root::13481::::::
+bin:*:13481::::::
+daemon:*:13481::::::
+lp:*:13481::::::
+mail:*:13481::::::
+news:*:13481::::::
+uucp:*:13481::::::
+games:*:13481::::::
+man:*:13481::::::
+wwwrun:*:13481::::::
+ftp:*:13481::::::
+nobody:*:13481::::::
+messagebus:!:13481:0::7:::
+haldaemon:!:13481:0::7:::
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/BASE_FILE_etc__group
deleted file mode 100644
index 505cb221..00000000
--- a/installer/systems/suse100/BASE_FILE_etc__group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/installer/systems/suse100/BASE_FILE_etc__passwd b/installer/systems/suse100/BASE_FILE_etc__passwd
deleted file mode 100644
index 395a7aaa..00000000
--- a/installer/systems/suse100/BASE_FILE_etc__passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/installer/systems/suse100/BASE_FILE_etc__shadow b/installer/systems/suse100/BASE_FILE_etc__shadow
deleted file mode 100644
index 995b47ff..00000000
--- a/installer/systems/suse100/BASE_FILE_etc__shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13040::::::
-bin:*:13040::::::
-daemon:*:13040::::::
-lp:*:13040::::::
-mail:*:13040::::::
-news:*:13040::::::
-uucp:*:13040::::::
-games:*:13040::::::
-man:*:13040::::::
-wwwrun:*:13040::::::
-ftp:*:13040::::::
-nobody:*:13040::::::
-messagebus:!:13040:0::7:::
-haldaemon:!:13040:0::7:::
diff --git a/installer/systems/suse100/prereqfiles/etc/group b/installer/systems/suse100/prereqfiles/etc/group
new file mode 100644
index 00000000..505cb221
--- /dev/null
+++ b/installer/systems/suse100/prereqfiles/etc/group
@@ -0,0 +1,33 @@
+root:x:0:
+bin:x:1:daemon
+daemon:x:2:
+sys:x:3:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+www:x:8:
+kmem:x:9:
+wheel:x:10:
+mail:x:12:
+news:x:13:
+uucp:x:14:
+shadow:x:15:
+dialout:x:16:
+audio:x:17:
+floppy:x:19:
+cdrom:x:20:
+console:x:21:
+utmp:x:22:
+public:x:32:
+video:x:33:
+games:x:40:
+xok:x:41:
+trusted:x:42:
+modem:x:43:
+ftp:x:49:
+man:x:62:
+users:x:100:
+nobody:x:65533:
+nogroup:x:65534:nobody
+messagebus:!:101:
+haldaemon:!:102:
diff --git a/installer/systems/suse100/prereqfiles/etc/passwd b/installer/systems/suse100/prereqfiles/etc/passwd
new file mode 100644
index 00000000..395a7aaa
--- /dev/null
+++ b/installer/systems/suse100/prereqfiles/etc/passwd
@@ -0,0 +1,14 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/bin/bash
+daemon:x:2:2:Daemon:/sbin:/bin/bash
+lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
+mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
+news:x:9:13:News system:/etc/news:/bin/bash
+uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
+games:x:12:100:Games account:/var/games:/bin/bash
+man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
+wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
+ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
+nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
+messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false
+haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/installer/systems/suse100/prereqfiles/etc/shadow b/installer/systems/suse100/prereqfiles/etc/shadow
new file mode 100644
index 00000000..995b47ff
--- /dev/null
+++ b/installer/systems/suse100/prereqfiles/etc/shadow
@@ -0,0 +1,14 @@
+root::13040::::::
+bin:*:13040::::::
+daemon:*:13040::::::
+lp:*:13040::::::
+mail:*:13040::::::
+news:*:13040::::::
+uucp:*:13040::::::
+games:*:13040::::::
+man:*:13040::::::
+wwwrun:*:13040::::::
+ftp:*:13040::::::
+nobody:*:13040::::::
+messagebus:!:13040:0::7:::
+haldaemon:!:13040:0::7:::
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/BASE_FILE_etc__group
deleted file mode 100644
index 505cb221..00000000
--- a/installer/systems/suse101/BASE_FILE_etc__group
+++ /dev/null
@@ -1,33 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
-messagebus:!:101:
-haldaemon:!:102:
diff --git a/installer/systems/suse101/BASE_FILE_etc__passwd b/installer/systems/suse101/BASE_FILE_etc__passwd
deleted file mode 100644
index 395a7aaa..00000000
--- a/installer/systems/suse101/BASE_FILE_etc__passwd
+++ /dev/null
@@ -1,14 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
-messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false
-haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/installer/systems/suse101/BASE_FILE_etc__shadow b/installer/systems/suse101/BASE_FILE_etc__shadow
deleted file mode 100644
index bde18120..00000000
--- a/installer/systems/suse101/BASE_FILE_etc__shadow
+++ /dev/null
@@ -1,14 +0,0 @@
-root::13419::::::
-bin:*:13419::::::
-daemon:*:13419::::::
-lp:*:13419::::::
-mail:*:13419::::::
-news:*:13419::::::
-uucp:*:13419::::::
-games:*:13419::::::
-man:*:13419::::::
-wwwrun:*:13419::::::
-ftp:*:13419::::::
-nobody:*:13419::::::
-messagebus:!:13419:0::7:::
-haldaemon:!:13419:0::7:::
diff --git a/installer/systems/suse101/prereqfiles/etc/group b/installer/systems/suse101/prereqfiles/etc/group
new file mode 100644
index 00000000..505cb221
--- /dev/null
+++ b/installer/systems/suse101/prereqfiles/etc/group
@@ -0,0 +1,33 @@
+root:x:0:
+bin:x:1:daemon
+daemon:x:2:
+sys:x:3:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+www:x:8:
+kmem:x:9:
+wheel:x:10:
+mail:x:12:
+news:x:13:
+uucp:x:14:
+shadow:x:15:
+dialout:x:16:
+audio:x:17:
+floppy:x:19:
+cdrom:x:20:
+console:x:21:
+utmp:x:22:
+public:x:32:
+video:x:33:
+games:x:40:
+xok:x:41:
+trusted:x:42:
+modem:x:43:
+ftp:x:49:
+man:x:62:
+users:x:100:
+nobody:x:65533:
+nogroup:x:65534:nobody
+messagebus:!:101:
+haldaemon:!:102:
diff --git a/installer/systems/suse101/prereqfiles/etc/passwd b/installer/systems/suse101/prereqfiles/etc/passwd
new file mode 100644
index 00000000..395a7aaa
--- /dev/null
+++ b/installer/systems/suse101/prereqfiles/etc/passwd
@@ -0,0 +1,14 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/bin/bash
+daemon:x:2:2:Daemon:/sbin:/bin/bash
+lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
+mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
+news:x:9:13:News system:/etc/news:/bin/bash
+uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
+games:x:12:100:Games account:/var/games:/bin/bash
+man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
+wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
+ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
+nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
+messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false
+haldaemon:x:101:102:User for haldaemon:/var/run/hal:/bin/false
diff --git a/installer/systems/suse101/prereqfiles/etc/shadow b/installer/systems/suse101/prereqfiles/etc/shadow
new file mode 100644
index 00000000..bde18120
--- /dev/null
+++ b/installer/systems/suse101/prereqfiles/etc/shadow
@@ -0,0 +1,14 @@
+root::13419::::::
+bin:*:13419::::::
+daemon:*:13419::::::
+lp:*:13419::::::
+mail:*:13419::::::
+news:*:13419::::::
+uucp:*:13419::::::
+games:*:13419::::::
+man:*:13419::::::
+wwwrun:*:13419::::::
+ftp:*:13419::::::
+nobody:*:13419::::::
+messagebus:!:13419:0::7:::
+haldaemon:!:13419:0::7:::
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/BASE_FILE_etc__group
deleted file mode 100644
index 452ad53a..00000000
--- a/installer/systems/suse93/BASE_FILE_etc__group
+++ /dev/null
@@ -1,31 +0,0 @@
-root:x:0:
-bin:x:1:daemon
-daemon:x:2:
-sys:x:3:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-www:x:8:
-kmem:x:9:
-wheel:x:10:
-mail:x:12:
-news:x:13:
-uucp:x:14:
-shadow:x:15:
-dialout:x:16:
-audio:x:17:
-floppy:x:19:
-cdrom:x:20:
-console:x:21:
-utmp:x:22:
-public:x:32:
-video:x:33:
-games:x:40:
-xok:x:41:
-trusted:x:42:
-modem:x:43:
-ftp:x:49:
-man:x:62:
-users:x:100:
-nobody:x:65533:
-nogroup:x:65534:nobody
diff --git a/installer/systems/suse93/BASE_FILE_etc__passwd b/installer/systems/suse93/BASE_FILE_etc__passwd
deleted file mode 100644
index 15e2efdd..00000000
--- a/installer/systems/suse93/BASE_FILE_etc__passwd
+++ /dev/null
@@ -1,12 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/bin/bash
-daemon:x:2:2:Daemon:/sbin:/bin/bash
-lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
-mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
-news:x:9:13:News system:/etc/news:/bin/bash
-uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
-games:x:12:100:Games account:/var/games:/bin/bash
-man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
-wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
-ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
-nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
diff --git a/installer/systems/suse93/BASE_FILE_etc__shadow b/installer/systems/suse93/BASE_FILE_etc__shadow
deleted file mode 100644
index 0669bae5..00000000
--- a/installer/systems/suse93/BASE_FILE_etc__shadow
+++ /dev/null
@@ -1,12 +0,0 @@
-root::9473:0:::::
-bin:*:8902:0:::::
-daemon:*:8902:0:::::
-lp:*:8902:0:::::
-mail:*:8902:0:::::
-news:*:8902:0:::::
-uucp:*:8902:0:::::
-games:*:8902:0:::::
-man:*:8902:0:::::
-wwwrun:*:8902:0:::::
-ftp:*:8902:0:::::
-nobody:*:8902:0:::::
diff --git a/installer/systems/suse93/prereqfiles/etc/group b/installer/systems/suse93/prereqfiles/etc/group
new file mode 100644
index 00000000..452ad53a
--- /dev/null
+++ b/installer/systems/suse93/prereqfiles/etc/group
@@ -0,0 +1,31 @@
+root:x:0:
+bin:x:1:daemon
+daemon:x:2:
+sys:x:3:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+www:x:8:
+kmem:x:9:
+wheel:x:10:
+mail:x:12:
+news:x:13:
+uucp:x:14:
+shadow:x:15:
+dialout:x:16:
+audio:x:17:
+floppy:x:19:
+cdrom:x:20:
+console:x:21:
+utmp:x:22:
+public:x:32:
+video:x:33:
+games:x:40:
+xok:x:41:
+trusted:x:42:
+modem:x:43:
+ftp:x:49:
+man:x:62:
+users:x:100:
+nobody:x:65533:
+nogroup:x:65534:nobody
diff --git a/installer/systems/suse93/prereqfiles/etc/passwd b/installer/systems/suse93/prereqfiles/etc/passwd
new file mode 100644
index 00000000..15e2efdd
--- /dev/null
+++ b/installer/systems/suse93/prereqfiles/etc/passwd
@@ -0,0 +1,12 @@
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/bin/bash
+daemon:x:2:2:Daemon:/sbin:/bin/bash
+lp:x:4:7:Printing daemon:/var/spool/lpd:/bin/bash
+mail:x:8:12:Mailer daemon:/var/spool/clientmqueue:/bin/false
+news:x:9:13:News system:/etc/news:/bin/bash
+uucp:x:10:14:Unix-to-Unix CoPy system:/etc/uucp:/bin/bash
+games:x:12:100:Games account:/var/games:/bin/bash
+man:x:13:62:Manual pages viewer:/var/cache/man:/bin/bash
+wwwrun:x:30:8:WWW daemon apache:/var/lib/wwwrun:/bin/false
+ftp:x:40:49:FTP account:/srv/ftp:/bin/bash
+nobody:x:65534:65533:nobody:/var/lib/nobody:/bin/bash
diff --git a/installer/systems/suse93/prereqfiles/etc/shadow b/installer/systems/suse93/prereqfiles/etc/shadow
new file mode 100644
index 00000000..0669bae5
--- /dev/null
+++ b/installer/systems/suse93/prereqfiles/etc/shadow
@@ -0,0 +1,12 @@
+root::9473:0:::::
+bin:*:8902:0:::::
+daemon:*:8902:0:::::
+lp:*:8902:0:::::
+mail:*:8902:0:::::
+news:*:8902:0:::::
+uucp:*:8902:0:::::
+games:*:8902:0:::::
+man:*:8902:0:::::
+wwwrun:*:8902:0:::::
+ftp:*:8902:0:::::
+nobody:*:8902:0:::::
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}
-- 
cgit v1.2.3-55-g7522