1
0
mirror of https://github.com/rancher/os.git synced 2025-07-05 11:06:13 +00:00
Commit Graph

2371 Commits

Author SHA1 Message Date
Wang Long
fa98165862 Remove -D when we set rancher.debug=false
when we set rancher.debug to true, the current code also set `-D` flag
to system-docker and user-docker daemon.
and then we change rancher.debug to false, the `-D` flag is also exist
by using command `sudo ros config get rancher.docker`.

this patch fix it.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-29 09:55:42 +08:00
Darren Shepherd
1f49d44fdb Merge pull request #901 from joshwget/unconfined-console
Processes in console container run as unconfined_t
2016-04-28 17:52:50 -07:00
Josh Curl
3fa11f963d Processes in console container run as unconfined_t 2016-04-27 15:33:02 -07:00
Darren Shepherd
862344bfc3 Merge pull request #891 from joshwget/switch-console-dependency
Console service should depend on wait-for-network
2016-04-25 10:59:26 -07:00
Darren Shepherd
f15967a7a3 Merge pull request #890 from joshwget/add-upgrade-console-flag
Add upgrade flag to upgrade persistent console
2016-04-25 10:50:37 -07:00
Josh Curl
6ab32ae19c Fix setting default values with 'ros config set' 2016-04-22 16:11:54 -07:00
Wang Long
4439cdde41 Modify the test_11_environment to work with multiple architectures
Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-19 11:36:41 +08:00
Josh Curl
ee73337f49 Add upgrade flag to upgrade persistent console 2016-04-18 17:00:18 -07:00
Josh Curl
35ee0b5982 Console service should depend on wait-for-network 2016-04-18 16:35:24 -07:00
Denise
eeea325e54 Update README.md 2016-04-15 11:23:33 -07:00
Denise
f878b31407 Merge pull request #885 from joshwget/update-readme
Update README.md
2016-04-15 11:13:07 -07:00
Darren Shepherd
d657155723 Merge pull request #884 from joshwget/remove-dns-override
Remove DHCP override flag
2016-04-15 10:58:19 -07:00
Josh Curl
8862878337 Remove DHCP override flag 2016-04-15 10:38:31 -07:00
Josh Curl
ad1098a730 Update README.md 2016-04-14 23:02:56 -07:00
Darren Shepherd
8b4e6cc502 Merge pull request #881 from joshwget/fix-dhcp-hostname
Fix DHCP hostname being overwritten
2016-04-14 21:59:38 -07:00
Josh Curl
a0ae6222c9 Fix DHCP hostname being overwritten 2016-04-14 21:58:07 -07:00
Darren Shepherd
5d15d3aa2c Merge pull request #882 from joshwget/unmarshal-args-as-yaml
Use yaml.Unmarshal to handle config arguments
2016-04-14 21:47:07 -07:00
Darren Shepherd
f7cd87e2fb Merge pull request #873 from joshwget/dns-integration-tests
Integration tests for DNS configuration in cloud config
2016-04-14 21:46:39 -07:00
Josh Curl
53acef17cd Use yaml.Unmarshal to handle config arguments 2016-04-14 17:04:00 -07:00
Ivan Mikushin
1df1582459 Fix building rootfs for arm on amd64 2016-04-13 14:40:28 -07:00
Darren Shepherd
447a96a5f8 Merge pull request #880 from joshwget/add-unit-tests-to-ci
Add unit tests to CI
2016-04-13 11:53:19 -07:00
Josh Curl
3c78335edf Integration tests for DNS configuration in cloud config 2016-04-13 11:24:00 -07:00
Josh Curl
adb8ad3e3a Add unit tests to CI 2016-04-13 11:23:21 -07:00
Josh Curl
b52663ee5f Fix config/config_test.go 2016-04-13 10:26:41 -07:00
Darren Shepherd
778b6c9b85 Merge pull request #878 from joshwget/fix-system-service-environment-variables
Fix environment variables set for system services
2016-04-13 09:50:15 -07:00
Josh Curl
e31b955b0a Fix environment variables set for system services 2016-04-12 22:59:37 -07:00
Darren Shepherd
dcba30813c Merge pull request #875 from joshwget/fix-dns-override
If DNS override is set, pass `--nohook resolv.conf` to dhcpd
2016-04-12 10:14:36 -07:00
Darren Shepherd
0c4057346a Merge pull request #876 from rancher/revert-870-check-validity-of-service-name
Revert "Check the validity of the service name"
2016-04-12 10:02:08 -07:00
Darren Shepherd
56ae343b79 Merge pull request #877 from joshwget/remove-boot-flag
Remove --boot flag in `ros config export`
2016-04-12 10:01:54 -07:00
Josh Curl
60ecf3d547 If DNS override is set, pass --nohook resolv.conf to dhcpd 2016-04-12 09:57:14 -07:00
Josh Curl
97774f78a9 Remove --boot flag in ros config export 2016-04-11 22:07:59 -07:00
Josh Curl
a9409dc5be Revert "Check the validity of the service name" 2016-04-11 22:06:46 -07:00
Denise
99e5d08c27 Update README.md 2016-04-11 09:32:51 -07:00
Darren Shepherd
2a99724fbf Merge pull request #862 from joshwget/network-after-cloud-init
Apply network configurations again after cloud-init
2016-04-08 14:47:28 -07:00
Josh Curl
173874f196 Apply network configurations again after cloud-init 2016-04-08 13:04:35 -07:00
Darren Shepherd
0dcb7138a2 Merge pull request #870 from datawolf/check-validity-of-service-name
Check the validity of the service name
2016-04-08 10:48:12 -07:00
Wang Long
5180c7e937 Check the validity of the service name
if user want to switch to `ubuntu-console` and type the wrong
service name `ubuntu-consile`, the command `sudo ros service enable
ubuntu-consile` run with no error. after the reboot, the console is
still the busybox console.

It is better to Warn user that the `ubuntu-consile` is no a valid
service name.

This patch also check the validity of the service name when disable and
delete service.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-08 19:05:53 +08:00
Darren Shepherd
099b8f6f4a Merge pull request #864 from datawolf/fix-lay-down-os-error
fix lay-down-os error
2016-04-07 10:52:10 -07:00
Wang Long
69cb33b26c fix lay-down-os error
option `-k` does not need an argument and `-a` need one.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
2016-04-07 11:09:09 +08:00
Darren Shepherd
d6676857b0 Merge pull request #858 from imikushin/bump-kernel
bump os-kernel to Ubuntu-4.2.0-34.39-rancher
2016-04-05 10:01:43 -07:00
Darren Shepherd
16281ec809 Merge pull request #859 from rancher/revert-834-unmarshal-args-as-yaml
Revert "Use yaml.Unmarshal to handle config arguments"
2016-04-05 10:01:10 -07:00
Josh Curl
8f6ee9ee05 Revert "Use yaml.Unmarshal to handle config arguments" 2016-04-05 10:00:12 -07:00
Ivan Mikushin
788b7308f9 bump os-kernel to Ubuntu-4.2.0-34.39-rancher 2016-04-05 09:47:29 -07:00
Darren Shepherd
07faa92c7f Merge pull request #820 from imikushin/kexec-kernel-args
Add --append to `ros os upgrade` to pass kernel args for --kexec
2016-04-04 13:41:11 -07:00
Darren Shepherd
5694f371d5 Merge pull request #821 from imikushin/replace-curl
Replace curl with wget in Makefile
2016-04-04 13:29:51 -07:00
Darren Shepherd
6a3367ce24 Merge pull request #825 from imikushin/qemu-arm
Run tests on qemu-system-aarch64
2016-04-04 11:33:39 -07:00
Darren Shepherd
d1314684a9 Merge pull request #851 from joshwget/vbox-modules-amd64-only
Only get VirtualBox modules for amd64
2016-04-02 19:14:48 -07:00
Ivan Mikushin
0f6cf07786 make tests run on arm64 2016-04-01 16:18:27 -07:00
Josh Curl
5e83100aa4 Only get VirtualBox modules for amd64 2016-04-01 10:09:45 -07:00
Darren Shepherd
97e0c01666 Merge pull request #848 from joshwget/show-default-values
`ros config get` shows default values
2016-04-01 09:21:03 -07:00