diff --git a/src/internal/system/common.go b/src/internal/system/common.go index a89d61344..aa7437539 100644 --- a/src/internal/system/common.go +++ b/src/internal/system/common.go @@ -11,13 +11,10 @@ import ( "io" "os" "os/exec" - "regexp" "strconv" "strings" "syscall" - "unicode" - grub2 "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.grub2" license "github.com/linuxdeepin/go-dbus-factory/system/com.deepin.license" "github.com/linuxdeepin/go-lib/dbusutil" "github.com/linuxdeepin/go-lib/keyfile" @@ -157,92 +154,6 @@ const ( ErrorNeedCheck JobErrorType = "needCheck" ) -const ( - GrubTitleRollbackPrefix = "BEGIN /etc/grub.d/11_deepin_ab_recovery" - GrubTitleRollbackSuffix = "END /etc/grub.d/11_deepin_ab_recovery" - GrubTitleNormalPrefix = "BEGIN /etc/grub.d/15_immutable" - GrubTitleNormalSuffix = "END /etc/grub.d/15_immutable" -) - -func GetGrubRollbackTitle(grubPath string) string { - return getGrubTitleByPrefix(grubPath, GrubTitleRollbackPrefix, GrubTitleRollbackSuffix) -} - -func GetGrubNormalTitle(grubPath string) string { - return getGrubTitleByPrefix(grubPath, GrubTitleNormalPrefix, GrubTitleNormalSuffix) -} - -func getGrubTitleByPrefix(grubPath string, start, end string) (entryTitle string) { - fileContent, err := os.ReadFile(grubPath) - if err != nil { - logger.Warning(err) - return "" - } - sl := bufio.NewScanner(strings.NewReader(string(fileContent))) - sl.Split(bufio.ScanLines) - needNext := false - for sl.Scan() { - line := sl.Text() - line = strings.TrimSpace(line) - if !needNext { - needNext = strings.Contains(line, start) - } else { - if strings.Contains(line, end) { - logger.Warningf("%v not found %v entry", grubPath, start) - return "" - } - if strings.HasPrefix(line, "menuentry ") { - title, ok := parseTitle(line) - if ok { - entryTitle = title - break - } else { - logger.Warningf("parse entry title failed from: %q", line) - return "" - } - } - } - } - err = sl.Err() - if err != nil { - return "" - } - return entryTitle -} - -// getGrubTitleByIndex index 的起始值是0 -func getGrubTitleByIndex(grub grub2.Grub2, index int) (entryTitle string) { - if grub == nil { - return "" - } - entryList, err := grub.GetSimpleEntryTitles(0) - if err != nil { - logger.Warning(err) - return "" - } - if len(entryList) < index+1 { - logger.Warningf(" index:%v out of range", index) - return "" - } - return entryList[index] -} - -var ( - entryRegexpSingleQuote = regexp.MustCompile(`^ *(menuentry|submenu) +'(.*?)'.*$`) - entryRegexpDoubleQuote = regexp.MustCompile(`^ *(menuentry|submenu) +"(.*?)".*$`) -) - -func parseTitle(line string) (string, bool) { - line = strings.TrimLeftFunc(line, unicode.IsSpace) - if entryRegexpSingleQuote.MatchString(line) { - return entryRegexpSingleQuote.FindStringSubmatch(line)[2], true - } else if entryRegexpDoubleQuote.MatchString(line) { - return entryRegexpDoubleQuote.FindStringSubmatch(line)[2], true - } else { - return "", false - } -} - func HandleDelayPackage(hold bool, packages []string) { action := "unhold" if hold { diff --git a/src/internal/system/common_test.go b/src/internal/system/common_test.go index bd2af0e47..5a58295a4 100644 --- a/src/internal/system/common_test.go +++ b/src/internal/system/common_test.go @@ -32,10 +32,3 @@ func Test_GetCategorySourceMap(t *testing.T) { sourceMap = GetCategorySourceMap() assert.Equal(t, SoftLinkSystemSourceDir, sourceMap[SystemUpdate]) } - -func Test_getGrubTitleByPrefix(t *testing.T) { - title := getGrubTitleByPrefix("./testdata/grub.cfg", "BEGIN /etc/grub.d/10_linux", "END /etc/grub.d/10_linux") - assert.Equal(t, "UnionTech OS Desktop 20 Pro GNU/Linux", title) - title = getGrubTitleByPrefix("./testdata/grub.cfg", "BEGIN /etc/grub.d/11_deepin_ab_recovery", "END /etc/grub.d/11_deepin_ab_recovery") - assert.Equal(t, "回退到 UOS Desktop 20 Professional（2023/5/19 10:33:44）", title) -} diff --git a/src/lastore-daemon/grub.go b/src/lastore-daemon/grub.go deleted file mode 100644 index 1de1318f2..000000000 --- a/src/lastore-daemon/grub.go +++ /dev/null @@ -1,131 +0,0 @@ -// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later - -package main - -import ( - "fmt" - "os/exec" - "strings" - "sync" - "time" - - "github.com/linuxdeepin/lastore-daemon/src/internal/system" - - "github.com/godbus/dbus/v5" - grub2 "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2" - "github.com/linuxdeepin/go-lib/dbusutil" - "github.com/linuxdeepin/go-lib/dbusutil/proxy" - "github.com/linuxdeepin/go-lib/strv" -) - -const ( - grubScriptFile = "/boot/grub/grub.cfg" -) - -type bootEntry uint - -const ( - normalBootEntry bootEntry = iota - rollbackBootEntry -) - -type grubManager struct { - grub grub2.Grub2 -} - -func newGrubManager(sysBus *dbus.Conn, loop *dbusutil.SignalLoop) *grubManager { - m := &grubManager{ - grub: grub2.NewGrub2(sysBus), - } - m.grub.InitSignalExt(loop, true) - return m -} - -// 下次启动默认进入第一个入口启动 -func (m *grubManager) createTempGrubEntry() error { - // loongarch 将GRUB引导加载程序安装到硬盘的引导扇区 - //arch, err := updateplatform.GetArchInfo() - //if err != nil { - // logger.Warning(err) - //} else { - // if arch == "loongarch64" { - // err = exec.Command("grub-install").Run() - // if err != nil { - // return err - // } - // } - //} - err := exec.Command("grub-reboot", "0").Run() - if err != nil { - return err - } - err = exec.Command("update-grub").Run() - if err != nil { - return err - } - return nil -} - -// changeGrubDefaultEntry 设置grub默认入口(社区版可能不需要进行grub设置) -func (m *grubManager) changeGrubDefaultEntry(to bootEntry) error { - var title string - var err error - switch to { - //case rollbackBootEntry: - // title = system.GetGrubRollbackTitle(grubScriptFile) - case normalBootEntry: - title = system.GetGrubNormalTitle(grubScriptFile) - default: - logger.Info("unknown boot entry", to) - return nil - } - if strings.TrimSpace(title) == "" { - return fmt.Errorf("failed to get %v entry form %v", to, grubScriptFile) - } - curEntryTitle, err := m.grub.DefaultEntry().Get(0) - if err != nil { - logger.Warning(err) - return err - } - // 如果DefaultEntry一样，就不再设置了，不然会下面的会超时 - if curEntryTitle == title { - logger.Info("grub default entry need not to change:", curEntryTitle) - return nil - } - logger.Info("try change grub default entry to:", title) - entryTitles, err := m.grub.GetSimpleEntryTitles(0) - if err != nil { - logger.Warning(err) - return err - } - if !strv.Strv(entryTitles).Contains(title) { - return fmt.Errorf("grub no %s entry", title) - } - err = m.grub.SetDefaultEntry(0, title) - if err != nil { - return err - } - var wg sync.WaitGroup - wg.Add(1) - logger.Info("updating grub default entry to ", title) - timer := time.AfterFunc(30*time.Second, func() { - logger.Warning("timeout while waiting for grub to update") - wg.Done() - }) - - _ = m.grub.Updating().ConnectChanged(func(hasValue bool, updating bool) { - if !hasValue { - return - } - if !updating { - logger.Info("successfully updated grub default entry to", title) - wg.Done() - } - }) - wg.Wait() - timer.Stop() - m.grub.RemoveHandler(proxy.RemovePropertiesChangedHandler) - return nil -} diff --git a/src/lastore-daemon/manager.go b/src/lastore-daemon/manager.go index e1ec642bd..c6136ffa5 100644 --- a/src/lastore-daemon/manager.go +++ b/src/lastore-daemon/manager.go @@ -92,7 +92,6 @@ type Manager struct { sysDBusDaemon ofdbus.DBus systemd systemd1.Manager - grub *grubManager userAgents *userAgentMap // 闲时退出时，需要保存数据，启动时需要根据uid,agent sender以及session path完成数据恢复 statusManager *UpdateModeStatusManager updatePlatform *updateplatform.UpdatePlatformManager @@ -140,7 +139,6 @@ func NewManager(service *dbusutil.Service, updateApi system.System, c *config.Co } m.reloadOemConfig(true) m.signalLoop.Start() - m.grub = newGrubManager(service.Conn(), m.signalLoop) m.jobManager = NewJobManager(service, updateApi, m.updateJobList, m.processLogFds) m.immutableManager = newImmutableManager(m.jobManager.handleJobProgressInfo) go m.handleOSSignal() diff --git a/src/lastore-daemon/manager_ifc.go b/src/lastore-daemon/manager_ifc.go index 6d4977aaa..8e521ada4 100644 --- a/src/lastore-daemon/manager_ifc.go +++ b/src/lastore-daemon/manager_ifc.go @@ -646,12 +646,6 @@ func (m *Manager) ConfirmRollback(sender dbus.Sender, confirm bool) *dbus.Error if err != nil { logger.Warning(err) } - if m.grub != nil { - err = m.grub.changeGrubDefaultEntry(normalBootEntry) - if err != nil { - logger.Warning(err) - } - } if needReboot { err := m.PowerOff(sender, true) diff --git a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/Grub2.xml b/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/Grub2.xml deleted file mode 100644 index 919a9f197..000000000 --- a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/Grub2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/auto.go b/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/auto.go deleted file mode 100644 index 9d16c7ba1..000000000 --- a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/auto.go +++ /dev/null @@ -1,210 +0,0 @@ -// Code generated by "./generator ./system/org.deepin.dde.grub2/"; DO NOT EDIT. - -// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later -package grub2 - -import ( - "unsafe" - - "github.com/godbus/dbus/v5" - "github.com/linuxdeepin/go-lib/dbusutil/proxy" -) - -type Grub2 interface { - grub2 // interface org.deepin.dde.Grub2 - proxy.Object -} - -type objectGrub2 struct { - interfaceGrub2 // interface org.deepin.dde.Grub2 - proxy.ImplObject -} - -func NewGrub2(conn *dbus.Conn) Grub2 { - obj := new(objectGrub2) - obj.ImplObject.Init_(conn, "org.deepin.dde.Grub2", "/org/deepin/dde/Grub2") - return obj -} - -type grub2 interface { - GoGetAvailableGfxmodes(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call - GetAvailableGfxmodes(flags dbus.Flags) ([]string, error) - GoGetSimpleEntryTitles(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call - GetSimpleEntryTitles(flags dbus.Flags) ([]string, error) - GoPrepareGfxmodeDetect(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call - PrepareGfxmodeDetect(flags dbus.Flags) error - GoReset(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call - Reset(flags dbus.Flags) error - GoSetDefaultEntry(flags dbus.Flags, ch chan *dbus.Call, entry string) *dbus.Call - SetDefaultEntry(flags dbus.Flags, entry string) error - GoSetEnableTheme(flags dbus.Flags, ch chan *dbus.Call, enabled bool) *dbus.Call - SetEnableTheme(flags dbus.Flags, enabled bool) error - GoSetGfxmode(flags dbus.Flags, ch chan *dbus.Call, gfxmode string) *dbus.Call - SetGfxmode(flags dbus.Flags, gfxmode string) error - GoSetTimeout(flags dbus.Flags, ch chan *dbus.Call, timeout uint32) *dbus.Call - SetTimeout(flags dbus.Flags, timeout uint32) error - ThemeFile() proxy.PropString - DefaultEntry() proxy.PropString - EnableTheme() proxy.PropBool - Gfxmode() proxy.PropString - Timeout() proxy.PropUint32 - Updating() proxy.PropBool -} - -type interfaceGrub2 struct{} - -func (v *interfaceGrub2) GetObject_() *proxy.ImplObject { - return (*proxy.ImplObject)(unsafe.Pointer(v)) -} - -func (*interfaceGrub2) GetInterfaceName_() string { - return "org.deepin.dde.Grub2" -} - -// method GetAvailableGfxmodes - -func (v *interfaceGrub2) GoGetAvailableGfxmodes(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".GetAvailableGfxmodes", flags, ch) -} - -func (*interfaceGrub2) StoreGetAvailableGfxmodes(call *dbus.Call) (gfxModes []string, err error) { - err = call.Store(&gfxModes) - return -} - -func (v *interfaceGrub2) GetAvailableGfxmodes(flags dbus.Flags) ([]string, error) { - return v.StoreGetAvailableGfxmodes( - <-v.GoGetAvailableGfxmodes(flags, make(chan *dbus.Call, 1)).Done) -} - -// method GetSimpleEntryTitles - -func (v *interfaceGrub2) GoGetSimpleEntryTitles(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".GetSimpleEntryTitles", flags, ch) -} - -func (*interfaceGrub2) StoreGetSimpleEntryTitles(call *dbus.Call) (titles []string, err error) { - err = call.Store(&titles) - return -} - -func (v *interfaceGrub2) GetSimpleEntryTitles(flags dbus.Flags) ([]string, error) { - return v.StoreGetSimpleEntryTitles( - <-v.GoGetSimpleEntryTitles(flags, make(chan *dbus.Call, 1)).Done) -} - -// method PrepareGfxmodeDetect - -func (v *interfaceGrub2) GoPrepareGfxmodeDetect(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".PrepareGfxmodeDetect", flags, ch) -} - -func (v *interfaceGrub2) PrepareGfxmodeDetect(flags dbus.Flags) error { - return (<-v.GoPrepareGfxmodeDetect(flags, make(chan *dbus.Call, 1)).Done).Err -} - -// method Reset - -func (v *interfaceGrub2) GoReset(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".Reset", flags, ch) -} - -func (v *interfaceGrub2) Reset(flags dbus.Flags) error { - return (<-v.GoReset(flags, make(chan *dbus.Call, 1)).Done).Err -} - -// method SetDefaultEntry - -func (v *interfaceGrub2) GoSetDefaultEntry(flags dbus.Flags, ch chan *dbus.Call, entry string) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".SetDefaultEntry", flags, ch, entry) -} - -func (v *interfaceGrub2) SetDefaultEntry(flags dbus.Flags, entry string) error { - return (<-v.GoSetDefaultEntry(flags, make(chan *dbus.Call, 1), entry).Done).Err -} - -// method SetEnableTheme - -func (v *interfaceGrub2) GoSetEnableTheme(flags dbus.Flags, ch chan *dbus.Call, enabled bool) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".SetEnableTheme", flags, ch, enabled) -} - -func (v *interfaceGrub2) SetEnableTheme(flags dbus.Flags, enabled bool) error { - return (<-v.GoSetEnableTheme(flags, make(chan *dbus.Call, 1), enabled).Done).Err -} - -// method SetGfxmode - -func (v *interfaceGrub2) GoSetGfxmode(flags dbus.Flags, ch chan *dbus.Call, gfxmode string) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".SetGfxmode", flags, ch, gfxmode) -} - -func (v *interfaceGrub2) SetGfxmode(flags dbus.Flags, gfxmode string) error { - return (<-v.GoSetGfxmode(flags, make(chan *dbus.Call, 1), gfxmode).Done).Err -} - -// method SetTimeout - -func (v *interfaceGrub2) GoSetTimeout(flags dbus.Flags, ch chan *dbus.Call, timeout uint32) *dbus.Call { - return v.GetObject_().Go_(v.GetInterfaceName_()+".SetTimeout", flags, ch, timeout) -} - -func (v *interfaceGrub2) SetTimeout(flags dbus.Flags, timeout uint32) error { - return (<-v.GoSetTimeout(flags, make(chan *dbus.Call, 1), timeout).Done).Err -} - -// property ThemeFile s - -func (v *interfaceGrub2) ThemeFile() proxy.PropString { - return &proxy.ImplPropString{ - Impl: v, - Name: "ThemeFile", - } -} - -// property DefaultEntry s - -func (v *interfaceGrub2) DefaultEntry() proxy.PropString { - return &proxy.ImplPropString{ - Impl: v, - Name: "DefaultEntry", - } -} - -// property EnableTheme b - -func (v *interfaceGrub2) EnableTheme() proxy.PropBool { - return &proxy.ImplPropBool{ - Impl: v, - Name: "EnableTheme", - } -} - -// property Gfxmode s - -func (v *interfaceGrub2) Gfxmode() proxy.PropString { - return &proxy.ImplPropString{ - Impl: v, - Name: "Gfxmode", - } -} - -// property Timeout u - -func (v *interfaceGrub2) Timeout() proxy.PropUint32 { - return &proxy.ImplPropUint32{ - Impl: v, - Name: "Timeout", - } -} - -// property Updating b - -func (v *interfaceGrub2) Updating() proxy.PropBool { - return &proxy.ImplPropBool{ - Impl: v, - Name: "Updating", - } -} diff --git a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/auto_mock.go b/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/auto_mock.go deleted file mode 100644 index 088b80ac5..000000000 --- a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/auto_mock.go +++ /dev/null @@ -1,263 +0,0 @@ -// Code generated by "./generator ./system/org.deepin.dde.grub2/"; DO NOT EDIT. - -// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: GPL-3.0-or-later -package grub2 - -import ( - "fmt" - - "github.com/godbus/dbus/v5" - "github.com/linuxdeepin/go-lib/dbusutil/proxy" - "github.com/stretchr/testify/mock" -) - -type MockGrub2 struct { - MockInterfaceGrub2 // interface org.deepin.dde.Grub2 - proxy.MockObject -} - -type MockInterfaceGrub2 struct { - mock.Mock -} - -// method GetAvailableGfxmodes - -func (v *MockInterfaceGrub2) GoGetAvailableGfxmodes(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - mockArgs := v.Called(flags, ch) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) GetAvailableGfxmodes(flags dbus.Flags) ([]string, error) { - mockArgs := v.Called(flags) - - ret0, ok := mockArgs.Get(0).([]string) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0, mockArgs.Error(1) -} - -// method GetSimpleEntryTitles - -func (v *MockInterfaceGrub2) GoGetSimpleEntryTitles(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - mockArgs := v.Called(flags, ch) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) GetSimpleEntryTitles(flags dbus.Flags) ([]string, error) { - mockArgs := v.Called(flags) - - ret0, ok := mockArgs.Get(0).([]string) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0, mockArgs.Error(1) -} - -// method PrepareGfxmodeDetect - -func (v *MockInterfaceGrub2) GoPrepareGfxmodeDetect(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - mockArgs := v.Called(flags, ch) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) PrepareGfxmodeDetect(flags dbus.Flags) error { - mockArgs := v.Called(flags) - - return mockArgs.Error(0) -} - -// method Reset - -func (v *MockInterfaceGrub2) GoReset(flags dbus.Flags, ch chan *dbus.Call) *dbus.Call { - mockArgs := v.Called(flags, ch) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) Reset(flags dbus.Flags) error { - mockArgs := v.Called(flags) - - return mockArgs.Error(0) -} - -// method SetDefaultEntry - -func (v *MockInterfaceGrub2) GoSetDefaultEntry(flags dbus.Flags, ch chan *dbus.Call, entry string) *dbus.Call { - mockArgs := v.Called(flags, ch, entry) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) SetDefaultEntry(flags dbus.Flags, entry string) error { - mockArgs := v.Called(flags, entry) - - return mockArgs.Error(0) -} - -// method SetEnableTheme - -func (v *MockInterfaceGrub2) GoSetEnableTheme(flags dbus.Flags, ch chan *dbus.Call, enabled bool) *dbus.Call { - mockArgs := v.Called(flags, ch, enabled) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) SetEnableTheme(flags dbus.Flags, enabled bool) error { - mockArgs := v.Called(flags, enabled) - - return mockArgs.Error(0) -} - -// method SetGfxmode - -func (v *MockInterfaceGrub2) GoSetGfxmode(flags dbus.Flags, ch chan *dbus.Call, gfxmode string) *dbus.Call { - mockArgs := v.Called(flags, ch, gfxmode) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) SetGfxmode(flags dbus.Flags, gfxmode string) error { - mockArgs := v.Called(flags, gfxmode) - - return mockArgs.Error(0) -} - -// method SetTimeout - -func (v *MockInterfaceGrub2) GoSetTimeout(flags dbus.Flags, ch chan *dbus.Call, timeout uint32) *dbus.Call { - mockArgs := v.Called(flags, ch, timeout) - - ret, ok := mockArgs.Get(0).(*dbus.Call) - if !ok { - panic(fmt.Sprintf("assert: arguments: 0 failed because object wasn't correct type: %v", mockArgs.Get(0))) - } - - return ret -} - -func (v *MockInterfaceGrub2) SetTimeout(flags dbus.Flags, timeout uint32) error { - mockArgs := v.Called(flags, timeout) - - return mockArgs.Error(0) -} - -// property ThemeFile s - -func (v *MockInterfaceGrub2) ThemeFile() proxy.PropString { - mockArgs := v.Called() - - ret0, ok := mockArgs.Get(0).(*proxy.MockPropString) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0 -} - -// property DefaultEntry s - -func (v *MockInterfaceGrub2) DefaultEntry() proxy.PropString { - mockArgs := v.Called() - - ret0, ok := mockArgs.Get(0).(*proxy.MockPropString) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0 -} - -// property EnableTheme b - -func (v *MockInterfaceGrub2) EnableTheme() proxy.PropBool { - mockArgs := v.Called() - - ret0, ok := mockArgs.Get(0).(*proxy.MockPropBool) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0 -} - -// property Gfxmode s - -func (v *MockInterfaceGrub2) Gfxmode() proxy.PropString { - mockArgs := v.Called() - - ret0, ok := mockArgs.Get(0).(*proxy.MockPropString) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0 -} - -// property Timeout u - -func (v *MockInterfaceGrub2) Timeout() proxy.PropUint32 { - mockArgs := v.Called() - - ret0, ok := mockArgs.Get(0).(*proxy.MockPropUint32) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0 -} - -// property Updating b - -func (v *MockInterfaceGrub2) Updating() proxy.PropBool { - mockArgs := v.Called() - - ret0, ok := mockArgs.Get(0).(*proxy.MockPropBool) - if !ok { - panic(fmt.Sprintf("assert: arguments: %d failed because object wasn't correct type: %v", 0, mockArgs.Get(0))) - } - - return ret0 -} diff --git a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/config.json b/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/config.json deleted file mode 100644 index 39c1e7e13..000000000 --- a/vendor/github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.grub2/config.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Service": "org.deepin.dde.Grub2", - "Objects": [ - { - "Type": "Grub2", - "Path": "/org/deepin/dde/Grub2", - "Interfaces": [ - { - "Name": "org.deepin.dde.Grub2", - "Type": "grub2" - } - ] - } - ] -}