Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support set timezone in ConfigDB #2568

Closed
wants to merge 8 commits into from
Closed

support set timezone in ConfigDB #2568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a1e2dc8
[baseimage] set default locale en_US.UTF-8
richard28530 Aug 27, 2018
c61aadb
[baseimage]set default locale to en_US.UTF-8, clean all other unused
richard28530 Aug 29, 2018
fd7073a
[baseimage] update-locale after locale-gen
richard28530 Sep 3, 2018
6957749
correct update-locale command line
lguohan Sep 11, 2018
de40c27
Merge from Azure/master
richard28530 Feb 14, 2019
ad2ac36
support timezone setting in ConfigDB
richard28530 Feb 14, 2019
b4e92da
[timezone] use -n for non-zero length judgement
richard28530 Feb 15, 2019
9ca4b0a
add double quote
richard28530 Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ sudo cp $IMAGE_CONFIGS/hostname/hostname-config.service $FILESYSTEM_ROOT/etc/sy
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable hostname-config.service
sudo cp $IMAGE_CONFIGS/hostname/hostname-config.sh $FILESYSTEM_ROOT/usr/bin/

# Copy timezone configuration scripts
sudo cp $IMAGE_CONFIGS/timezone/timezone-config.service $FILESYSTEM_ROOT/etc/systemd/system/
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable timezone-config.service
sudo cp $IMAGE_CONFIGS/timezone/timezone-config.sh $FILESYSTEM_ROOT/usr/bin/

# Copy updategraph script and service file
j2 files/build_templates/updategraph.service.j2 | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/updategraph.service
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable updategraph.service
Expand Down
11 changes: 11 additions & 0 deletions files/image_config/timezone/timezone-config.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Unit]
Description=Update timezone based on configdb
Requires=updategraph.service
After=updategraph.service

[Service]
Type=oneshot
ExecStart=/usr/bin/timezone-config.sh

[Install]
WantedBy=multi-user.target
12 changes: 12 additions & 0 deletions files/image_config/timezone/timezone-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash -e

CURRENT_TIMEZONE=`cat /etc/timezone`
TIMEZONE=`sonic-cfggen -d -v DEVICE_METADATA[\'localhost\'][\'timezone\']`

if [ ! $TIMEZONE == "" ]
Copy link
Contributor

@jleveque jleveque Feb 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest if [ -n "$TIMEZONE" ] to test for non-zero length.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified as you suggested

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add double-quotes around $TIMEZONE as I suggested.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add double-quotes around $TIMEZONE as I suggested.
done

then
sudo bash -c "echo $TIMEZONE > /etc/timezone"
sudo bash -c "dpkg-reconfigure -f noninteractive tzdata"
sudo bash -c "systemctl restart rsyslog"
sudo bash -c "systemctl restart cron"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't these already run as root ? Why need "sudo bash -c " ?
Could you use "timedatectl settimezone US/Pacific" to set the timezone instead of directly modifying the files ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left previous company i can't modify this pull request any more.

fi