From 46f2d5ea887ddb5df5e409113e840ebbb8790de0 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 6 May 2008 22:47:38 +0000
Subject: [PATCH] Moved /etc/post_install to /boot/common/boot and the
 fresh_install marker file to /boot/common/settings. Repackaged OpenSSH
 accordingly.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25335 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/HaikuImage                                     | 9 ++++++---
 build/jam/OptionalPackages                               | 4 ++--
 data/{etc => common/boot}/post_install/mime_update.sh    | 0
 data/{etc/post_install => common/settings}/fresh_install | 0
 data/system/boot/Bootscript                              | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename data/{etc => common/boot}/post_install/mime_update.sh (100%)
 rename data/{etc/post_install => common/settings}/fresh_install (100%)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 67ae75a2ed..b90593aef2 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -338,11 +338,14 @@ SEARCH on $(networkSettingsFiles)
 AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
 
 # post install scripts and fresh install indicator file
-local postInstallFiles = fresh_install mime_update.sh ;
+local postInstallFiles = mime_update.sh ;
 postInstallFiles = $(postInstallFiles:G=post-install) ;
 SEARCH on $(postInstallFiles)
-	= [ FDirName $(HAIKU_TOP) data etc post_install ] ;
-AddFilesToHaikuImage beos etc post_install : $(postInstallFiles) ;
+	= [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
+SEARCH on <post-install>fresh_install
+	= [ FDirName $(HAIKU_TOP) data common settings ] ;
+AddFilesToHaikuImage common boot post_install : $(postInstallFiles) ;
+AddFilesToHaikuImage common settings : <post-install>fresh_install ;
 
 # boot loader
 AddFilesToHaikuImage beos system : zbeos ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 49f722859a..80a306b0e8 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -167,8 +167,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
 		Echo "No optional package OpenSSH available for gcc4" ;
 	} else {
 		local baseURL = http://haiku-files.org/files/optional-packages ;
-		InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04
-			: $(baseURL)/openssh-5.0p1-gcc2-2008-05-04.zip
+		InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04-1
+			: $(baseURL)/openssh-5.0p1-gcc2-2008-05-04-1.zip
 			:
 		;
 
diff --git a/data/etc/post_install/mime_update.sh b/data/common/boot/post_install/mime_update.sh
similarity index 100%
rename from data/etc/post_install/mime_update.sh
rename to data/common/boot/post_install/mime_update.sh
diff --git a/data/etc/post_install/fresh_install b/data/common/settings/fresh_install
similarity index 100%
rename from data/etc/post_install/fresh_install
rename to data/common/settings/fresh_install
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 085ca6d7f7..24d88dc1f0 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -139,8 +139,8 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Check for fresh install and run post install scripts.
-postInstallDir=/boot/beos/etc/post_install
-freshInstallIndicator=$postInstallDir/fresh_install
+postInstallDir=/boot/common/boot/post_install
+freshInstallIndicator=/boot/common/settings/fresh_install
 if [ -e $freshInstallIndicator ]; then
 	# wait a moment for things to calm down a bit
 	sleep 3