Merge pull request #106 from gnawux/release_06

bump version to 0.6.0
2026-09-06 05:31:58 +00:00 · 2016-05-25 19:35:33 +08:00 · 2016-05-25 14:44:33 +08:00 · 2016-05-25 12:53:31 +08:00 · 2016-05-24 16:08:35 +08:00 · 2016-05-24 15:59:17 +08:00
125 changed files with 4517 additions and 1479 deletions
@@ -10,6 +10,7 @@
 init
 build/hyper_daemon
 build/hyper-initrd.img
+build/cbfs.rom
 build/root/*
 build/*iso
 build/daemon
@@ -1,21 +1,21 @@
-# The init Task for Hyper
+# The init Task for HyperContainer

-You can get binary installer of Hyper and HyperStart through [The Hyper Page](https://github.com/hyperhq/hyper)
+You can get the binary installer of HyperContainer and HyperStart through [The Hyper Page](https://github.com/hyperhq/hyperd)

 ## Build from source 

-clone this repo, and make sure have build-essentials installed. Go into the working copy and
+clone this repo, and make sure you have build-essentials installed. Go into the working copy and

    > ./autogen.sh
    > ./configure
    > make

-Then you can find `hyper-initrd.img` in build directory, together with a pre-build kernel.
+Then you can find `hyper-initrd.img` in the build directory, together with a pre-built kernel.

-If you want to get the boot disk file for VirtaulBox, please reconfigure with flag --with-vbox,
+If you want to get the boot disk file for VirtualBox, please reconfigure with flag --with-vbox,

    > ./configure --with-vbox
    > make

-Then you can find `hyper-vbox-bootimage.iso` in build directory, booting from this iso will
+Then you can find `hyper-vbox-bootimage.iso` in the build directory. Booting from this iso will
 bring you to the hyper world.
@@ -0,0 +1,43 @@
+From 084b4a5aa4b90975f7ac6b4714a6b449430ef4c4 Mon Sep 17 00:00:00 2001
+From: Peng Tao <bergwolf@gmail.com>
+Date: Wed, 4 May 2016 12:01:22 +0800
+Subject: [PATCH] HACK: 9P: always use cached inode to fill in v9fs_vfs_getattr
+
+So that if in cache=none mode, we don't have to lookup server that
+might not support open-unlink-fstat operation.
+
+Signed-off-by: Peng Tao <bergwolf@gmail.com>
+---
+ fs/9p/vfs_inode.c      | 2 +-
+ fs/9p/vfs_inode_dotl.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
+index 5110785..43ebb31 100644
+--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
+@@ -1059,7 +1059,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
+ 
+ 	p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
+ 	v9ses = v9fs_dentry2v9ses(dentry);
+-	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+	if (!d_really_is_negative(dentry) || v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+ 		generic_fillattr(d_inode(dentry), stat);
+ 		return 0;
+ 	}
+diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
+index cb899af..b1e4205 100644
+--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
+@@ -479,7 +479,7 @@ v9fs_vfs_getattr_dotl(struct vfsmount *mnt, struct dentry *dentry,
+ 
+ 	p9_debug(P9_DEBUG_VFS, "dentry: %p\n", dentry);
+ 	v9ses = v9fs_dentry2v9ses(dentry);
+-	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+	if (!d_really_is_negative(dentry) || v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {
+ 		generic_fillattr(d_inode(dentry), stat);
+ 		return 0;
+ 	}
+-- 
+2.5.0
+
@@ -0,0 +1,2 @@
+# v4.4.7+
+084b4a5aa4b90975f7ac6b4714a6b449430ef4c4
@@ -1,9 +1,11 @@
 #!/bin/bash

 rm -rf root
-mkdir root
+mkdir -p root/lib

 cp ../src/init ./root
+cp busybox ./root
+cp modules -R ./root/lib/

 ldd ./root/init | while read line
 do
@@ -36,9 +38,11 @@ if [ "$1"x = "cbfs"x ]; then

 	mkdir .cbfs
 	dd if=/dev/zero of=.cbfs/boot.bin bs=4096 count=1
-	cbfstool .cbfs/cbfs.rom create -s 4096k -B .cbfs/boot.bin -m x86  0x1000
+	cbfstool .cbfs/cbfs.rom create -s 8128k -B .cbfs/boot.bin -m x86  0x1000
 	cbfstool .cbfs/cbfs.rom add -f kernel -n vmlinuz -t raw
 	cbfstool .cbfs/cbfs.rom add -f hyper-initrd.img -n initrd -t raw
+	echo 'console=ttyS0 panic=1 no_timer_check' > .cbfs/cmdline
+	cbfstool .cbfs/cbfs.rom add -f .cbfs/cmdline -n cmdline -t raw
 	cp .cbfs/cbfs.rom ./
 	rm -rf .cbfs
 	exit 0
@@ -0,0 +1,107 @@
+# Aliases extracted from modules themselves.
+alias devname:net/tun tun
+alias char-major-10-200 tun
+alias rtnl-link-veth veth
+alias net-pf-16-proto-12 nfnetlink
+alias nfnetlink-subsys-7 nfnetlink_acct
+alias nfnetlink-subsys-3 nfnetlink_queue
+alias nf-logger-7-1 nfnetlink_log
+alias nf-logger-10-1 nfnetlink_log
+alias nf-logger-2-1 nfnetlink_log
+alias nfnetlink-subsys-4 nfnetlink_log
+alias nfnetlink-subsys-2 nf_conntrack_netlink
+alias nfnetlink-subsys-1 nf_conntrack_netlink
+alias ip_conntrack_netlink nf_conntrack_netlink
+alias ip6t_tcp xt_tcpudp
+alias ip6t_udp xt_tcpudp
+alias ipt_tcp xt_tcpudp
+alias ipt_udp xt_tcpudp
+alias xt_udp xt_tcpudp
+alias xt_tcp xt_tcpudp
+alias arpt_MARK xt_mark
+alias ip6t_MARK xt_mark
+alias ipt_MARK xt_mark
+alias ip6t_mark xt_mark
+alias ipt_mark xt_mark
+alias ip6t_connmark xt_connmark
+alias ipt_connmark xt_connmark
+alias ip6t_CONNMARK xt_connmark
+alias ipt_CONNMARK xt_connmark
+alias ip6t_SET xt_set
+alias ipt_SET xt_set
+alias ip6t_set xt_set
+alias ipt_set xt_set
+alias xt_SET xt_set
+alias ip6t_DNAT xt_nat
+alias ip6t_SNAT xt_nat
+alias ipt_DNAT xt_nat
+alias ipt_SNAT xt_nat
+alias ip6t_CHECKSUM xt_CHECKSUM
+alias ipt_CHECKSUM xt_CHECKSUM
+alias arpt_CLASSIFY xt_CLASSIFY
+alias ip6t_CLASSIFY xt_CLASSIFY
+alias ipt_CLASSIFY xt_CLASSIFY
+alias ip6t_HMARK xt_HMARK
+alias ipt_HMARK xt_HMARK
+alias ipt_NETMAP xt_NETMAP
+alias ip6t_NETMAP xt_NETMAP
+alias ipt_REDIRECT xt_REDIRECT
+alias ip6t_REDIRECT xt_REDIRECT
+alias ip6t_TCPMSS xt_TCPMSS
+alias ipt_TCPMSS xt_TCPMSS
+alias ip6t_addrtype xt_addrtype
+alias ipt_addrtype xt_addrtype
+alias ip6t_connbytes xt_connbytes
+alias ipt_connbytes xt_connbytes
+alias ip6t_connlimit xt_connlimit
+alias ipt_connlimit xt_connlimit
+alias ip6t_conntrack xt_conntrack
+alias ipt_conntrack xt_conntrack
+alias ip6t_ipvs xt_ipvs
+alias ipt_ipvs xt_ipvs
+alias ip6t_length xt_length
+alias ipt_length xt_length
+alias ip6t_mac xt_mac
+alias ipt_mac xt_mac
+alias ip6t_nfacct xt_nfacct
+alias ipt_nfacct xt_nfacct
+alias ip6t_cgroup xt_cgroup
+alias ipt_cgroup xt_cgroup
+alias ip6t_pkttype xt_pkttype
+alias ipt_pkttype xt_pkttype
+alias ip6t_recent xt_recent
+alias ipt_recent xt_recent
+alias ip6t_socket xt_socket
+alias ipt_socket xt_socket
+alias ip6t_state xt_state
+alias ipt_state xt_state
+alias ip6t_statistic xt_statistic
+alias ipt_statistic xt_statistic
+alias ip6t_string xt_string
+alias ipt_string xt_string
+alias ip6t_tcpmss xt_tcpmss
+alias ipt_tcpmss xt_tcpmss
+alias ip6t_time xt_time
+alias ipt_time xt_time
+alias ip6t_u32 xt_u32
+alias ipt_u32 xt_u32
+alias nfnetlink-subsys-6 ip_set
+alias ip_set_bitmap:ip ip_set_bitmap_ip
+alias ip_set_bitmap:ip,mac ip_set_bitmap_ipmac
+alias ip_set_bitmap:port ip_set_bitmap_port
+alias ip_set_hash:ip ip_set_hash_ip
+alias ip_set_hash:ip,mark ip_set_hash_ipmark
+alias ip_set_hash:ip,port ip_set_hash_ipport
+alias ip_set_hash:ip,port,ip ip_set_hash_ipportip
+alias ip_set_hash:ip,port,net ip_set_hash_ipportnet
+alias ip_set_hash:mac ip_set_hash_mac
+alias ip_set_hash:net ip_set_hash_net
+alias ip_set_hash:net,port ip_set_hash_netport
+alias ip_set_hash:net,iface ip_set_hash_netiface
+alias ip_set_hash:net,net ip_set_hash_netnet
+alias ip_set_hash:net,port,net ip_set_hash_netportnet
+alias ip_set_list:set ip_set_list_set
+alias ip_conntrack nf_conntrack_ipv4
+alias nf_conntrack-2 nf_conntrack_ipv4
+alias nf-nat-2 nf_nat_ipv4
+alias nf-logger-2-0 nf_log_ipv4
@@ -0,0 +1,75 @@
+kernel/fs/binfmt_misc.ko
+kernel/fs/binfmt_script.ko
+kernel/fs/mbcache.ko
+kernel/fs/9p/9p.ko
+kernel/fs/exportfs/exportfs.ko
+kernel/fs/ext4/ext4.ko
+kernel/fs/jbd2/jbd2.ko
+kernel/fs/nls/nls_base.ko
+kernel/fs/xfs/xfs.ko
+kernel/crypto/crypto.ko
+kernel/crypto/crypto_wq.ko
+kernel/crypto/crypto_algapi.ko
+kernel/crypto/aead.ko
+kernel/crypto/crypto_blkcipher.ko
+kernel/crypto/chainiv.ko
+kernel/crypto/eseqiv.ko
+kernel/crypto/crypto_hash.ko
+kernel/crypto/pcompress.ko
+kernel/crypto/akcipher.ko
+kernel/crypto/cryptomgr.ko
+kernel/crypto/hmac.ko
+kernel/crypto/crypto_null.ko
+kernel/crypto/sha256_generic.ko
+kernel/crypto/aes_generic.ko
+kernel/crypto/crc32c_generic.ko
+kernel/crypto/crct10dif_common.ko
+kernel/crypto/crct10dif_generic.ko
+kernel/crypto/rng.ko
+kernel/crypto/drbg.ko
+kernel/crypto/jitterentropy_rng.ko
+kernel/block/cfq-iosched.ko
+kernel/drivers/acpi/fan.ko
+kernel/drivers/acpi/processor.ko
+kernel/drivers/acpi/thermal.ko
+kernel/drivers/base/firmware_class.ko
+kernel/drivers/block/brd.ko
+kernel/drivers/block/loop.ko
+kernel/drivers/block/virtio_blk.ko
+kernel/drivers/block/xen-blkfront.ko
+kernel/drivers/char/virtio_console.ko
+kernel/drivers/input/input-core.ko
+kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+kernel/drivers/net/virtio_net.ko
+kernel/drivers/net/xen-netfront.ko
+kernel/drivers/pci/pci-stub.ko
+kernel/drivers/pci/xen-pcifront.ko
+kernel/drivers/rtc/rtc-cmos.ko
+kernel/drivers/scsi/scsi_mod.ko
+kernel/drivers/scsi/virtio_scsi.ko
+kernel/drivers/scsi/sd_mod.ko
+kernel/drivers/scsi/sg.ko
+kernel/drivers/thermal/thermal_sys.ko
+kernel/drivers/tty/serial/serial_core.ko
+kernel/drivers/tty/serial/8250/8250.ko
+kernel/drivers/tty/serial/8250/8250_base.ko
+kernel/drivers/tty/serial/8250/8250_pci.ko
+kernel/drivers/virtio/virtio.ko
+kernel/drivers/virtio/virtio_ring.ko
+kernel/drivers/virtio/virtio_mmio.ko
+kernel/drivers/virtio/virtio_pci.ko
+kernel/drivers/virtio/virtio_balloon.ko
+kernel/drivers/xen/xenbus/xenbus_probe_frontend.ko
+kernel/net/9p/9pnet.ko
+kernel/net/9p/9pnet_virtio.ko
+kernel/net/ipv4/tcp_cubic.ko
+kernel/net/ipv6/ipv6.ko
+kernel/net/ipv6/inet6_hashtables.ko
+kernel/net/packet/af_packet.ko
+kernel/net/unix/unix.ko
+kernel/lib/bitrev.ko
+kernel/lib/crc16.ko
+kernel/lib/crc-t10dif.ko
+kernel/lib/crc32.ko
+kernel/lib/libcrc32c.ko
+kernel/lib/zlib_inflate/zlib_inflate.ko
--- a/Show More
+++ b/Show More