1
0
mirror of https://github.com/rancher/os.git synced 2025-07-16 08:05:51 +00:00
Commit Graph

2255 Commits

Author SHA1 Message Date
Chris Marchesi
2f8eaa3314
cmd/power: Set correct container name and ensure full command executed
This fixes a few issues that are preventing shutdown and friends from
behaving correctly:

* The command name, which is being used to determine via what command it
was being called (ie: shutdown, reboot, or halt) was not being parsed
for absolute paths. This was preventing certain logic from being handled
(example: enforcing a static time value of "now" for shutdown), but more
problematically was the fact that it was being used as the container
name being passed to runDocker, the function that launches the
independent shutdown container. This was causing the shutdown container
to fail as something like "/sbin/shutdown" is not a valid name for a
container. The logic to parse out the base command being run is actually
present in runDocker, but does not run if a name is supplied to the
function.

* Further, the command line was not being parsed in the shutdown
container if the name supplied to runDocker was non-empty. Rather, the
full command to run just became the name of the container. Hence,
something like "/sbin/shutdown -h now" became just "shutdown", executing
the default power off behaviour for all actions (including reboots).

* Further to this, open-vm-tools expects "/sbin/shutdown -h now" to be a
valid command to halt the system, which was not being recognized as the
only recognized short-form halt flag in shutdown was its capital version
(-H).

This fixes these three issues by parsing out the base of the called
command before sending it to reboot, using all of os.Argv as the command
line to run regardless of if a name was set for the container or not,
and finally adding the lowercase -h switch to the "shutdown" form of
this command ("halt" is still uppercase only).

Fixes rancher/os#2121.
Fixes rancher/os#2074.
2017-10-20 17:09:13 -07:00
Sven Dowideit
d8bba34a87 Merge pull request #2108 from SvenDowideit/update-the-kernel-module-docs
We don't use the Ubuntu kernels and DKMS anymore
2017-09-18 15:44:16 +10:00
Sven Dowideit
fda647eec3 Merge pull request #2106 from SvenDowideit/rpi64-4.9.50
rpi64 linux kernel 4.9.50
2017-09-18 15:43:51 +10:00
Sven Dowideit
f7327d764f Merge pull request #2104 from SvenDowideit/http-proxy-fix
Refactor a little so 'ros os list' also uses the configured proxy info
2017-09-18 15:43:38 +10:00
Sven Dowideit
d1971fbd0e Merge pull request #2099 from SvenDowideit/kubelet-volume-for-cadvisor
Quick fix to allow CAdvisor and kubelet to work
2017-09-18 15:43:23 +10:00
Sven Dowideit
5d82fcb029 we don't use DKMS anymore
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-18 13:35:48 +10:00
Sven Dowideit
0b8b0dc1e1 We don't use the Ubuntu kernels and DKMS anymore
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-18 13:33:22 +10:00
Sven Dowideit
2751745a59 rpi64 linux kernel 4.9.50
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-16 12:42:37 +00:00
Sven Dowideit
4769f143cf set the http_proxy env vars for the consoles
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-15 23:38:15 +10:00
Sven Dowideit
baee5d18ea Refactor a little so 'ros os list' also uses the configured proxy info
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-15 13:47:21 +10:00
Sven Dowideit
28a487018e Quick fix to allow CAdvisor and kubelet to work
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-14 10:55:17 +10:00
Sven Dowideit
1b3395523c Merge pull request #2094 from rancher/revert-2070-master
Revert "Only add SSH configuration lines that are not set"
2017-09-13 22:08:34 +10:00
Sven Dowideit
a608098c39 Revert "Only add SSH configuration lines that are not set" 2017-09-13 22:07:52 +10:00
Sven Dowideit
4b6ffe752e Merge pull request #2089 from SvenDowideit/add-dhcp-debug-hook
add a debug dump of the dhcp server
2017-09-13 16:21:31 +10:00
Sven Dowideit
af000395b4 Merge pull request #2093 from SvenDowideit/bootstrap-logging
Make the bootstrap phase logable
2017-09-13 16:20:55 +10:00
Sven Dowideit
b92a7752f4 Make the bootstrap phase logable
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-13 16:13:15 +10:00
Sven Dowideit
42ae262c3f add alog rotate for the dhcpcd.debug.log file
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 21:07:43 +10:00
Sven Dowideit
ab9f22a954 make DHCP even debug print conditional on rancher.debug=true
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 20:56:19 +10:00
Sven Dowideit
a97854e089 add a debug dump of the dhcp server
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 16:04:18 +10:00
Sven Dowideit
449633abaa Merge pull request #2088 from SvenDowideit/ros-service-logs-f
allow shortened version: ros s logs -f network
2017-09-12 15:05:12 +10:00
Sven Dowideit
fa14b6960b Merge pull request #2086 from SvenDowideit/add-autoformat-logging
Log autoformat script output to /var/log/boot/autoformat.log
2017-09-12 15:04:41 +10:00
Sven Dowideit
2d65164e57 Merge pull request #2087 from SvenDowideit/another-resolv.conf-race
dhcpcd overwrites resolv.conf when releasing a lease
2017-09-12 15:04:16 +10:00
Sven Dowideit
21714bb8d3 allow shortened version: ros s logs -f network
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 15:04:03 +10:00
Sven Dowideit
5e57bc0c99 dhcpcd overwrites resolv.conf when releasing a lease
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 15:00:20 +10:00
Sven Dowideit
7feee617a7 Log autoformat script output to /var/log/boot/autoformat.log
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 13:54:28 +10:00
Sven Dowideit
6214ab5c19 Merge pull request #2084 from SvenDowideit/linux-4.9.49
linux kernel 4.9.49
2017-09-12 11:24:30 +10:00
Sven Dowideit
70bcc448b7 linux kernel 4.9.49
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-12 11:23:50 +10:00
Sven Dowideit
86574b8b61 Merge pull request #2070 from vincent99/master
Only add SSH configuration lines that are not set
2017-09-12 11:12:34 +10:00
Vincent Fiduccia
6a87cc6556
Only add ssh options that aren't set 2017-09-01 01:10:57 -07:00
Sven Dowideit
f34acf272c Merge pull request #2069 from SvenDowideit/linux-4.9.46
linux-4.9.46
2017-09-01 13:33:06 +10:00
Sven Dowideit
bd8e8d051b linux-4.9.46
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-09-01 03:32:23 +00:00
Sven Dowideit
bb0cc11e93 Merge pull request #2068 from SvenDowideit/v1.1.0-docs
V1.1.0 docs
2017-09-01 12:08:14 +10:00
Sven Dowideit
8b5efd8d47 update version numbers and AMIs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-30 13:48:01 +10:00
Sven Dowideit
48b2dee10e Add v1.0 and v1.1 navigation
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-30 13:00:55 +10:00
Sven Dowideit
35612e3221 fix VMWare guestinfo table
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-30 12:38:31 +10:00
Sven Dowideit
7e7c134a80 Merge pull request #2067 from SvenDowideit/remove-hypervisor-yml-check
Remove the hypervisor yml file check, there's a cert problem on first…
2017-08-30 09:39:40 +10:00
Sven Dowideit
27be3cd7b3 Remove the hypervisor yml file check, there's a cert problem on first boot after installing
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-30 09:34:49 +10:00
Sven Dowideit
3b918c4cc9 Allow me to skip the INTEGRATION_TESTS due to network issues
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-29 04:13:57 +00:00
Sven Dowideit
6433676991 Merge pull request #2064 from SvenDowideit/fix-integration-tests
Fix integration tests
2017-08-29 12:08:28 +10:00
Sven Dowideit
abc00e7ca9 17.06.1-ce is now in the repo
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-29 12:03:39 +10:00
Sven Dowideit
cccaaeac86 Add a little more sleep between tests
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-29 12:03:23 +10:00
Sven Dowideit
40148d227f Merge pull request #2062 from SvenDowideit/resolv.conf_race
Stop overwriting a good resolv.conf file with the default one
2017-08-29 10:30:41 +10:00
Sven Dowideit
48d602140c Merge pull request #2063 from SvenDowideit/linux-4.9.45
linux 4.9.45
2017-08-29 10:11:03 +10:00
Sven Dowideit
5dfc818303 Stop overwriting a good resolv.conf file with the default one
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-29 10:10:47 +10:00
Sven Dowideit
0e053faec0 linux 4.9.45
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-29 08:37:16 +10:00
Sven Dowideit
3650b75377 Merge pull request #2056 from SvenDowideit/remove-docker-1.10and1.11
WIP: Remove docker 1.10 and 1.11 support from RancherOS v1.11
2017-08-24 12:57:09 +10:00
Sven Dowideit
f27af999d9 use 17.03.2 for amd64 and 17.03.1 for arm32 and arm64
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-24 12:45:23 +10:00
Sven Dowideit
2e60e54ab0 Disable the RancherOS 0.6.1 Docker 1.13.1 test for now
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-24 12:45:23 +10:00
Sven Dowideit
76e2f24bd8 Docker 1.10 and 1.11 no longer supported by RancherOS v1.1.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2017-08-24 12:45:23 +10:00
Sven Dowideit
15f152ce73 Merge pull request #2061 from SvenDowideit/remove-kgdbboc-from-rpi
the kgdboc cmdline setting seems to have sometimes causing the rpi64 …
2017-08-24 12:34:58 +10:00