Browse Source

add proxy support

Waldemar Brodkorb 11 years ago
parent
commit
7d713f847f

+ 7 - 2
package/base-files/Makefile

@@ -5,8 +5,8 @@ include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		99
+PKG_VERSION:=		1.1
+PKG_RELEASE:=		1
 PKG_SECTION:=		base/apps
 PKG_DESCR:=		basic files and scripts
 
@@ -134,6 +134,11 @@ endif
 
 	rm ${IDIR_BASE_FILES}/etc/resolv.conf
 	printf "nameserver ${ADK_SIMPLE_NETWORK_CONFIG_NS}\n" > ${IDIR_BASE_FILES}/etc/resolv.conf
+ifneq (${ADK_SIMPLE_NETWORK_CONFIG_PROXY},)
+	printf "http_proxy=${ADK_SIMPLE_NETWORK_CONFIG_PROXY}\n" >> ${IDIR_BASE_FILES}/etc/profile
+	printf "https_proxy=${ADK_SIMPLE_NETWORK_CONFIG_PROXY}\n" >> ${IDIR_BASE_FILES}/etc/profile
+	printf "ftp_proxy=${ADK_SIMPLE_NETWORK_CONFIG_PROXY}\n" >> ${IDIR_BASE_FILES}/etc/profile
+endif
 endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 3 - 3
package/base-files/src/etc/init.d/fs

@@ -27,13 +27,13 @@ for fs in $fstypes; do
 		grep $fs /proc/filesystems >/dev/null 2>&1
 		if [ $? -eq 0 ];then
 			[ -x /usr/sbin/fsck.$fs ] && {
-				logger -s -t '' "Checking $fs filesystem on $disk"
-				fsck $disk
+				logger -s -t 'Filesystem' "checking $fs filesystem on $disk"
+				fsck -p $disk
 			}
 			logger -t '' "Mounting local filesystems"
 			mount $disk
 		else
-			logger -s -t '' "No $fs filesystem in kernel"
+			logger -s -t 'Filesystem' "No $fs filesystem in kernel"
 		fi
 	done
 done

+ 2 - 2
package/base-files/src/etc/mdev/fs

@@ -37,7 +37,7 @@ adk_check() {
 adk_fsck() {
 	[ -x /usr/sbin/fsck.$fs ] && {
 		logger -t mdev "Checking $fs filesystem on ${MDEV}"
-		fsck ${MDEV}
+		fsck -p ${MDEV}
 	}
 }
 
@@ -49,7 +49,7 @@ adk_mount() {
 		logger -t mdev "Mounting local filesystems"
 		mount $mnt
 		if [ $? -ne 0 ];then
-			logger -s -t '' "Mounting $disk failed"
+			logger -s -t 'Filesystem' "Mounting $disk failed"
 		fi
 	else
 		logger -t mdev "Required filesystem $procfs not available"