From 1dbafcc9bcdf6947b442231babb3a32a4899b32d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 22 Nov 2009 14:49:54 +0100 Subject: [PATCH] busybox: - add various needed applets - add pam support - various cleanups - remove init script for setup time - readd init script to start network --- packages/sysutils/busybox/build | 1 + packages/sysutils/busybox/conf.d/shell | 3 +- packages/sysutils/busybox/config/busybox.conf | 88 +++++++++---------- packages/sysutils/busybox/init.d/02_time | 16 ---- packages/sysutils/busybox/init.d/20_network | 14 +++ packages/sysutils/busybox/install | 13 +-- packages/sysutils/busybox/scripts/init | 5 +- 7 files changed, 71 insertions(+), 69 deletions(-) delete mode 100755 packages/sysutils/busybox/init.d/02_time create mode 100755 packages/sysutils/busybox/init.d/20_network diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox/build index 727a426117..1815d2b910 100755 --- a/packages/sysutils/busybox/build +++ b/packages/sysutils/busybox/build @@ -4,6 +4,7 @@ $SCRIPTS/build toolchain $SCRIPTS/unpack busybox +$SCRIPTS/build Linux-PAM PKG_DIR=`find $PACKAGES -type d -name $1` diff --git a/packages/sysutils/busybox/conf.d/shell b/packages/sysutils/busybox/conf.d/shell index 406e05af31..ccf4f9d880 100644 --- a/packages/sysutils/busybox/conf.d/shell +++ b/packages/sysutils/busybox/conf.d/shell @@ -8,5 +8,4 @@ #------------------------------------------------------------------------------- # Prompt environment variables. #------------------------------------------------------------------------------- -#PS1='\u@\h:\w \$ ' -PS1="\[\033[1;31m\][\$(date +%H%M)][\u@\h:\w]$ " +PS1='\u@\h:\w \$ ' diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index c7be4b5429..ff63b21a1e 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.15.2 -# Sun Nov 15 02:47:44 2009 +# Sat Nov 21 17:32:41 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -163,7 +163,7 @@ CONFIG_DF=y CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set -# CONFIG_DU is not set +CONFIG_DU=y # CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y @@ -173,11 +173,11 @@ CONFIG_FEATURE_ENV_LONG_OPTIONS=y # CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set # CONFIG_EXPR is not set # CONFIG_EXPR_MATH_SUPPORT_64 is not set -CONFIG_FALSE=y +# CONFIG_FALSE is not set # CONFIG_FOLD is not set # CONFIG_FSYNC is not set -# CONFIG_HEAD is not set -# CONFIG_FEATURE_FANCY_HEAD is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set # CONFIG_ID is not set CONFIG_INSTALL=y @@ -204,8 +204,8 @@ CONFIG_FEATURE_MV_LONG_OPTIONS=y # CONFIG_NICE is not set # CONFIG_NOHUP is not set # CONFIG_OD is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set +CONFIG_PRINTENV=y +CONFIG_PRINTF=y # CONFIG_PWD is not set # CONFIG_READLINK is not set # CONFIG_FEATURE_READLINK_FOLLOW is not set @@ -220,8 +220,8 @@ CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y -# CONFIG_SORT is not set -# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -232,15 +232,15 @@ CONFIG_SYNC=y # CONFIG_TAC is not set CONFIG_TAIL=y # CONFIG_FEATURE_FANCY_TAIL is not set -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y +# CONFIG_TRUE is not set # CONFIG_TTY is not set CONFIG_UNAME=y # CONFIG_UNEXPAND is not set @@ -249,8 +249,8 @@ CONFIG_UNAME=y # CONFIG_USLEEP is not set # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set -# CONFIG_WC is not set -# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y # CONFIG_WHO is not set # CONFIG_WHOAMI is not set # CONFIG_YES is not set @@ -299,13 +299,13 @@ CONFIG_DEFAULT_SETFONT_DIR="" # # CONFIG_MKTEMP is not set # CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set +CONFIG_RUN_PARTS=y # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set # CONFIG_FEATURE_RUN_PARTS_FANCY is not set # CONFIG_START_STOP_DAEMON is not set # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set +CONFIG_WHICH=y # # Editors @@ -338,37 +338,37 @@ CONFIG_FEATURE_ALLOW_EXEC=y # # Finding Utilities # -# CONFIG_FIND is not set +CONFIG_FIND=y # CONFIG_FEATURE_FIND_PRINT0 is not set # CONFIG_FEATURE_FIND_MTIME is not set # CONFIG_FEATURE_FIND_MMIN is not set # CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set +CONFIG_FEATURE_FIND_TYPE=y # CONFIG_FEATURE_FIND_XDEV is not set # CONFIG_FEATURE_FIND_MAXDEPTH is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set +CONFIG_FEATURE_FIND_EXEC=y # CONFIG_FEATURE_FIND_USER is not set # CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set +CONFIG_FEATURE_FIND_NOT=y # CONFIG_FEATURE_FIND_DEPTH is not set # CONFIG_FEATURE_FIND_PAREN is not set # CONFIG_FEATURE_FIND_SIZE is not set # CONFIG_FEATURE_FIND_PRUNE is not set # CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set +CONFIG_FEATURE_FIND_PATH=y # CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y # CONFIG_FEATURE_GREP_FGREP_ALIAS is not set CONFIG_FEATURE_GREP_CONTEXT=y -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities @@ -410,17 +410,17 @@ CONFIG_LAST_SYSTEM_ID=0 CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_LOGIN=y -# CONFIG_PAM is not set +CONFIG_PAM=y CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set # CONFIG_CRYPTPW is not set # CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set @@ -506,7 +506,7 @@ CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set +CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_VOLUMEID=y CONFIG_FEATURE_VOLUMEID_EXT=y @@ -533,7 +533,7 @@ CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set # CONFIG_RDEV is not set @@ -673,12 +673,12 @@ CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y # CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set @@ -689,10 +689,10 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y # CONFIG_FEATURE_IP_TUNNEL is not set # CONFIG_FEATURE_IP_RULE is not set # CONFIG_FEATURE_IP_SHORT_FORMS is not set @@ -747,7 +747,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y diff --git a/packages/sysutils/busybox/init.d/02_time b/packages/sysutils/busybox/init.d/02_time deleted file mode 100755 index 71d7ce2601..0000000000 --- a/packages/sysutils/busybox/init.d/02_time +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# set time -# -# runlevels: openelec, text, debug - -. /etc/sysconfig - -progress "saving Starttime" - -ADJTIME=/etc/adjtime - -if [ -x /sbin/hwclock ]; then - [ -r ${ADJTIME} ] && ! ( grep -q "LOCAL" ${ADJTIME} || grep -q "UTC" ${ADJTIME} ) && echo "UTC" >>${ADJTIME} - /sbin/hwclock --hctosys -f /dev/rtc0 & -fi diff --git a/packages/sysutils/busybox/init.d/20_network b/packages/sysutils/busybox/init.d/20_network new file mode 100755 index 0000000000..69d815e36c --- /dev/null +++ b/packages/sysutils/busybox/init.d/20_network @@ -0,0 +1,14 @@ +#!/bin/sh +# +# start Networking +# +# runlevels: openelec, text, debug + +. /etc/sysconfig + +progress "Starting Networking" + + ifup -a + udhcpc & + +exit 0 diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 3f0e00dc61..e9243745ef 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -3,16 +3,17 @@ . config/options $SCRIPTS/build busybox-hosttools +$SCRIPTS/install Linux-PAM PKG_DIR=`find $PACKAGES -type d -name $1` -ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/mkpasswd $ROOT_PASSWORD`" +ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $ROOT_PASSWORD`" add_user root "$ROOT_PWD" 0 0 "Root User" "/storage" "/bin/sh" add_group root 0 cp -PR $BUILD/busybox*/_install-system/* $INSTALL - chmod 4755 $INSTALL/bin/busybox + echo "chmod 4755 $INSTALL/bin/busybox" >> $ROOT/.fakeroot mkdir -p $INSTALL/bin ln -sf /bin/sh $INSTALL/bin/bash @@ -22,7 +23,7 @@ ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/mkpasswd $ROOT_PASSWORD`" mkdir -p $INSTALL/etc cp $PKG_DIR/config/sysconfig $INSTALL/etc - ln -s /storage/.config/fstab $INSTALL/etc/fstab + ln -sf /storage/.config/fstab $INSTALL/etc/fstab echo $GREATING0 > $INSTALL/etc/issue echo $GREATING1 >> $INSTALL/etc/issue @@ -41,9 +42,9 @@ ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/mkpasswd $ROOT_PASSWORD`" cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080 mkdir -p $INSTALL/usr/config -# cp $PKG_DIR/config/interfaces $INSTALL/usr/config + cp $PKG_DIR/config/interfaces $INSTALL/usr/config touch $INSTALL/usr/config/resolv.conf mkdir -p $INSTALL/etc/network -# ln -s /storage/.config/interfaces $INSTALL/etc/network/interfaces - ln -s /storage/.config/resolv.conf $INSTALL/etc/resolv.conf + ln -sf /storage/.config/interfaces $INSTALL/etc/network/interfaces + ln -sf /storage/.config/resolv.conf $INSTALL/etc/resolv.conf diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index e7a4d12d80..a512c2e15d 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -18,7 +18,10 @@ install -m 755 -d /var/media install -m 1777 -d /var/run install -m 1777 -d /var/tmp -# install -m 700 -d /var/lib/polkit-1 + install -m 700 -d /var/lib/polkit-1 # for polkit + install -m 755 -d /var/run/sepermit # for LinuxPAM + install -m 700 -d /var/lib/DeviceKit-disks # for DeviceKit-disks + install -m 700 -d /var/run/DeviceKit-disks # for DeviceKit-disks # starting Xorg start_xorg