1.1 --- a/README.txt Wed Jul 13 00:43:11 2011 +0200
1.2 +++ b/README.txt Mon Jul 18 01:00:41 2011 +0200
1.3 @@ -294,3 +294,23 @@
1.4 set up as described above:
1.5
1.6 uml-do 512M --net
1.7 +
1.8 +Issues with Shared Memory
1.9 +-------------------------
1.10 +
1.11 +It is possible for User Mode Linux to just crash having exhausted the host
1.12 +system's shared memory. This can be worked around by remounting tmpfs with
1.13 +more space. For example:
1.14 +
1.15 +sudo mount -t tmpfs tmpfs /dev/shm -o remount,size=805306368
1.16 +
1.17 +This allocates 768MB (the figure is given in bytes) to tmpfs.
1.18 +
1.19 +One bug related to User Mode Linux and Debian exists:
1.20 +
1.21 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=388128
1.22 +
1.23 +And this Debian installer bug may be related to experiences with pbuilder and
1.24 +other package installation activities:
1.25 +
1.26 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=239758
2.1 --- a/uml-linux-build Wed Jul 13 00:43:11 2011 +0200
2.2 +++ b/uml-linux-build Mon Jul 18 01:00:41 2011 +0200
2.3 @@ -15,6 +15,10 @@
2.4 exit 1
2.5 fi
2.6
2.7 +if [ "$1" = '--root' ]; then
2.8 + AS_USER="sudo"
2.9 +fi
2.10 +
2.11 THISDIR=`dirname "$0"`
2.12
2.13 if [ ! -e linux ]; then
2.14 @@ -56,15 +60,15 @@
2.15 echo "Building..." 1>&2
2.16 make ARCH=um
2.17
2.18 - # Mount the root filesystem and install the modules.
2.19 - echo "Making the modules..." 1>&2
2.20 - make modules ARCH=um
2.21 + echo "Making the modules..." 1>&2
2.22 + make modules ARCH=um
2.23
2.24 - echo "Installing the modules..." 1>&2
2.25 - make modules_install INSTALL_MOD_PATH="$PACKAGEROOT" ARCH=um
2.26 cd ..
2.27 fi
2.28
2.29 +echo "Installing the modules..." 1>&2
2.30 +"$THISDIR/uml-access-image" "$AS_USER" make -C "$LINUXDIRNAME" modules_install INSTALL_MOD_PATH="$IMAGEDIR" ARCH=um
2.31 +
2.32 # Now get the executable and remove the build directory.
2.33 if [ ! -e linux ]; then
2.34 mv "$LINUXDIRNAME/linux" .
3.1 --- a/uml-linux-build.config Wed Jul 13 00:43:11 2011 +0200
3.2 +++ b/uml-linux-build.config Mon Jul 18 01:00:41 2011 +0200
3.3 @@ -1,10 +1,9 @@
3.4 #
3.5 # Automatically generated make config: don't edit
3.6 -# Linux kernel version: 2.6.24.3
3.7 -# Sat Mar 15 21:01:57 2008
3.8 +# Linux Kernel Configuration
3.9 +# Thu Jul 14 00:15:33 2011
3.10 #
3.11 CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
3.12 -CONFIG_GENERIC_HARDIRQS=y
3.13 CONFIG_UML=y
3.14 CONFIG_MMU=y
3.15 CONFIG_NO_IOMEM=y
3.16 @@ -13,101 +12,102 @@
3.17 # CONFIG_STACKTRACE_SUPPORT is not set
3.18 CONFIG_GENERIC_CALIBRATE_DELAY=y
3.19 CONFIG_GENERIC_BUG=y
3.20 -CONFIG_GENERIC_TIME=y
3.21 CONFIG_GENERIC_CLOCKEVENTS=y
3.22 CONFIG_IRQ_RELEASE_METHOD=y
3.23 +CONFIG_HZ=100
3.24
3.25 #
3.26 # UML-specific options
3.27 #
3.28 -# CONFIG_STATIC_LINK is not set
3.29
3.30 #
3.31 # Host processor type and features
3.32 #
3.33 -# CONFIG_M386 is not set
3.34 +# CONFIG_CMPXCHG_LOCAL is not set
3.35 # CONFIG_M486 is not set
3.36 # CONFIG_M586 is not set
3.37 # CONFIG_M586TSC is not set
3.38 # CONFIG_M586MMX is not set
3.39 -CONFIG_M686=y
3.40 +# CONFIG_M686 is not set
3.41 # CONFIG_MPENTIUMII is not set
3.42 # CONFIG_MPENTIUMIII is not set
3.43 # CONFIG_MPENTIUMM is not set
3.44 -# CONFIG_MPENTIUM4 is not set
3.45 +CONFIG_MPENTIUM4=y
3.46 # CONFIG_MK6 is not set
3.47 # CONFIG_MK7 is not set
3.48 # CONFIG_MK8 is not set
3.49 # CONFIG_MCRUSOE is not set
3.50 # CONFIG_MEFFICEON is not set
3.51 # CONFIG_MWINCHIPC6 is not set
3.52 -# CONFIG_MWINCHIP2 is not set
3.53 # CONFIG_MWINCHIP3D is not set
3.54 # CONFIG_MGEODEGX1 is not set
3.55 # CONFIG_MGEODE_LX is not set
3.56 # CONFIG_MCYRIXIII is not set
3.57 # CONFIG_MVIAC3_2 is not set
3.58 # CONFIG_MVIAC7 is not set
3.59 -# CONFIG_MPSC is not set
3.60 # CONFIG_MCORE2 is not set
3.61 -# CONFIG_GENERIC_CPU is not set
3.62 +# CONFIG_MATOM is not set
3.63 # CONFIG_X86_GENERIC is not set
3.64 +CONFIG_X86_INTERNODE_CACHE_SHIFT=7
3.65 CONFIG_X86_CMPXCHG=y
3.66 -CONFIG_X86_L1_CACHE_SHIFT=5
3.67 +CONFIG_X86_L1_CACHE_SHIFT=7
3.68 CONFIG_X86_XADD=y
3.69 -CONFIG_X86_PPRO_FENCE=y
3.70 CONFIG_X86_WP_WORKS_OK=y
3.71 CONFIG_X86_INVLPG=y
3.72 CONFIG_X86_BSWAP=y
3.73 CONFIG_X86_POPAD_OK=y
3.74 -CONFIG_X86_GOOD_APIC=y
3.75 +CONFIG_X86_INTEL_USERCOPY=y
3.76 CONFIG_X86_USE_PPRO_CHECKSUM=y
3.77 CONFIG_X86_TSC=y
3.78 +CONFIG_X86_CMPXCHG64=y
3.79 CONFIG_X86_CMOV=y
3.80 -CONFIG_X86_MINIMUM_CPU_FAMILY=4
3.81 +CONFIG_X86_MINIMUM_CPU_FAMILY=5
3.82 +CONFIG_CPU_SUP_INTEL=y
3.83 +CONFIG_CPU_SUP_CYRIX_32=y
3.84 +CONFIG_CPU_SUP_AMD=y
3.85 +CONFIG_CPU_SUP_CENTAUR=y
3.86 +CONFIG_CPU_SUP_TRANSMETA_32=y
3.87 +CONFIG_CPU_SUP_UMC_32=y
3.88 CONFIG_UML_X86=y
3.89 -CONFIG_X86_32=y
3.90 -CONFIG_RWSEM_XCHGADD_ALGORITHM=y
3.91 # CONFIG_64BIT is not set
3.92 -CONFIG_SEMAPHORE_SLEEPERS=y
3.93 -CONFIG_HOST_VMSPLIT_3G=y
3.94 -# CONFIG_HOST_VMSPLIT_3G_OPT is not set
3.95 -# CONFIG_HOST_VMSPLIT_2G is not set
3.96 -# CONFIG_HOST_VMSPLIT_1G is not set
3.97 -CONFIG_TOP_ADDR=0xC0000000
3.98 +CONFIG_X86_32=y
3.99 +# CONFIG_X86_64 is not set
3.100 +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
3.101 +CONFIG_RWSEM_GENERIC_SPINLOCK=y
3.102 # CONFIG_3_LEVEL_PGTABLES is not set
3.103 CONFIG_ARCH_HAS_SC_SIGNALS=y
3.104 CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
3.105 +# CONFIG_SMP_BROKEN is not set
3.106 CONFIG_GENERIC_HWEIGHT=y
3.107 +# CONFIG_STATIC_LINK is not set
3.108 CONFIG_SELECT_MEMORY_MODEL=y
3.109 CONFIG_FLATMEM_MANUAL=y
3.110 -# CONFIG_DISCONTIGMEM_MANUAL is not set
3.111 -# CONFIG_SPARSEMEM_MANUAL is not set
3.112 CONFIG_FLATMEM=y
3.113 CONFIG_FLAT_NODE_MEM_MAP=y
3.114 -# CONFIG_SPARSEMEM_STATIC is not set
3.115 -# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
3.116 +CONFIG_PAGEFLAGS_EXTENDED=y
3.117 CONFIG_SPLIT_PTLOCK_CPUS=4
3.118 -# CONFIG_RESOURCES_64BIT is not set
3.119 +# CONFIG_COMPACTION is not set
3.120 +# CONFIG_PHYS_ADDR_T_64BIT is not set
3.121 CONFIG_ZONE_DMA_FLAG=0
3.122 CONFIG_VIRT_TO_BUS=y
3.123 -# CONFIG_TICK_ONESHOT is not set
3.124 +# CONFIG_KSM is not set
3.125 +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
3.126 +CONFIG_NEED_PER_CPU_KM=y
3.127 # CONFIG_NO_HZ is not set
3.128 # CONFIG_HIGH_RES_TIMERS is not set
3.129 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
3.130 CONFIG_LD_SCRIPT_DYN=y
3.131 -CONFIG_NET=y
3.132 CONFIG_BINFMT_ELF=y
3.133 +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
3.134 +CONFIG_HAVE_AOUT=y
3.135 # CONFIG_BINFMT_AOUT is not set
3.136 CONFIG_BINFMT_MISC=m
3.137 # CONFIG_HOSTFS is not set
3.138 # CONFIG_HPPFS is not set
3.139 CONFIG_MCONSOLE=y
3.140 # CONFIG_MAGIC_SYSRQ is not set
3.141 -# CONFIG_SMP is not set
3.142 -CONFIG_NEST_LEVEL=0
3.143 -# CONFIG_HIGHMEM is not set
3.144 CONFIG_KERNEL_STACK_ORDER=2
3.145 +CONFIG_NO_DMA=y
3.146
3.147 #
3.148 # General setup
3.149 @@ -115,31 +115,53 @@
3.150 CONFIG_EXPERIMENTAL=y
3.151 CONFIG_BROKEN_ON_SMP=y
3.152 CONFIG_INIT_ENV_ARG_LIMIT=128
3.153 +CONFIG_CROSS_COMPILE=""
3.154 CONFIG_LOCALVERSION=""
3.155 CONFIG_LOCALVERSION_AUTO=y
3.156 CONFIG_SWAP=y
3.157 CONFIG_SYSVIPC=y
3.158 CONFIG_SYSVIPC_SYSCTL=y
3.159 CONFIG_POSIX_MQUEUE=y
3.160 +CONFIG_POSIX_MQUEUE_SYSCTL=y
3.161 CONFIG_BSD_PROCESS_ACCT=y
3.162 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
3.163 +# CONFIG_FHANDLE is not set
3.164 # CONFIG_TASKSTATS is not set
3.165 -# CONFIG_USER_NS is not set
3.166 -# CONFIG_PID_NS is not set
3.167 # CONFIG_AUDIT is not set
3.168 +CONFIG_HAVE_GENERIC_HARDIRQS=y
3.169 +
3.170 +#
3.171 +# IRQ subsystem
3.172 +#
3.173 +CONFIG_GENERIC_HARDIRQS=y
3.174 +CONFIG_GENERIC_IRQ_SHOW=y
3.175 +
3.176 +#
3.177 +# RCU Subsystem
3.178 +#
3.179 +CONFIG_TINY_RCU=y
3.180 +# CONFIG_PREEMPT_RCU is not set
3.181 +# CONFIG_RCU_TRACE is not set
3.182 +# CONFIG_TREE_RCU_TRACE is not set
3.183 CONFIG_IKCONFIG=y
3.184 CONFIG_IKCONFIG_PROC=y
3.185 CONFIG_LOG_BUF_SHIFT=14
3.186 # CONFIG_CGROUPS is not set
3.187 -CONFIG_FAIR_GROUP_SCHED=y
3.188 -CONFIG_FAIR_USER_SCHED=y
3.189 -# CONFIG_FAIR_CGROUP_SCHED is not set
3.190 +CONFIG_NAMESPACES=y
3.191 +CONFIG_UTS_NS=y
3.192 +CONFIG_IPC_NS=y
3.193 +# CONFIG_USER_NS is not set
3.194 +# CONFIG_PID_NS is not set
3.195 +CONFIG_NET_NS=y
3.196 +# CONFIG_SCHED_AUTOGROUP is not set
3.197 CONFIG_SYSFS_DEPRECATED=y
3.198 +# CONFIG_SYSFS_DEPRECATED_V2 is not set
3.199 # CONFIG_RELAY is not set
3.200 # CONFIG_BLK_DEV_INITRD is not set
3.201 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
3.202 CONFIG_SYSCTL=y
3.203 -# CONFIG_EMBEDDED is not set
3.204 +CONFIG_ANON_INODES=y
3.205 +# CONFIG_EXPERT is not set
3.206 CONFIG_UID16=y
3.207 CONFIG_SYSCTL_SYSCALL=y
3.208 CONFIG_KALLSYMS=y
3.209 @@ -151,52 +173,95 @@
3.210 CONFIG_ELF_CORE=y
3.211 CONFIG_BASE_FULL=y
3.212 CONFIG_FUTEX=y
3.213 -CONFIG_ANON_INODES=y
3.214 CONFIG_EPOLL=y
3.215 CONFIG_SIGNALFD=y
3.216 +CONFIG_TIMERFD=y
3.217 CONFIG_EVENTFD=y
3.218 CONFIG_SHMEM=y
3.219 +CONFIG_AIO=y
3.220 +# CONFIG_EMBEDDED is not set
3.221 +
3.222 +#
3.223 +# Kernel Performance Events And Counters
3.224 +#
3.225 CONFIG_VM_EVENT_COUNTERS=y
3.226 +CONFIG_COMPAT_BRK=y
3.227 CONFIG_SLAB=y
3.228 # CONFIG_SLUB is not set
3.229 -# CONFIG_SLOB is not set
3.230 +# CONFIG_PROFILING is not set
3.231 +
3.232 +#
3.233 +# GCOV-based kernel profiling
3.234 +#
3.235 +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
3.236 CONFIG_SLABINFO=y
3.237 CONFIG_RT_MUTEXES=y
3.238 -# CONFIG_TINY_SHMEM is not set
3.239 CONFIG_BASE_SMALL=0
3.240 CONFIG_MODULES=y
3.241 +# CONFIG_MODULE_FORCE_LOAD is not set
3.242 CONFIG_MODULE_UNLOAD=y
3.243 # CONFIG_MODULE_FORCE_UNLOAD is not set
3.244 # CONFIG_MODVERSIONS is not set
3.245 # CONFIG_MODULE_SRCVERSION_ALL is not set
3.246 -CONFIG_KMOD=y
3.247 CONFIG_BLOCK=y
3.248 -# CONFIG_LBD is not set
3.249 -# CONFIG_BLK_DEV_IO_TRACE is not set
3.250 -# CONFIG_LSF is not set
3.251 +CONFIG_LBDAF=y
3.252 # CONFIG_BLK_DEV_BSG is not set
3.253 +# CONFIG_BLK_DEV_INTEGRITY is not set
3.254
3.255 #
3.256 # IO Schedulers
3.257 #
3.258 CONFIG_IOSCHED_NOOP=y
3.259 -CONFIG_IOSCHED_AS=y
3.260 CONFIG_IOSCHED_DEADLINE=y
3.261 CONFIG_IOSCHED_CFQ=y
3.262 -CONFIG_DEFAULT_AS=y
3.263 # CONFIG_DEFAULT_DEADLINE is not set
3.264 -# CONFIG_DEFAULT_CFQ is not set
3.265 +CONFIG_DEFAULT_CFQ=y
3.266 # CONFIG_DEFAULT_NOOP is not set
3.267 -CONFIG_DEFAULT_IOSCHED="anticipatory"
3.268 +CONFIG_DEFAULT_IOSCHED="cfq"
3.269 +# CONFIG_INLINE_SPIN_TRYLOCK is not set
3.270 +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
3.271 +# CONFIG_INLINE_SPIN_LOCK is not set
3.272 +# CONFIG_INLINE_SPIN_LOCK_BH is not set
3.273 +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
3.274 +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
3.275 +CONFIG_INLINE_SPIN_UNLOCK=y
3.276 +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
3.277 +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
3.278 +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
3.279 +# CONFIG_INLINE_READ_TRYLOCK is not set
3.280 +# CONFIG_INLINE_READ_LOCK is not set
3.281 +# CONFIG_INLINE_READ_LOCK_BH is not set
3.282 +# CONFIG_INLINE_READ_LOCK_IRQ is not set
3.283 +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
3.284 +CONFIG_INLINE_READ_UNLOCK=y
3.285 +# CONFIG_INLINE_READ_UNLOCK_BH is not set
3.286 +CONFIG_INLINE_READ_UNLOCK_IRQ=y
3.287 +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
3.288 +# CONFIG_INLINE_WRITE_TRYLOCK is not set
3.289 +# CONFIG_INLINE_WRITE_LOCK is not set
3.290 +# CONFIG_INLINE_WRITE_LOCK_BH is not set
3.291 +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
3.292 +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
3.293 +CONFIG_INLINE_WRITE_UNLOCK=y
3.294 +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
3.295 +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
3.296 +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
3.297 +# CONFIG_MUTEX_SPIN_ON_OWNER is not set
3.298 +# CONFIG_FREEZER is not set
3.299 CONFIG_BLK_DEV=y
3.300 CONFIG_BLK_DEV_UBD=y
3.301 # CONFIG_BLK_DEV_UBD_SYNC is not set
3.302 CONFIG_BLK_DEV_COW_COMMON=y
3.303 CONFIG_BLK_DEV_LOOP=m
3.304 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
3.305 +
3.306 +#
3.307 +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
3.308 +#
3.309 CONFIG_BLK_DEV_NBD=m
3.310 # CONFIG_BLK_DEV_RAM is not set
3.311 # CONFIG_ATA_OVER_ETH is not set
3.312 +# CONFIG_BLK_DEV_RBD is not set
3.313
3.314 #
3.315 # Character Devices
3.316 @@ -220,6 +285,7 @@
3.317 # CONFIG_WATCHDOG is not set
3.318 CONFIG_UML_SOUND=m
3.319 CONFIG_SOUND=m
3.320 +CONFIG_SOUND_OSS_CORE=y
3.321 CONFIG_HOSTAUDIO=m
3.322 # CONFIG_HW_RANDOM is not set
3.323 CONFIG_UML_RANDOM=y
3.324 @@ -229,35 +295,34 @@
3.325 # Generic Driver Options
3.326 #
3.327 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
3.328 +# CONFIG_DEVTMPFS is not set
3.329 CONFIG_STANDALONE=y
3.330 CONFIG_PREVENT_FIRMWARE_BUILD=y
3.331 -# CONFIG_FW_LOADER is not set
3.332 +CONFIG_FW_LOADER=y
3.333 +CONFIG_FIRMWARE_IN_KERNEL=y
3.334 +CONFIG_EXTRA_FIRMWARE=""
3.335 # CONFIG_DEBUG_DRIVER is not set
3.336 # CONFIG_DEBUG_DEVRES is not set
3.337 # CONFIG_SYS_HYPERVISOR is not set
3.338 -
3.339 -#
3.340 -# Networking
3.341 -#
3.342 +CONFIG_NET=y
3.343
3.344 #
3.345 # Networking options
3.346 #
3.347 CONFIG_PACKET=y
3.348 -CONFIG_PACKET_MMAP=y
3.349 CONFIG_UNIX=y
3.350 CONFIG_XFRM=y
3.351 # CONFIG_XFRM_USER is not set
3.352 # CONFIG_XFRM_SUB_POLICY is not set
3.353 # CONFIG_XFRM_MIGRATE is not set
3.354 +# CONFIG_XFRM_STATISTICS is not set
3.355 # CONFIG_NET_KEY is not set
3.356 CONFIG_INET=y
3.357 # CONFIG_IP_MULTICAST is not set
3.358 # CONFIG_IP_ADVANCED_ROUTER is not set
3.359 -CONFIG_IP_FIB_HASH=y
3.360 # CONFIG_IP_PNP is not set
3.361 # CONFIG_NET_IPIP is not set
3.362 -# CONFIG_NET_IPGRE is not set
3.363 +# CONFIG_NET_IPGRE_DEMUX is not set
3.364 # CONFIG_ARPD is not set
3.365 # CONFIG_SYN_COOKIES is not set
3.366 # CONFIG_INET_AH is not set
3.367 @@ -276,15 +341,17 @@
3.368 CONFIG_DEFAULT_TCP_CONG="cubic"
3.369 # CONFIG_TCP_MD5SIG is not set
3.370 # CONFIG_IPV6 is not set
3.371 -# CONFIG_INET6_XFRM_TUNNEL is not set
3.372 -# CONFIG_INET6_TUNNEL is not set
3.373 # CONFIG_NETWORK_SECMARK is not set
3.374 +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
3.375 # CONFIG_NETFILTER is not set
3.376 # CONFIG_IP_DCCP is not set
3.377 # CONFIG_IP_SCTP is not set
3.378 +# CONFIG_RDS is not set
3.379 # CONFIG_TIPC is not set
3.380 # CONFIG_ATM is not set
3.381 +# CONFIG_L2TP is not set
3.382 # CONFIG_BRIDGE is not set
3.383 +# CONFIG_NET_DSA is not set
3.384 # CONFIG_VLAN_8021Q is not set
3.385 # CONFIG_DECNET is not set
3.386 # CONFIG_LLC2 is not set
3.387 @@ -294,26 +361,33 @@
3.388 # CONFIG_LAPB is not set
3.389 # CONFIG_ECONET is not set
3.390 # CONFIG_WAN_ROUTER is not set
3.391 +# CONFIG_PHONET is not set
3.392 +# CONFIG_IEEE802154 is not set
3.393 # CONFIG_NET_SCHED is not set
3.394 +# CONFIG_DCB is not set
3.395 +# CONFIG_BATMAN_ADV is not set
3.396
3.397 #
3.398 # Network testing
3.399 #
3.400 # CONFIG_NET_PKTGEN is not set
3.401 # CONFIG_HAMRADIO is not set
3.402 +# CONFIG_CAN is not set
3.403 # CONFIG_IRDA is not set
3.404 # CONFIG_BT is not set
3.405 # CONFIG_AF_RXRPC is not set
3.406 +CONFIG_WIRELESS=y
3.407 +# CONFIG_CFG80211 is not set
3.408 +# CONFIG_LIB80211 is not set
3.409
3.410 #
3.411 -# Wireless
3.412 +# CFG80211 needs to be enabled for MAC80211
3.413 #
3.414 -# CONFIG_CFG80211 is not set
3.415 -# CONFIG_WIRELESS_EXT is not set
3.416 -# CONFIG_MAC80211 is not set
3.417 -# CONFIG_IEEE80211 is not set
3.418 +# CONFIG_WIMAX is not set
3.419 # CONFIG_RFKILL is not set
3.420 # CONFIG_NET_9P is not set
3.421 +# CONFIG_CAIF is not set
3.422 +# CONFIG_CEPH_LIB is not set
3.423
3.424 #
3.425 # UML Network Devices
3.426 @@ -328,20 +402,25 @@
3.427 # CONFIG_UML_NET_PCAP is not set
3.428 CONFIG_UML_NET_SLIRP=y
3.429 CONFIG_NETDEVICES=y
3.430 -# CONFIG_NETDEVICES_MULTIQUEUE is not set
3.431 CONFIG_DUMMY=m
3.432 # CONFIG_BONDING is not set
3.433 # CONFIG_MACVLAN is not set
3.434 # CONFIG_EQUALIZER is not set
3.435 CONFIG_TUN=m
3.436 # CONFIG_VETH is not set
3.437 +# CONFIG_MII is not set
3.438 +# CONFIG_PHYLIB is not set
3.439 +CONFIG_WLAN=y
3.440 +# CONFIG_HOSTAP is not set
3.441
3.442 #
3.443 -# Wireless LAN
3.444 +# Enable WiMAX (Networking options) to see the WiMAX drivers
3.445 #
3.446 -# CONFIG_WLAN_PRE80211 is not set
3.447 -# CONFIG_WLAN_80211 is not set
3.448 # CONFIG_WAN is not set
3.449 +
3.450 +#
3.451 +# CAIF transport drivers
3.452 +#
3.453 CONFIG_PPP=m
3.454 # CONFIG_PPP_MULTILINK is not set
3.455 # CONFIG_PPP_FILTER is not set
3.456 @@ -351,13 +430,11 @@
3.457 # CONFIG_PPP_BSDCOMP is not set
3.458 # CONFIG_PPP_MPPE is not set
3.459 # CONFIG_PPPOE is not set
3.460 -# CONFIG_PPPOL2TP is not set
3.461 CONFIG_SLIP=m
3.462 # CONFIG_SLIP_COMPRESSED is not set
3.463 CONFIG_SLHC=m
3.464 # CONFIG_SLIP_SMART is not set
3.465 # CONFIG_SLIP_MODE_SLIP6 is not set
3.466 -# CONFIG_SHAPER is not set
3.467 # CONFIG_NETCONSOLE is not set
3.468 # CONFIG_NETPOLL is not set
3.469 # CONFIG_NET_POLL_CONTROLLER is not set
3.470 @@ -370,32 +447,40 @@
3.471 # CONFIG_EXT2_FS_XATTR is not set
3.472 # CONFIG_EXT2_FS_XIP is not set
3.473 CONFIG_EXT3_FS=y
3.474 +CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
3.475 # CONFIG_EXT3_FS_XATTR is not set
3.476 -# CONFIG_EXT4DEV_FS is not set
3.477 +# CONFIG_EXT4_FS is not set
3.478 CONFIG_JBD=y
3.479 CONFIG_REISERFS_FS=y
3.480 # CONFIG_REISERFS_CHECK is not set
3.481 # CONFIG_REISERFS_PROC_INFO is not set
3.482 # CONFIG_REISERFS_FS_XATTR is not set
3.483 # CONFIG_JFS_FS is not set
3.484 -# CONFIG_FS_POSIX_ACL is not set
3.485 # CONFIG_XFS_FS is not set
3.486 # CONFIG_GFS2_FS is not set
3.487 -# CONFIG_OCFS2_FS is not set
3.488 -# CONFIG_MINIX_FS is not set
3.489 -# CONFIG_ROMFS_FS is not set
3.490 -CONFIG_INOTIFY=y
3.491 +# CONFIG_BTRFS_FS is not set
3.492 +# CONFIG_NILFS2_FS is not set
3.493 +# CONFIG_FS_POSIX_ACL is not set
3.494 +CONFIG_FILE_LOCKING=y
3.495 +CONFIG_FSNOTIFY=y
3.496 +CONFIG_DNOTIFY=y
3.497 CONFIG_INOTIFY_USER=y
3.498 +# CONFIG_FANOTIFY is not set
3.499 CONFIG_QUOTA=y
3.500 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
3.501 CONFIG_PRINT_QUOTA_WARNING=y
3.502 +# CONFIG_QUOTA_DEBUG is not set
3.503 # CONFIG_QFMT_V1 is not set
3.504 # CONFIG_QFMT_V2 is not set
3.505 CONFIG_QUOTACTL=y
3.506 -CONFIG_DNOTIFY=y
3.507 -CONFIG_AUTOFS_FS=m
3.508 CONFIG_AUTOFS4_FS=m
3.509 CONFIG_FUSE_FS=y
3.510 +# CONFIG_CUSE is not set
3.511 +
3.512 +#
3.513 +# Caches
3.514 +#
3.515 +# CONFIG_FSCACHE is not set
3.516
3.517 #
3.518 # CD-ROM/DVD Filesystems
3.519 @@ -418,15 +503,13 @@
3.520 CONFIG_PROC_FS=y
3.521 CONFIG_PROC_KCORE=y
3.522 CONFIG_PROC_SYSCTL=y
3.523 +CONFIG_PROC_PAGE_MONITOR=y
3.524 CONFIG_SYSFS=y
3.525 CONFIG_TMPFS=y
3.526 # CONFIG_TMPFS_POSIX_ACL is not set
3.527 # CONFIG_HUGETLB_PAGE is not set
3.528 # CONFIG_CONFIGFS_FS is not set
3.529 -
3.530 -#
3.531 -# Miscellaneous filesystems
3.532 -#
3.533 +CONFIG_MISC_FILESYSTEMS=y
3.534 # CONFIG_ADFS_FS is not set
3.535 # CONFIG_AFFS_FS is not set
3.536 # CONFIG_HFS_FS is not set
3.537 @@ -434,16 +517,22 @@
3.538 # CONFIG_BEFS_FS is not set
3.539 # CONFIG_BFS_FS is not set
3.540 # CONFIG_EFS_FS is not set
3.541 +# CONFIG_LOGFS is not set
3.542 # CONFIG_CRAMFS is not set
3.543 +# CONFIG_SQUASHFS is not set
3.544 # CONFIG_VXFS_FS is not set
3.545 +# CONFIG_MINIX_FS is not set
3.546 +# CONFIG_OMFS_FS is not set
3.547 # CONFIG_HPFS_FS is not set
3.548 # CONFIG_QNX4FS_FS is not set
3.549 +# CONFIG_ROMFS_FS is not set
3.550 +# CONFIG_PSTORE is not set
3.551 # CONFIG_SYSV_FS is not set
3.552 # CONFIG_UFS_FS is not set
3.553 CONFIG_NETWORK_FILESYSTEMS=y
3.554 # CONFIG_NFS_FS is not set
3.555 # CONFIG_NFSD is not set
3.556 -# CONFIG_SMB_FS is not set
3.557 +# CONFIG_CEPH_FS is not set
3.558 # CONFIG_CIFS is not set
3.559 # CONFIG_NCP_FS is not set
3.560 # CONFIG_CODA_FS is not set
3.561 @@ -494,76 +583,201 @@
3.562 # CONFIG_NLS_KOI8_R is not set
3.563 # CONFIG_NLS_KOI8_U is not set
3.564 # CONFIG_NLS_UTF8 is not set
3.565 -# CONFIG_DLM is not set
3.566
3.567 #
3.568 # Security options
3.569 #
3.570 # CONFIG_KEYS is not set
3.571 +# CONFIG_SECURITY_DMESG_RESTRICT is not set
3.572 # CONFIG_SECURITY is not set
3.573 -# CONFIG_SECURITY_FILE_CAPABILITIES is not set
3.574 -# CONFIG_CRYPTO is not set
3.575 +# CONFIG_SECURITYFS is not set
3.576 +CONFIG_DEFAULT_SECURITY_DAC=y
3.577 +CONFIG_DEFAULT_SECURITY=""
3.578 +CONFIG_CRYPTO=y
3.579 +
3.580 +#
3.581 +# Crypto core or helper
3.582 +#
3.583 +# CONFIG_CRYPTO_FIPS is not set
3.584 +CONFIG_CRYPTO_ALGAPI=m
3.585 +CONFIG_CRYPTO_ALGAPI2=m
3.586 +CONFIG_CRYPTO_RNG=m
3.587 +CONFIG_CRYPTO_RNG2=m
3.588 +# CONFIG_CRYPTO_MANAGER is not set
3.589 +# CONFIG_CRYPTO_MANAGER2 is not set
3.590 +# CONFIG_CRYPTO_GF128MUL is not set
3.591 +# CONFIG_CRYPTO_NULL is not set
3.592 +# CONFIG_CRYPTO_CRYPTD is not set
3.593 +# CONFIG_CRYPTO_AUTHENC is not set
3.594 +# CONFIG_CRYPTO_TEST is not set
3.595 +
3.596 +#
3.597 +# Authenticated Encryption with Associated Data
3.598 +#
3.599 +# CONFIG_CRYPTO_CCM is not set
3.600 +# CONFIG_CRYPTO_GCM is not set
3.601 +# CONFIG_CRYPTO_SEQIV is not set
3.602 +
3.603 +#
3.604 +# Block modes
3.605 +#
3.606 +# CONFIG_CRYPTO_CBC is not set
3.607 +# CONFIG_CRYPTO_CTR is not set
3.608 +# CONFIG_CRYPTO_CTS is not set
3.609 +# CONFIG_CRYPTO_ECB is not set
3.610 +# CONFIG_CRYPTO_LRW is not set
3.611 +# CONFIG_CRYPTO_PCBC is not set
3.612 +# CONFIG_CRYPTO_XTS is not set
3.613 +
3.614 +#
3.615 +# Hash modes
3.616 +#
3.617 +# CONFIG_CRYPTO_HMAC is not set
3.618 +# CONFIG_CRYPTO_XCBC is not set
3.619 +# CONFIG_CRYPTO_VMAC is not set
3.620 +
3.621 +#
3.622 +# Digest
3.623 +#
3.624 +# CONFIG_CRYPTO_CRC32C is not set
3.625 +# CONFIG_CRYPTO_GHASH is not set
3.626 +# CONFIG_CRYPTO_MD4 is not set
3.627 +# CONFIG_CRYPTO_MD5 is not set
3.628 +# CONFIG_CRYPTO_MICHAEL_MIC is not set
3.629 +# CONFIG_CRYPTO_RMD128 is not set
3.630 +# CONFIG_CRYPTO_RMD160 is not set
3.631 +# CONFIG_CRYPTO_RMD256 is not set
3.632 +# CONFIG_CRYPTO_RMD320 is not set
3.633 +# CONFIG_CRYPTO_SHA1 is not set
3.634 +# CONFIG_CRYPTO_SHA256 is not set
3.635 +# CONFIG_CRYPTO_SHA512 is not set
3.636 +# CONFIG_CRYPTO_TGR192 is not set
3.637 +# CONFIG_CRYPTO_WP512 is not set
3.638 +
3.639 +#
3.640 +# Ciphers
3.641 +#
3.642 +CONFIG_CRYPTO_AES=m
3.643 +# CONFIG_CRYPTO_AES_586 is not set
3.644 +# CONFIG_CRYPTO_AES_NI_INTEL is not set
3.645 +# CONFIG_CRYPTO_ANUBIS is not set
3.646 +# CONFIG_CRYPTO_ARC4 is not set
3.647 +# CONFIG_CRYPTO_BLOWFISH is not set
3.648 +# CONFIG_CRYPTO_CAMELLIA is not set
3.649 +# CONFIG_CRYPTO_CAST5 is not set
3.650 +# CONFIG_CRYPTO_CAST6 is not set
3.651 +# CONFIG_CRYPTO_DES is not set
3.652 +# CONFIG_CRYPTO_FCRYPT is not set
3.653 +# CONFIG_CRYPTO_KHAZAD is not set
3.654 +# CONFIG_CRYPTO_SALSA20 is not set
3.655 +# CONFIG_CRYPTO_SALSA20_586 is not set
3.656 +# CONFIG_CRYPTO_SEED is not set
3.657 +# CONFIG_CRYPTO_SERPENT is not set
3.658 +# CONFIG_CRYPTO_TEA is not set
3.659 +# CONFIG_CRYPTO_TWOFISH is not set
3.660 +# CONFIG_CRYPTO_TWOFISH_586 is not set
3.661 +
3.662 +#
3.663 +# Compression
3.664 +#
3.665 +# CONFIG_CRYPTO_DEFLATE is not set
3.666 +# CONFIG_CRYPTO_ZLIB is not set
3.667 +# CONFIG_CRYPTO_LZO is not set
3.668 +
3.669 +#
3.670 +# Random Number Generation
3.671 +#
3.672 +CONFIG_CRYPTO_ANSI_CPRNG=m
3.673 +# CONFIG_CRYPTO_USER_API_HASH is not set
3.674 +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
3.675 +CONFIG_CRYPTO_HW=y
3.676 +# CONFIG_BINARY_PRINTF is not set
3.677
3.678 #
3.679 # Library routines
3.680 #
3.681 -CONFIG_BITREVERSE=m
3.682 +CONFIG_BITREVERSE=y
3.683 +CONFIG_GENERIC_FIND_FIRST_BIT=y
3.684 +CONFIG_GENERIC_FIND_NEXT_BIT=y
3.685 +CONFIG_GENERIC_FIND_LAST_BIT=y
3.686 # CONFIG_CRC_CCITT is not set
3.687 # CONFIG_CRC16 is not set
3.688 +# CONFIG_CRC_T10DIF is not set
3.689 # CONFIG_CRC_ITU_T is not set
3.690 -CONFIG_CRC32=m
3.691 +CONFIG_CRC32=y
3.692 # CONFIG_CRC7 is not set
3.693 # CONFIG_LIBCRC32C is not set
3.694 -CONFIG_PLIST=y
3.695 -CONFIG_HAS_DMA=y
3.696 +# CONFIG_XZ_DEC is not set
3.697 +# CONFIG_XZ_DEC_BCJ is not set
3.698 +CONFIG_NLATTR=y
3.699 +# CONFIG_AVERAGE is not set
3.700
3.701 #
3.702 # SCSI device support
3.703 #
3.704 +CONFIG_SCSI_MOD=y
3.705 # CONFIG_RAID_ATTRS is not set
3.706 # CONFIG_SCSI is not set
3.707 # CONFIG_SCSI_DMA is not set
3.708 # CONFIG_SCSI_NETLINK is not set
3.709 # CONFIG_MD is not set
3.710 +# CONFIG_NEW_LEDS is not set
3.711 # CONFIG_INPUT is not set
3.712 -CONFIG_INSTRUMENTATION=y
3.713 -# CONFIG_PROFILING is not set
3.714 -# CONFIG_MARKERS is not set
3.715
3.716 #
3.717 # Kernel hacking
3.718 #
3.719 # CONFIG_PRINTK_TIME is not set
3.720 +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
3.721 CONFIG_ENABLE_WARN_DEPRECATED=y
3.722 CONFIG_ENABLE_MUST_CHECK=y
3.723 +CONFIG_FRAME_WARN=1024
3.724 +# CONFIG_STRIP_ASM_SYMS is not set
3.725 # CONFIG_UNUSED_SYMBOLS is not set
3.726 # CONFIG_DEBUG_FS is not set
3.727 +# CONFIG_DEBUG_SECTION_MISMATCH is not set
3.728 CONFIG_DEBUG_KERNEL=y
3.729 # CONFIG_DEBUG_SHIRQ is not set
3.730 -CONFIG_DETECT_SOFTLOCKUP=y
3.731 +# CONFIG_LOCKUP_DETECTOR is not set
3.732 +# CONFIG_HARDLOCKUP_DETECTOR is not set
3.733 +# CONFIG_DETECT_HUNG_TASK is not set
3.734 CONFIG_SCHED_DEBUG=y
3.735 # CONFIG_SCHEDSTATS is not set
3.736 # CONFIG_TIMER_STATS is not set
3.737 +# CONFIG_DEBUG_OBJECTS is not set
3.738 CONFIG_DEBUG_SLAB=y
3.739 # CONFIG_DEBUG_SLAB_LEAK is not set
3.740 # CONFIG_DEBUG_RT_MUTEXES is not set
3.741 # CONFIG_RT_MUTEX_TESTER is not set
3.742 # CONFIG_DEBUG_SPINLOCK is not set
3.743 # CONFIG_DEBUG_MUTEXES is not set
3.744 +# CONFIG_SPARSE_RCU_POINTER is not set
3.745 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
3.746 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
3.747 # CONFIG_DEBUG_KOBJECT is not set
3.748 CONFIG_DEBUG_BUGVERBOSE=y
3.749 CONFIG_DEBUG_INFO=y
3.750 +# CONFIG_DEBUG_INFO_REDUCED is not set
3.751 # CONFIG_DEBUG_VM is not set
3.752 +# CONFIG_DEBUG_WRITECOUNT is not set
3.753 +CONFIG_DEBUG_MEMORY_INIT=y
3.754 # CONFIG_DEBUG_LIST is not set
3.755 +# CONFIG_TEST_LIST_SORT is not set
3.756 # CONFIG_DEBUG_SG is not set
3.757 +# CONFIG_DEBUG_NOTIFIERS is not set
3.758 +# CONFIG_DEBUG_CREDENTIALS is not set
3.759 CONFIG_FRAME_POINTER=y
3.760 -CONFIG_FORCED_INLINING=y
3.761 # CONFIG_BOOT_PRINTK_DELAY is not set
3.762 # CONFIG_RCU_TORTURE_TEST is not set
3.763 +# CONFIG_BACKTRACE_SELF_TEST is not set
3.764 +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
3.765 +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
3.766 # CONFIG_FAULT_INJECTION is not set
3.767 +# CONFIG_SYSCTL_SYSCALL_CHECK is not set
3.768 +# CONFIG_DEBUG_PAGEALLOC is not set
3.769 +# CONFIG_ATOMIC64_SELFTEST is not set
3.770 # CONFIG_SAMPLES is not set
3.771 +# CONFIG_TEST_KSTRTOX is not set
3.772 # CONFIG_GPROF is not set
3.773 # CONFIG_GCOV is not set
3.774 # CONFIG_DEBUG_STACK_USAGE is not set
4.1 --- a/uml-make-network Wed Jul 13 00:43:11 2011 +0200
4.2 +++ b/uml-make-network Mon Jul 18 01:00:41 2011 +0200
4.3 @@ -18,9 +18,9 @@
4.4
4.5 if [ ! -e "$IMAGEDIR/etc/hosts" ]; then
4.6 echo "Creating hosts file..." 1>&2
4.7 - echo "$GUESTADDRESS $GUESTNAME" > "$IMAGEDIR/etc/hosts"
4.8 + echo "$GUESTADDRESS `hostname`" > "$IMAGEDIR/etc/hosts"
4.9 echo "127.0.0.1 localhost" >> "$IMAGEDIR/etc/hosts"
4.10 - echo "$HOSTADDRESS $HOSTNAME" >> "$IMAGEDIR/etc/hosts"
4.11 + echo "$HOSTADDRESS `hostname`-uml" >> "$IMAGEDIR/etc/hosts"
4.12 fi
4.13
4.14 if [ -e "$IMAGEDIR/etc/network/interfaces" ]; then
4.15 @@ -31,14 +31,16 @@
4.16
4.17 if [ ! -e "$IMAGEDIR/etc/network/interfaces" ]; then
4.18 echo "Creating network configuration..." 1>&2
4.19 - echo "auto lo" > "$IMAGEDIR/etc/network/interfaces"
4.20 - echo "iface lo inet loopback" >> "$IMAGEDIR/etc/network/interfaces"
4.21 - echo "iface eth0 inet static" >> "$IMAGEDIR/etc/network/interfaces"
4.22 - echo " network 192.168.0.0" >> "$IMAGEDIR/etc/network/interfaces"
4.23 - echo " broadcast 192.168.0.255" >> "$IMAGEDIR/etc/network/interfaces"
4.24 - echo " address $GUESTADDRESS" >> "$IMAGEDIR/etc/network/interfaces"
4.25 - echo " netmask 255.255.255.0" >> "$IMAGEDIR/etc/network/interfaces"
4.26 - echo " up route add default gw $HOSTADDRESS" >> "$IMAGEDIR/etc/network/interfaces"
4.27 - echo "" >> "$IMAGEDIR/etc/network/interfaces"
4.28 - echo "auto eth0" >> "$IMAGEDIR/etc/network/interfaces"
4.29 + cat > "$IMAGEDIR/etc/network/interfaces" <<EOF
4.30 +auto lo
4.31 +iface lo inet loopback
4.32 +iface eth0 inet static
4.33 + network 192.168.0.0
4.34 + broadcast 192.168.0.255
4.35 + address $GUESTADDRESS
4.36 + netmask 255.255.255.0
4.37 + up route add default gw $HOSTADDRESS
4.38 +
4.39 +auto eth0
4.40 +EOF
4.41 fi
5.1 --- a/uml-populate-image Wed Jul 13 00:43:11 2011 +0200
5.2 +++ b/uml-populate-image Mon Jul 18 01:00:41 2011 +0200
5.3 @@ -72,12 +72,16 @@
5.4 cp "$IMAGEDIR/etc/inittab" "$IMAGEDIR/etc/inittab.orig"
5.5 grep -v "getty" "$IMAGEDIR/etc/inittab.orig" > "$IMAGEDIR/etc/inittab"
5.6 fi
5.7 - echo "# We launch just one console for UML:" >> "$IMAGEDIR/etc/inittab"
5.8 - echo "c0:1235:respawn:/sbin/getty 38400 tty0 linux" >> "$IMAGEDIR/etc/inittab"
5.9 + cat >> "$IMAGEDIR/etc/inittab" <<EOF
5.10 +# We launch just one console for UML:
5.11 +c0:1235:respawn:/sbin/getty 38400 tty0 linux
5.12 +EOF
5.13
5.14 - echo "# UML modification: use tty0 or vc/0" >> "$IMAGEDIR/etc/securetty"
5.15 - echo "tty0" >> "$IMAGEDIR/etc/securetty"
5.16 - echo "vc/0" >> "$IMAGEDIR/etc/securetty"
5.17 + cat >> "$IMAGEDIR/etc/securetty" <<EOF
5.18 +# UML modification: use tty0 or vc/0
5.19 +tty0
5.20 +vc/0
5.21 +EOF
5.22 fi
5.23
5.24 sudo "$THISDIR/uml-make-devices" "$IMAGEDIR"
6.1 --- a/user-setup Wed Jul 13 00:43:11 2011 +0200
6.2 +++ b/user-setup Mon Jul 18 01:00:41 2011 +0200
6.3 @@ -11,7 +11,7 @@
6.4 fi
6.5
6.6 if [ "$1" = "--help" ]; then
6.7 - echo 1>&2 <<EOF
6.8 + cat 1>&2 <<EOF
6.9 Usage: `basename $0` [ --root ] [ <mirror> ]
6.10
6.11 Examples:
6.12 @@ -41,7 +41,7 @@
6.13 "$USERINSTALL_CODENAME" "$PACKAGEROOT" "$MIRROR"
6.14 fi
6.15
6.16 -echo 1>&2 <<EOF
6.17 +cat 1>&2 <<EOF
6.18 Don't forget to run the following before installing packages:
6.19
6.20 user-postsetup $AS_ROOT [ <country> ]