particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel84: use New York as default timezone

Browse source 
RHEl 8.4 guest images need to have the default timezone of EST/EDT
unless the user specifies one in their blueprint. New York is a major
location for this timezone.
This commit is contained in:
Jacob Kozol 2021-01-08 16:27:51 +01:00 • committed by Ondřej Budai
parent fc6fbec32f
commit 9d0d5967d6
6 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/distro/rhel84/distro.go
View file

@ -295,6 +295,8 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
if timezone != nil {
p.AddStage(osbuild.NewTimezoneStage(&osbuild.TimezoneStageOptions{Zone: *timezone}))
} else {
p.AddStage(osbuild.NewTimezoneStage(&osbuild.TimezoneStageOptions{Zone: "America/New_York"}))
}
if len(ntpServers) > 0 {

8
test/data/manifests/rhel_84-x86_64-ami-boot.json
View file

@ -3097,6 +3097,12 @@
"language": "en_US"
}
},
{
"name": "org.osbuild.timezone",
"options": {
"zone": "America/New_York"
}
},
{
"name": "org.osbuild.selinux",
"options": {
@ -9216,6 +9222,6 @@
"tuned.service",
"unbound-anchor.timer"
],
"timezone": "UTC"
"timezone": "New_York"
}
}

8
test/data/manifests/rhel_84-x86_64-openstack-boot.json
View file

@ -3336,6 +3336,12 @@
"language": "en_US"
}
},
{
"name": "org.osbuild.timezone",
"options": {
"zone": "America/New_York"
}
},
{
"name": "org.osbuild.users",
"options": {
@ -9844,6 +9850,6 @@
"tuned.service",
"unbound-anchor.timer"
],
"timezone": "UTC"
"timezone": "New_York"
}
}

8
test/data/manifests/rhel_84-x86_64-qcow2-boot.json
View file

@ -3465,6 +3465,12 @@
"language": "en_US"
}
},
{
"name": "org.osbuild.timezone",
"options": {
"zone": "America/New_York"
}
},
{
"name": "org.osbuild.users",
"options": {
@ -10217,6 +10223,6 @@
"tuned.service",
"unbound-anchor.timer"
],
"timezone": "UTC"
"timezone": "New_York"
}
}

8
test/data/manifests/rhel_84-x86_64-vhd-boot.json
View file

@ -3291,6 +3291,12 @@
"language": "en_US"
}
},
{
"name": "org.osbuild.timezone",
"options": {
"zone": "America/New_York"
}
},
{
"name": "org.osbuild.users",
"options": {
@ -9754,6 +9760,6 @@
"unbound-anchor.timer",
"waagent.service"
],
"timezone": "UTC"
"timezone": "New_York"
}
}

8
test/data/manifests/rhel_84-x86_64-vmdk-boot.json
View file

@ -3153,6 +3153,12 @@
"language": "en_US"
}
},
{
"name": "org.osbuild.timezone",
"options": {
"zone": "America/New_York"
}
},
{
"name": "org.osbuild.users",
"options": {
@ -9363,6 +9369,6 @@
"vgauthd.service",
"vmtoolsd.service"
],
"timezone": "UTC"
"timezone": "New_York"
}
}