From f02862eb0383b7afe4e99e393fb1ad15ae58905a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 13 May 2010 14:27:39 +0000 Subject: [PATCH] Moved the installation of ProcessController, NetworkStatus and the volume control icon into a new post_install script. Tested in QEMU and the items are persistent also for the volume control. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36805 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 2 +- data/common/boot/post_install/default_deskbar_items.sh | 6 ++++++ data/system/boot/Bootscript | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100755 data/common/boot/post_install/default_deskbar_items.sh diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 676d18c919..dd3bf4c28b 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -482,7 +482,7 @@ SEARCH on $(networkSettingsFiles) AddFilesToHaikuImage common settings network : $(networkSettingsFiles) ; # post install scripts and fresh install indicator file -local postInstallFiles = mime_update.sh ; +local postInstallFiles = mime_update.sh default_deskbar_items.sh ; postInstallFiles = $(postInstallFiles:G=post-install) ; SEARCH on $(postInstallFiles) = [ FDirName $(HAIKU_TOP) data common boot post_install ] ; diff --git a/data/common/boot/post_install/default_deskbar_items.sh b/data/common/boot/post_install/default_deskbar_items.sh new file mode 100755 index 0000000000..bc1cbfd360 --- /dev/null +++ b/data/common/boot/post_install/default_deskbar_items.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# install ProcessController, NetworkStatus & volume control in the Deskbar +/boot/system/apps/ProcessController -deskbar +/boot/system/apps/NetworkStatus --deskbar +/boot/system/bin/desklink --add-volume diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index 89d1b97642..a09d158749 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -137,11 +137,6 @@ else launch system/Tracker launch system/Deskbar - - # install ProcessController, NetworkStatus & volume control in the Deskbar - (sleep 7; /boot/system/apps/ProcessController -deskbar; \ - NetworkStatus --deskbar; \ - /bin/desklink --add-volume) & fi if [ "$SAFEMODE" != "yes" ]; then