Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
1d024af4c1 | ||
|
09c690cbe7 | ||
|
49adf19081 | ||
|
46b046c82e |
@@ -11,7 +11,7 @@ import (
|
|||||||
"github.com/coreos/coreos-cloudinit/system"
|
"github.com/coreos/coreos-cloudinit/system"
|
||||||
)
|
)
|
||||||
|
|
||||||
const version = "0.5.0"
|
const version = "0.5.1"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var printVersion bool
|
var printVersion bool
|
||||||
|
12
units/user-cloudinit-proc-cmdline.service
Normal file
12
units/user-cloudinit-proc-cmdline.service
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Load cloud-config from url defined in /proc/cmdline
|
||||||
|
Requires=coreos-setup-environment.service
|
||||||
|
After=coreos-setup-environment.service
|
||||||
|
Before=user-config.target
|
||||||
|
ConditionKernelCommandLine=cloud-config-url
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=yes
|
||||||
|
EnvironmentFile=-/etc/environment
|
||||||
|
ExecStart=/usr/bin/coreos-cloudinit --from-proc-cmdline
|
@@ -6,3 +6,6 @@ After=system-config.target
|
|||||||
# Load user_data placed by coreos-install
|
# Load user_data placed by coreos-install
|
||||||
Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
|
Requires=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
|
||||||
After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
|
After=user-cloudinit@var-lib-coreos\x2dinstall-user_data.service
|
||||||
|
|
||||||
|
Requires=user-cloudinit-proc-cmdline.service
|
||||||
|
After=user-cloudinit-proc-cmdline.service
|
||||||
|
Reference in New Issue
Block a user