Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

grub2: reset NeedUpdate flag after setup grub

Browse Source 
Print log when fixing settings.

tower: https://tower.im/projects/3b99b1824fd74228be438acd3189fb7b/todos/17ab886cf63446c682e0143de43598b5/#a702e07f03c445d1b00f961fce2c7e09
Change-Id: I77d4797681c549343782065dfd9d9ebf81dd8864
This commit is contained in:
xufasheng 2015-01-08 19:55:06 +08:00
parent 7df0cf019c
commit 04983a5a69
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grub2/grub2.go
View File

@ -234,18 +234,21 @@ func (grub *Grub2) doFixSettings() (needUpdate bool) {
// reset properties, return default value for the missing property
// default entry
if grub.config.DefaultEntry != grub.doGetSettingDefaultEntry() {
logger.Infof("fix setting DefaultEntry %s->%s", grub.doGetSettingDefaultEntry(), grub.config.DefaultEntry)
needUpdate = true
}
grub.doSetSettingDefaultEntry(grub.config.DefaultEntry)
// timeout
if grub.config.Timeout != grub.doGetSettingTimeout() {
logger.Infof("fix setting Timeout %s->%s", grub.doGetSettingTimeout(), grub.config.Timeout)
needUpdate = true
}
grub.doSetSettingTimeout(grub.config.Timeout)
// gfxmode
if grub.config.Resolution != grub.doGetSettingGfxmode() {
logger.Infof("fix setting Resolution %s->%s", grub.doGetSettingGfxmode(), grub.config.Resolution)
needUpdate = true
}
grub.doSetSettingGfxmode(grub.config.Resolution)
@ -253,6 +256,7 @@ func (grub *Grub2) doFixSettings() (needUpdate bool) {
// disable GRUB_HIDDEN_TIMEOUT and GRUB_HIDDEN_TIMEOUT_QUIET which will conflicts with GRUB_TIMEOUT
if len(grub.settings["GRUB_HIDDEN_TIMEOUT"]) != 0 ||
len(grub.settings["GRUB_HIDDEN_TIMEOUT_QUIET"]) != 0 {
logger.Info("fix setting GRUB_HIDDEN_TIMEOUT")
grub.settings["GRUB_HIDDEN_TIMEOUT"] = ""
grub.settings["GRUB_HIDDEN_TIMEOUT_QUIET"] = ""
needUpdate = true
@ -260,6 +264,7 @@ func (grub *Grub2) doFixSettings() (needUpdate bool) {
// disable GRUB_BACKGROUND
if grub.settings["GRUB_BACKGROUND"] != "<none>" {
logger.Info("fix setting GRUB_BACKGROUND")
grub.settings["GRUB_BACKGROUND"] = "<none>"
needUpdate = true
}
@ -267,11 +272,13 @@ func (grub *Grub2) doFixSettings() (needUpdate bool) {
// setup deepin grub2 theme
if grub.config.EnableTheme {
if grub.doGetSettingTheme() != themeMainFile {
logger.Infof("fix setting theme %s->%s", grub.doGetSettingTheme(), themeMainFile)
grub.doSetSettingTheme(themeMainFile)
needUpdate = true
}
} else {
if grub.doGetSettingTheme() != "" {
logger.Infof("fix setting theme %s->%s", grub.doGetSettingTheme(), "<disabled>")
grub.doSetSettingTheme("")
needUpdate = true
}

3
grub2/setup.go
View File

@ -40,6 +40,9 @@ func (grub *Grub2) Setup(gfxmode string) {
// write settings
grub.writeSettings()
// reset NeedUpdate flag for that will run update-grub always
// after setup grub
grub.config.NeedUpdate = false
grub.config.save()
// setup theme and generate theme background