[RELEASE] init-scripts-0.3.21v0.3.21

5 files changed, 33 insertions, 3 deletions

diff --git a/.flxfiles b/.flxfiles
index 8f84274..cdaf5f9 100644
--- a/.flxfiles
+++ b/.flxfiles
@@ -15,6 +15,7 @@ sbin/init.d/sysprofiles
 sbin/init.d/system
 sbin/init.d/thttpd
 sbin/init.d/pdnsd
+sbin/init.d/portmap
 sbin/init.d/logrotate
 sbin/init.d/lpd
 sbin/init.d/inetd
diff --git a/ChangeLog b/ChangeLog
index ab169d9..24211af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003/08/11
+- script system: hwclock accède désormais au bus ISA par défaut
+- ajout de "rtc_mode" au script system pour forcer le passage par
+  le kernel
+- ajout temporaire de portmap
+- appel de set_vars dans functions
+- release 0.3.21
 2003/07/22
 - hwclock implémenté dans script system et supprimé de NTP
 - correction de l'autonégociation dans network
diff --git a/sbin/init.d/functions b/sbin/init.d/functions
index d93695c..f3b59a0 100755
--- a/sbin/init.d/functions
+++ b/sbin/init.d/functions
@@ -663,6 +663,7 @@ function default_service {
 	    esac
 	done
 
+	declare -F set_vars > /dev/null && set_vars
 	# force a last eval on each reserved option so that they can refer to
 	# each other.
 	for i in bin pidfile procname cmdline; do eval eval "$i=\\\"\$$i\\\""; done
diff --git a/sbin/init.d/portmap b/sbin/init.d/portmap
new file mode 100755
index 0000000..beb5110
--- /dev/null
+++ b/sbin/init.d/portmap
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+. `dirname $0`/functions
+
+option	bin		reserved_option	/usr/sbin/portmap
+
+function fct_pre_start {
+   # portmap dies if >1024 fds are available !
+   ulimit -n 1024
+}
+
+load_config
+
diff --git a/sbin/init.d/system b/sbin/init.d/system
index f18aa42..fac0bc3 100755
--- a/sbin/init.d/system
+++ b/sbin/init.d/system
@@ -6,12 +6,14 @@ option	hostname	standard_option
 option	modprobe 	multiple_option
 option	sysctl		multiple_option
 option	file_max	standard_option
-option	rtc		standard_option	"local"
+option	rtc		standard_option	"local"		# "local", "utc", "disabled"
+option	rtc_mode	standard_option	"direct"	# "direct", "kernel"
 
 function do_start {
     local svcname=$1
     local instname=$2
     local arg
+    local rtc_opt=""
 
     arg=0
     while [ $arg -lt ${#opt_modprobe[*]} ]; do
@@ -29,15 +31,21 @@ function do_start {
 	echo ${opt_hostname#*.} >/proc/sys/kernel/domainname
     fi
 
+    # this is necessary because some PCs (eg: siemens) hang otherwise.
+    if [ "$opt_rtc_mode" = "direct" ]; then
+	rtc_opt="$rtc_opt --directisa"
+    fi
+
     if [ "$opt_rtc" = "utc" ]; then
 	echo -n "Setting system time from hardware clock (UTC)... "
-	hwclock --hctosys --utc
+	hwclock --hctosys --utc $rtc_opt
 	echo "Done."
     elif [ "$opt_rtc" = "local" ]; then
 	echo -n "Setting system time from hardware clock (Local time)... "
-	hwclock --hctosys --localtime
+	hwclock --hctosys --localtime $rtc_opt
 	echo "Done."
     fi
+
     for arg in ${opt_sysctl[*]}; do
 	local sysctl value
 	sysctl=${arg%%=*}