Dimitar Zhekov <jimmy@is-vn.bg>

stone_mod_general: change the date/time setting messages a
bit to reflect that we now have utc or localtime.

stone_mod_hardware: change "Kernel Drivers Configuration"
to "Kernel Drivers and Hardware Configuration"; insert a
separator between hwscan settings and clock settings.



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1052 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -4,7 +4,7 @@ whole rxr-tree.
 
 *) 2003-08-14 (2.0.0-camp - 2.0.0-rc1)
 
- - Dimitar Zhekov: fontconfig.pc ownership fix
+ - Dimitar Zhekov: fontconfig.pc ownership fix and sysfiles cosmetics
 
 *) 2003-08-12 (2.0.0-camp - 2.0.0-rc1)
 

package/base/sysfiles/stone_mod_general.sh

@@ -152,13 +152,13 @@ set_tmarea() {
 
 set_dtime() {
 	dtime="`date '+%m-%d %H:%M %Y'`" ; newdtime="$dtime"
-	gui_input "Set new date and time (MM-DD hh:mm YYYY, localtime)" \
+	[ -f /etc/conf/clock ] && . /etc/conf/clock
+	[ "$clock_tz" != localtime ] && clock_tz=utc
+	gui_input "Set new date and time (MM-DD hh:mm YYYY, $clock_tz)" \
 	          "$dtime" "newdtime"
 	if [ "$dtime" != "$newdtime" ] ; then
 		echo "Setting new date and time ($newdtime) ..."
 		date "$( echo $newdtime | sed 's,[^0-9],,g' )"
-		[ -f /etc/conf/clock ] && . /etc/conf/clock
-		[ "$clock_tz" != localtime ] && clock_tz=utc
 		hwclock --systohc --$clock_tz
 	fi
 }
@@ -203,7 +203,7 @@ main() {
 		"Set console keyboard mapping ....... $keymap" "set_keymap" \
 		"Set console screen font ............ $vcfont" "set_vcfont" \
 		"Set system-wide time zone .......... $tz"     "set_tmarea" \
-		"Set date and time (localtime) ...... $dtime"  "set_dtime"  \
+		"Set date and time (utc/localtime) .. $dtime"  "set_dtime"  \
 		"Set system-wide locale (language) .. $locale" "set_locale" \
 		"Set console keyboard repeat rate ... $kbd_rate" "set_kbd_rate" \
 		"Set console keyboard repeat delay .. $kbd_delay" "set_kbd_delay" \

package/base/sysfiles/stone_mod_hardware.sh

@@ -20,7 +20,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 #
-# [MAIN] 20 hardware Kernel Drivers Configuration
+# [MAIN] 20 hardware Kernel Drivers and Hardware Configuration
 
 set_hw_setup() {
     echo "HARDWARE_SETUP=$1" > /etc/conf/hardware
@@ -116,7 +116,7 @@ main() {
 	    . /etc/conf/clock
 	fi
 
-	cmd="gui_menu hw 'Kernel Drivers Configuration'"
+	cmd="gui_menu hw 'Kernel Drivers and Hardware Configuration'"
 	if [ "$HARDWARE_SETUP" = rockplug ]; then
 	    cmd="$cmd \"$hw_rockplug Use ROCKPLUG to configure hardware.\""
 	    cmd="$cmd \"set_hw_setup rockplug\"";
@@ -167,6 +167,7 @@ main() {
 		fi
 	    done < /etc/conf/kernel
 	    [ -z "$id" ] || add_hw_config
+	    cmd="$cmd '' ''"
 	fi	   
 
 	if [ "$clock_tz" = localtime ] ; then