Ver código fonte

Updated Busybox configuration and removed (Busybox: #4784) workaround

Maxim Kammerer 12 anos atrás
pai
commit
3c178d8e80
2 arquivos alterados com 24 adições e 24 exclusões
  1. 24 18
      src/etc/portage/savedconfig/sys-apps/busybox
  2. 0 6
      src/root/initrd/init

+ 24 - 18
src/etc/portage/savedconfig/sys-apps/busybox

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.20.2
-# Wed Aug 22 04:25:54 2012
+# Busybox version: 1.21.0
+# Sun Sep 22 01:51:08 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -41,7 +41,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=0
 # CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
-CONFIG_FEATURE_PIDFILE=y
+# CONFIG_FEATURE_PIDFILE is not set
+CONFIG_PID_FILE_PATH=""
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
@@ -96,8 +97,9 @@ CONFIG_PREFIX="./_install"
 # CONFIG_FEATURE_RTMINMAX is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_FAST_TOP=y
-CONFIG_FEATURE_ETC_NETWORKS=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
@@ -125,11 +127,11 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 #
 # Archival Utilities
 #
-CONFIG_FEATURE_SEAMLESS_XZ=y
-CONFIG_FEATURE_SEAMLESS_LZMA=y
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-CONFIG_FEATURE_SEAMLESS_Z=y
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
+# CONFIG_FEATURE_SEAMLESS_LZMA is not set
+# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
+# CONFIG_FEATURE_SEAMLESS_GZ is not set
+# CONFIG_FEATURE_SEAMLESS_Z is not set
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 # CONFIG_FEATURE_AR_CREATE is not set
@@ -263,6 +265,7 @@ CONFIG_SEQ=y
 # CONFIG_SHA1SUM is not set
 CONFIG_SHA256SUM=y
 # CONFIG_SHA512SUM is not set
+# CONFIG_SHA3SUM is not set
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
 #
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
@@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_READONLY=y
 # CONFIG_FEATURE_VI_SET is not set
 # CONFIG_FEATURE_VI_WIN_RESIZE is not set
 # CONFIG_FEATURE_VI_ASK_TERMINAL is not set
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 # CONFIG_AWK is not set
 # CONFIG_FEATURE_AWK_LIBM is not set
 CONFIG_CMP=y
@@ -609,9 +611,11 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
 # CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NILFS is not set
 # CONFIG_FEATURE_VOLUMEID_NTFS is not set
 # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 # CONFIG_FEATURE_VOLUMEID_UDF is not set
@@ -619,6 +623,7 @@ CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
@@ -887,6 +892,13 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_PSTREE is not set
 # CONFIG_PWDX is not set
 # CONFIG_SMEMCAP is not set
+# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
+# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_UPTIME is not set
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
@@ -907,13 +919,6 @@ CONFIG_FEATURE_PS_LONG=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 # CONFIG_RENICE is not set
 CONFIG_BB_SYSCTL=y
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
 CONFIG_FEATURE_SHOW_THREADS=y
 # CONFIG_WATCH is not set
 
@@ -1008,6 +1013,7 @@ CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+# CONFIG_FEATURE_KMSG_SYSLOG is not set
 # CONFIG_KLOGD is not set
 # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 # CONFIG_LOGGER is not set

+ 0 - 6
src/root/initrd/init

@@ -194,8 +194,6 @@ if [ "${param_loop}" != / ]; then
     # Let 'notoram' override 'toram' enforcement for CDs
     [ -z "${param_notoram}" ] || param_toram=
 
-    # If copying squashfs image to RAM, force read-only losetup
-    # (BusyBox does not do that automatically (Busybox: #4784), fixed in git: 2012-06-21)
     if [ -n "${param_toram}" ]; then
         good_msg 'Copying filesystem image to RAM ...'
         rootimgram=${srwroot}/cache/root.sfs
@@ -203,8 +201,6 @@ if [ "${param_loop}" != / ]; then
         mkdir -m 700  ${srwroot}/cache
         cp "${rootimg}" ${rootimgram} || rm ${rootimgram}
         rootimg=${rootimgram}
-
-        mount -o remount,ro ${srwroot}
     fi
 
     verifyroot "${rootimg}"
@@ -215,8 +211,6 @@ if [ "${param_loop}" != / ]; then
     mount -r -t squashfs -o loop,${fs_flags_squashfs} "${rootimg}" ${slive}
     test_success 'mount compressed filesystem'
 
-    [ -z "${param_toram}" ] || mount -o remount,rw ${srwroot}
-
     # Move boot mountpoint under live
     mount -o move ${sboot} ${mboot}
 else