i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved /etc/post_install to /boot/common/boot and the fresh_install marker

Browse Source 
file to /boot/common/settings. Repackaged OpenSSH accordingly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25335 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-05-06 22:47:38 +00:00
parent 7c8ddc9795
commit 46f2d5ea88
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+6 -3
View File
@@ -338,11 +338,14 @@ SEARCH on $(networkSettingsFiles)
AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ; AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ;
# post install scripts and fresh install indicator file # 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) ; postInstallFiles = $(postInstallFiles:G=post-install) ;
SEARCH on $(postInstallFiles) SEARCH on $(postInstallFiles)
= [ FDirName $(HAIKU_TOP) data etc post_install ] ; = [ FDirName $(HAIKU_TOP) data common boot post_install ] ;
AddFilesToHaikuImage beos etc post_install : $(postInstallFiles) ; 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 # boot loader
AddFilesToHaikuImage beos system : zbeos ; AddFilesToHaikuImage beos system : zbeos ;
build/jam/OptionalPackages
+2 -2
View File
@@ -167,8 +167,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
Echo "No optional package OpenSSH available for gcc4" ; Echo "No optional package OpenSSH available for gcc4" ;
} else { } else {
local baseURL = http://haiku-files.org/files/optional-packages ; local baseURL = http://haiku-files.org/files/optional-packages ;
InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04 InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04-1
: $(baseURL)/openssh-5.0p1-gcc2-2008-05-04.zip : $(baseURL)/openssh-5.0p1-gcc2-2008-05-04-1.zip
: :
; ;
data/etc/post_install/mime_update.sh → data/common/boot/post_install/mime_update.sh
View File
data/etc/post_install/fresh_install → data/common/settings/fresh_install
View File
data/system/boot/Bootscript
+2 -2
View File
@@ -139,8 +139,8 @@ if [ "$SAFEMODE" != "yes" ]; then
fi fi
# Check for fresh install and run post install scripts. # Check for fresh install and run post install scripts.
postInstallDir=/boot/beos/etc/post_install postInstallDir=/boot/common/boot/post_install
freshInstallIndicator=$postInstallDir/fresh_install freshInstallIndicator=/boot/common/settings/fresh_install
if [ -e $freshInstallIndicator ]; then if [ -e $freshInstallIndicator ]; then
# wait a moment for things to calm down a bit # wait a moment for things to calm down a bit
sleep 3 sleep 3