14446 slim_cd construction needs to move vp-sysmon.desktop autostart aside
authorMatt Keenan <matt.keenan@sun.com>
Tue, 09 Feb 2010 16:10:25 +0000
changeset 721 ce5ad86e8aed
parent 719 79c3fdbda756
child 723 4c9eb65ee7b6
14446 slim_cd construction needs to move vp-sysmon.desktop autostart aside 11511 Error reported about missing gnome-keyring-daemon-wrapper.desktop file when constructing the liveCD
usr/src/cmd/distro_const/slim_cd/slimcd_pre_boot_archive_pkg_image_mod
--- a/usr/src/cmd/distro_const/slim_cd/slimcd_pre_boot_archive_pkg_image_mod	Tue Feb 09 08:32:57 2010 -0700
+++ b/usr/src/cmd/distro_const/slim_cd/slimcd_pre_boot_archive_pkg_image_mod	Tue Feb 09 16:10:25 2010 +0000
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -94,7 +94,7 @@
 # Path under which to save original files for restoration by ICT module
 SAVE_PATH=${PKG_IMG_PATH}/save
 
-# Remove gnome-power-manager, gnome-keyring and updatemanagernotifier
+# Remove gnome-power-manager, vp-sysmon and updatemanagernotifier
 # from the liveCD and restore after installation
 $MKDIR -p ${SAVE_PATH}/usr/share/dbus-1/services
 $MKDIR -p ${SAVE_PATH}/usr/share/gnome/autostart
@@ -108,9 +108,9 @@
 $CP -p ${PKG_IMG_PATH}/usr/share/gnome/autostart/gnome-power-manager.desktop \
     ${SAVE_PATH}/usr/share/gnome/autostart
 $RM ${PKG_IMG_PATH}/usr/share/gnome/autostart/gnome-power-manager.desktop
-$CP -p ${PKG_IMG_PATH}/usr/share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop \
+$CP -p ${PKG_IMG_PATH}/usr/share/gnome/autostart/vp-sysmon.desktop \
     ${SAVE_PATH}/usr/share/gnome/autostart
-$RM ${PKG_IMG_PATH}/usr/share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop
+$RM ${PKG_IMG_PATH}/usr/share/gnome/autostart/vp-sysmon.desktop
 
 # Reconfigure panel to:
 # - remove Gnome netstatus-applet