sync with system-config

Signed-off-by: Bao Haojun <baohaojun@gmail.com>