summaryrefslogtreecommitdiff
path: root/package/base-files
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-25 16:39:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-25 16:41:47 +0200
commit7d713f847f01831fdd19a6d7e205316c545ff96e (patch)
tree1ef77bc3ad26e0fdcffe552e3828ecacca6e13ff /package/base-files
parentc538f5c00bae8a05cc5ee63f592898565546bca8 (diff)
add proxy support
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile9
-rwxr-xr-xpackage/base-files/src/etc/init.d/fs6
-rwxr-xr-xpackage/base-files/src/etc/mdev/fs4
3 files changed, 12 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 73246e9e6..dfff8b2b2 100644
--- a/package/base-files/Makefile
+++ b/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
diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs
index eede212ac..449e44448 100755
--- a/package/base-files/src/etc/init.d/fs
+++ b/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
diff --git a/package/base-files/src/etc/mdev/fs b/package/base-files/src/etc/mdev/fs
index 53339fed5..ebff09211 100755
--- a/package/base-files/src/etc/mdev/fs
+++ b/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"