github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-24 18:10:52 +00:00
Code Issues Projects Releases Wiki Activity
1,052 Commits 1 Branch 31 Tags
c7f289e3955c29d43813aeee507bc435abc0f26e
Commit Graph

50 Commits

Author SHA1 Message Date
Nathan LeClaire
c7f289e395 Increase DHCP timeout and retries 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-08-08 17:41:46 -07:00
Justin Cormack
adcfa94158 use openrc for shutdown 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-21 12:57:05 +01:00
Justin Cormack
b3b38aacc1 Use upstream /etc/securetty 
Now we modify the file if we use a different console, can use
upstream unmodified.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-15 11:58:01 +01:00
Natanael Copa
8e03b120c3 merge inittab.x86_64 and inittab.armhf 
with the login tty generated from boot cmdline the inittab will be equal
on all archs and platforms so we can merge and move to etc/

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
 2016-07-13 18:48:26 +02:00
Ian Campbell
7dc74bf65c Direct syslog to log to /var/run/syslog.vsock on mac 
Avoid doing this on non-Docker-for-{Mac,Win} editions (which don't run vsudd)
by checking for vsudd.pid and avoid doing it on Docker-for-Win (for now) by
checking for /sys/bus/vmbus (as /etc/init.d/vsudd does too).

Ideally we would just check for /var/run/syslog.vsock but this may not have
arrived yet (typically vsudd is now started immediately prior to syslog and it
forks via start-stop-daemon and thus before it creates the socket). Since
syslogd will reopen as needed we don't want to delay boot either here or in the
vsudd initscript to await the arrival of the socket.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-04 14:47:02 +01:00
Daniel Hiltgen
52b43e9482 Add support for console on tty1 
When running moby under other hypervisors, requiring troubleshooting on
the serial port can be painful.  This change enables console support on
tty1 similar to the way prior boot2docker images worked.
 2016-06-16 17:17:34 -07:00
Ian Campbell
52eaf66812 Add /etc/mke2fs.conf reenabling the uninit_bg feature 
Without this the mkfs.ext4 on Moby on a virtualised OSX goes from ~10s to ~90s.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-06-10 18:28:57 +01:00
Rolf Neugebauer
b557d5d9b7 config: overwrite resolv.conf and interfaces from database 
Allow the host to configure a static IP address for eth0 by setting the
following DB keys:
- net/config: "static" (default or not set -> dhcp)
- net/address: IP address
- net/netmask: netmask in dot notation
- net/gateway: default gateway

Also allow overwriting/setting "/etc/resolve.conf" by writing to
the "etc/resolv.conf" key.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
 2016-05-30 10:01:42 +02:00
David Scott
ddea73d6d2 tap-vsockd: add tap-vsockd service to bring up eth1 
The tap-vsockd service is started from eth1's pre-up script.

On the Mac: the bind of the AF_HYPERV socket fails, and eth1 is skipped.
On Windows: if there is no database then eth1 is skipped.
On Windows: if the database has network=native then eth1 is brought up.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-05-21 21:58:38 +01:00
David Scott
a3f10d9841 In a dual NIC configuration, use eth1 for routing 
The NIC with the lowest metric is used for routing, while the NIC with
the highest index is used for DNS. Set the metric of eth1 to 199, so it
is higher-priority than eth0, so we use eth1 for everything in a dual
NIC configuration.

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-18 18:45:32 +01:00
David Scott
7478cc7c80 Configure a second possible NIC (eth1) 
This makes it possible to have one NIC controlled by vmnet and another
controlled by slirp.

If eth1 doesn't exist then a harmless message is generated during
bootup: (with no appreciable delay)

 * Starting networking ... *   lo ... [ ok ]
 *   eth0 ... [ ok ]
 *   eth1 ...ip: ioctl 0x8913 failed: No such device
 [ !! ]

Signed-off-by: David Scott <dave.scott@docker.com>
 2016-04-16 19:31:32 +01:00
Justin Cormack
4778cde8c5 do not set hostname in dhcp 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-03-01 14:57:11 +00:00
Magnus Skjegstad
32c86c9822 udhcpc: set retransmission timeout to 1 sec (was 3 sec), retry if no offer after 3 sec (was 20 sec) 
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
 2016-01-28 21:24:37 +01:00
Justin Cormack
569758a789 inline some config files 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-01-25 11:47:35 +00:00
Justin Cormack
cdf02ffe7f set hostname from database if available 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-18 17:09:23 +00:00
Justin Cormack
b441a16f2b add arm console to securetty 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-14 15:21:15 +00:00
Justin Cormack
7ce5afc2d9 more arm fixes 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-13 17:48:42 +00:00
Justin Cormack
a4844ad52a simplify inittab 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2016-01-13 16:01:36 +00:00
Justin Cormack
c43dd60a39 move 9pinit to packages 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-23 13:18:43 +00:00
Justin Cormack
364d6f5aa1 move automount to packages 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-23 13:02:25 +00:00
Justin Cormack
4165acdd88 use standard chronyd config file, but make sure it starts after docker as it is slow 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-23 12:50:35 +00:00
Justin Cormack
a0ca83be2d More allowed drive types 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-21 09:50:42 +00:00
Justin Cormack
bb2fd04e2a move config files under packages 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-18 16:41:29 +00:00
Justin Cormack
4af10a3026 Use official docker image instead of Alpine package; switch to aufs by default 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-18 14:13:34 +00:00
Justin Cormack
866cacb79b clean up rc files 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-18 10:46:34 +00:00
Justin Cormack
b257bbca35 add /etc/securetty now upstream has one 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-17 10:45:20 +00:00
Justin Cormack
4cc739f07f use first partition if several 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-16 14:49:58 +00:00
Justin Cormack
30a3c40b09 identify the partition types for mounting; fixes issues with some beta users where this changed 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-15 16:54:06 +00:00
Justin Cormack
b8464e2ee4 support /dev/vda as a disk as well as /dev/sda and mount one for xhyve run 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-15 11:22:19 +00:00
Justin Cormack
c6f6a6ffa2 fix automount script, as the settings do not persist, as fstab changes dropped 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-14 18:16:08 +00:00
Justin Cormack
fedc7238ca use the standard alpine tool to setup disk instead 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-14 15:40:58 +00:00
Justin Cormack
9e7a213777 replace automount script with a more rebust one, will later replace with alpine setup-disk. fix #378 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-14 14:56:23 +00:00
Justin Cormack
e4da1b5158 slight hack to start up chronyd in the background as it is very slow 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-11 14:58:21 +00:00
Justin Cormack
040842d9ef advertise moby hostname not always docker.local. 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-11 14:42:37 +00:00
Justin Cormack
9d3fd80f06 fix moby ascii art 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-11 14:38:50 +00:00
Justin Cormack
5a43d52b59 fix typo 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-11 13:56:31 +00:00
Justin Cormack
975f597574 use findfs not blkid here 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-11 10:28:28 +00:00
Justin Cormack
8a8b16f860 Revert "work around busybox blkid" now we have upstream blkid 
This reverts commit 6f8ecb38f1.
 2015-12-11 09:54:08 +00:00
Justin Cormack
6f8ecb38f1 work around busybox blkid 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-11 09:43:22 +00:00
Justin Cormack
e4d19c90dc fix process startup, now runs docker correctly 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-10 16:25:04 +00:00
Justin Cormack
39de916e54 Add in startup code for the pinata specific tools. Should be split out as packages later 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-10 11:26:58 +00:00
Justin Cormack
ef337134ef add fstab for docker mac to mount 9p filesystems, harmless if fails 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-09 15:51:48 +00:00
Justin Cormack
f3f60f724e make chronyd start after docker as it is slow starting 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 19:28:52 +00:00
Justin Cormack
2abe0d8f1b fix backslashes in /etc/issue and add a motd back 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 18:48:51 +00:00
Justin Cormack
4bed07d9d0 customise issue not motd 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 18:26:48 +00:00
Justin Cormack
5d013ba4b3 Moby now runs Docker 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 18:14:17 +00:00
Justin Cormack
f2fb098e22 vendor upstream sysfs init 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 17:14:13 +00:00
Justin Cormack
02dbabaec4 Configure network and timezone 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 15:54:54 +00:00
Justin Cormack
64d021de19 fix up files that Docker bind mounts in so they are not set to desired values 
Signed-off-by: Justin Cormack <justin.cormack@unikernel.com>
 2015-12-07 15:43:39 +00:00
Justin Cormack
4b626fdd41 clean up override files, add inittab 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2015-12-02 12:50:06 +00:00