[Astlinux-commits] SF.net SVN: astlinux: [205] trunk/package/vsftpd

[<kr...@us...>]

Revision: 205
Author:   krisk84
Date:     2006-08-09 06:46:38 -0700 (Wed, 09 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=205&view=rev

Log Message:
-----------
fixes from lonnie - TZ_TIMEZONE vsftpd fixes 1534869

Modified Paths:
--------------
    trunk/package/vsftpd/vsftpd.init
    trunk/target/generic/target_skeleton/etc/rc
    trunk/target/generic/target_skeleton/stat/etc/rc.conf
Modified: trunk/package/vsftpd/vsftpd.init
===================================================================
--- trunk/package/vsftpd/vsftpd.init	2006-08-08 07:32:27 UTC (rev 204)
+++ trunk/package/vsftpd/vsftpd.init	2006-08-09 13:46:38 UTC (rev 205)
@@ -47,10 +47,10 @@
 FTPDOPTIONS="$FTPDOPTIONS"
 else
 FTPDOPTIONS="/etc/vsftpd.conf"
+fi
 echo "Starting vsftpd..."
 vsftpd "$FTPDOPTIONS"
 fi
-fi
 }
 
 stop () {

Modified: trunk/target/generic/target_skeleton/etc/rc
===================================================================
--- trunk/target/generic/target_skeleton/etc/rc	2006-08-08 07:32:27 UTC (rev 204)
+++ trunk/target/generic/target_skeleton/etc/rc	2006-08-09 13:46:38 UTC (rev 205)
@@ -238,7 +238,7 @@
 
 if [ -f /mnt/kd/rc.conf ]
 then
-cp -a /mnt/kd/rc.conf /tmp/etc/rc.conf
+ln -sf /mnt/kd/rc.conf /tmp/etc/rc.conf
 else
 cp -a /stat/etc/rc.conf /tmp/etc/rc.conf
 fi
@@ -258,7 +258,11 @@
 if [ -d /tmp/etc/rc.conf.d ]
 then
 cat /tmp/etc/rc.conf.d/*.conf >> /tmp/etc/rc.conf 2> /dev/null
+if [ -f /mnt/kd/rc.conf ]
+then
+echo "WARNING: You are using rc.conf.d and /mnt/kd/rc.conf\!"
 fi
+fi
 
 if [ "$ASTIMG" ]
 then
@@ -279,11 +283,7 @@
 fi
 fi
 
-if [ "$TIMEZONE" ]
-then
-echo "$TIMEZONE" > /tmp/etc/TZ
-fi
-
+#uclibc style TZ support
 if [ -f /stat/etc/TZ ]
 then
 cp /stat/etc/TZ /tmp/etc/TZ
@@ -294,6 +294,27 @@
 cp /mnt/kd/TZ /tmp/etc/TZ
 fi
 
+if [ "$TZ_TIMEZONE" ]
+then
+echo "$TZ_TIMEZONE" > /tmp/etc/TZ
+fi
+
+# glibc/zoneinfo style TZ support
+if [ -f /stat/etc/localtime ]
+then
+ln -sf /stat/etc/localtime /tmp/etc/localtime
+fi
+
+if [ -f /mnt/kd/localtime ]
+then
+ln -sf /mnt/kd/localtime /tmp/etc/localtime
+fi
+
+if [ "$TIMEZONE" -a -d /usr/share/zoneinfo ]
+then
+ln -sf /usr/share/zoneinfo/$TIMEZONE /tmp/etc/localtime
+fi
+
 if [ -d /mnt/kd/wanpipe ]
 then
 ln -s /mnt/kd/wanpipe /tmp/etc/wanpipe

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2006-08-08 07:32:27 UTC (rev 204)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2006-08-09 13:46:38 UTC (rev 205)
@@ -16,12 +16,15 @@
 HOSTNAME=pbx
 
 ##Timezone
-##You need ast-opt for the additional timezones.
-##If you define this variable, AstLinux will copy this file from
-##/mnt/opt/zoneinfo/$TIMEZONE to /tmp/etc/localtime on startup
+##If you define this variable, AstLinux will link this file from
+##/usr/share/zoneinfo/$TIMEZONE to /tmp/etc/localtime on startup
 ##GMT (UTC) is the default
 #TIMEZONE=America/Chicago
 
+##uClibc Timezone
+##See http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
+#TZ_TIMEZONE=CST6CDT
+
 ###Interfaces
 
 ##VLANS


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.