From: Felix Fietkau Date: Wed, 22 Nov 2006 23:30:57 +0000 (+0000) Subject: rename default/ to files/ X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=59a06c71cbf7ee5ecb453bbb2e9d4c2df6f194ed;p=openwrt%2Fstaging%2Fnbd.git rename default/ to files/ SVN-Revision: 5622 --- diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 04a63b7494..6285929436 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -94,7 +94,7 @@ define Build/Compile endef define Package/base-files$(TARGET)/install - $(CP) ./default/* $(1)/ + $(CP) ./files/* $(1)/ if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ fi diff --git a/package/base-files/default/bin/ipcalc b/package/base-files/default/bin/ipcalc deleted file mode 100755 index e8efa6b96c..0000000000 --- a/package/base-files/default/bin/ipcalc +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -awk -f /usr/lib/common.awk -f - $* <limit) end=limit - - print "IP="int2ip(ipaddr) - print "NETMASK="int2ip(netmask) - print "BROADCAST="int2ip(broadcast) - print "NETWORK="int2ip(network) - print "PREFIX="32-bitcount(compl(netmask)) - - # range calculations: - # ipcalc - - if (ARGC > 3) { - print "START="int2ip(start) - print "END="int2ip(end-1) - } -} -EOF diff --git a/package/base-files/default/bin/login b/package/base-files/default/bin/login deleted file mode 100755 index ff5d3660e4..0000000000 --- a/package/base-files/default/bin/login +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006 OpenWrt.org - -grep '^root:[^!]' /etc/passwd >&- 2>&- -[ "$?" = "0" -a -z "$FAILSAFE" ] && -{ - echo "Login failed." - exit 0 -} || { -cat << EOF - === IMPORTANT ============================ - Use 'passwd' to set your login password - this will disable telnet and enable SSH - ------------------------------------------ -EOF -} - -exec /bin/ash --login diff --git a/package/base-files/default/bin/uci b/package/base-files/default/bin/uci deleted file mode 100755 index 9b50380df2..0000000000 --- a/package/base-files/default/bin/uci +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh -# Shell script for interacting with config files -# -# Copyright (C) 2006 by Fokus Fraunhofer -# Copyright (C) 2006 by Felix Fietkau -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -. /etc/functions.sh -include /lib/config - -SEP="[^0-9A-Za-z_]" - -do_get() { - local PACKAGE - local CONFIG - local OPTION - local DUMMY - - strtok "$*" PACKAGE . CONFIG . OPTION $SEP DUMMY - - [ $? -ne 3 ] && { - uci_usage get - exit 1 - } - - uci_load "$PACKAGE" - config_get "$CONFIG" "$OPTION" -} - -do_set() { - local PACKAGE - local CONFIG - local OPTION - local VALUE - - strtok "$1" PACKAGE . CONFIG = VALUE - [ $? -ne 3 ] && { - uci_usage set - exit 1 - } - - strtok "$CONFIG" CONFIG . OPTION - - if [ $? -eq 1 ]; then - uci_add "$PACKAGE" "$VALUE" "$CONFIG" - else - uci_set "$PACKAGE" "$CONFIG" "$OPTION" "$VALUE" - fi -} - -do_rename() { - [ $# -ne 3 ] && { - uci_usage rename - exit 1 - } - uci_rename "$@" -} - -do_remove() { - local PACKAGE - local CONFIG - local OPTION - local DUMMY - - strtok "$*" PACKAGE . CONFIG . OPTION $SEP DUMMY - [ $? -ne 3 -a $? -ne 2 ] && { - uci_usage rename - exit 1 - } - uci_remove "$PACKAGE" "$CONFIG" ${OPTION:+"$OPTION"} -} - -do_commit() { - local PACKAGE="$1" - for package in ${PACKAGE:-$(cd /tmp/.uci; ls)}; do - uci_commit "$package" - done -} - -do_show() { - local PACKAGE - local CONFIG - local DUMMY - - strtok "$*" PACKAGE . CONFIG $SEP DUMMY - [ $? -gt 2 ] && { - uci_usage show - exit 1 - } - - for package in ${PACKAGE:-$(cd /etc/config; ls)}; do - SECTION="" - - config_cb() { - if [ -z "$CONFIG" -o "$CONFIG" = "$2" ]; then - append SECTION "$2" - option_cb() { - append "${CONFIG_SECTION}_VARS" "$1" - } - else - option_cb() { - return 0 - } - fi - } - - uci_load "$package" - - for section in $SECTION; do - config_get type "$section" TYPE - [ -z "$type" ] && continue - echo "$package.$section=$type" - eval "VARS=\"\${${section}_VARS}\"" - for var in $VARS; do - config_get val "$section" "$var" - [ -n "$val" ] && { - echo "$package.$section.$var=$val" - config_set "$section" "$var" "" - } - done - config_set "$section" TYPE "" - done - done -} - -uci_usage() { - case "$1" in - show) echo "$0 show [[.]]";; - get) echo "$0 get ..