User units #1303
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,7 @@ type Preset struct { | |
| enabled bool | ||
| instantiatable bool | ||
| instances []string | ||
| scope util.UnitScope | ||
| } | ||
|
|
||
| // warnOnOldSystemdVersion checks the version of Systemd | ||
|
|
@@ -71,35 +72,33 @@ func (s *stage) createUnits(config types.Config) error { | |
| if err != nil { | ||
| return err | ||
| } | ||
| key := fmt.Sprintf("%s.%s-%s", util.GetUnitScope(unit), unitName, identifier) | ||
| if _, ok := presets[key]; ok { | ||
| presets[key].instances = append(presets[key].instances, instance) | ||
| } else { | ||
| presets[key] = &Preset{unitName, *unit.Enabled, true, []string{instance}, util.GetUnitScope(unit)} | ||
| } | ||
| } else { | ||
| key := fmt.Sprintf("%s-%s", unit.Key(), identifier) | ||
| if _, ok := presets[key]; !ok { | ||
| presets[key] = &Preset{unit.Name, *unit.Enabled, false, []string{}, util.GetUnitScope(unit)} | ||
| } else { | ||
| return fmt.Errorf("%q key is already present in the presets map", key) | ||
| } | ||
| } | ||
| } | ||
| if unit.Mask != nil { | ||
| if *unit.Mask { // mask: true | ||
| if err := s.Logger.LogOp( | ||
| func() error { | ||
| var err error = s.MaskUnit(unit) | ||
| return err | ||
| }, | ||
| "masking unit %q for scope %q", unit.Name, string(util.GetUnitScope(unit)), | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
There was a problem hiding this comment. How are we now handling relabeling of mask symlinks? There was a problem hiding this comment. They are already relabeled at write time ... do we need to ensure relabelling when symlink is changed to /dev/null or else ? |
||
|
|
||
| } else { // mask: false | ||
| masked, err := s.IsUnitMasked(unit) | ||
| if err != nil { | ||
|
|
@@ -110,7 +109,7 @@ func (s *stage) createUnits(config types.Config) error { | |
| func() error { | ||
| return s.UnmaskUnit(unit) | ||
| }, | ||
| "unmasking unit %q for scope %q", unit.Name, string(util.GetUnitScope(unit)), | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -120,7 +119,7 @@ func (s *stage) createUnits(config types.Config) error { | |
| } | ||
| // if we have presets then create the systemd preset file. | ||
| if len(presets) != 0 { | ||
| if err := s.createSystemdPresetFiles(presets); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
@@ -147,12 +146,8 @@ func parseInstanceUnit(unit types.Unit) (string, string, error) { | |
|
|
||
| // createSystemdPresetFile creates the presetfile for enabled/disabled | ||
| // systemd units. | ||
| func (s *stage) createSystemdPresetFiles(presets map[string]*Preset) error { | ||
| hasInstanceUnit := false | ||
| // sort the units before writing to the systemd presets file to ensure | ||
| // the file is written in a consistent order across multiple runs | ||
| unitNames := make([]string, 0, len(presets)) | ||
|
|
@@ -164,6 +159,9 @@ func (s *stage) createSystemdPresetFile(presets map[string]*Preset) error { | |
| for _, name := range unitNames { | ||
| value := presets[name] | ||
| unitString := value.unit | ||
| if err := s.relabelPath(filepath.Join(s.DestDir, s.SystemdPresetPath(value.scope))); err != nil { | ||
| return err | ||
| } | ||
| if value.instantiatable { | ||
| hasInstanceUnit = true | ||
| // Let's say we have two instantiated enabled units listed under | ||
|
|
@@ -173,15 +171,15 @@ func (s *stage) createSystemdPresetFile(presets map[string]*Preset) error { | |
| } | ||
| if value.enabled { | ||
| if err := s.Logger.LogOp( | ||
| func() error { return s.EnableUnit(unitString, value.scope) }, | ||
| "setting %q preset to enabled for %q", value.scope, unitString, | ||
| ); err != nil { | ||
| return err | ||
| } | ||
| } else { | ||
| if err := s.Logger.LogOp( | ||
| func() error { return s.DisableUnit(unitString, value.scope) }, | ||
| "setting %q preset to disabled for %q", value.scope, unitString, | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -203,55 +201,61 @@ func (s *stage) createSystemdPresetFile(presets map[string]*Preset) error { | |
| // applies to the unit's dropins. | ||
| func (s *stage) writeSystemdUnit(unit types.Unit) error { | ||
| return s.Logger.LogOp(func() error { | ||
| for _, dropin := range unit.Dropins { | ||
| if dropin.Contents == nil { | ||
| continue | ||
| } | ||
| fetchops, err := s.FilesFromSystemdUnitDropin(unit, dropin) | ||
| if err != nil { | ||
| s.Logger.Crit("error converting systemd dropin: %v", err) | ||
| return err | ||
| } | ||
| for _, f := range fetchops { | ||
| relabeledDropinDir := false | ||
| // trim off prefix since this needs to be relative to the sysroot | ||
| if !strings.HasPrefix(f.Node.Path, s.DestDir) { | ||
| panic(fmt.Sprintf("Dropin path %s isn't under prefix %s", f.Node.Path, s.DestDir)) | ||
| } | ||
| relabelPath := f.Node.Path[len(s.DestDir):] | ||
| if err := s.Logger.LogOp( | ||
| func() error { return s.PerformFetch(f) }, | ||
| "writing systemd drop-in %q at %q", dropin.Name, f.Node.Path, | ||
| ); err != nil { | ||
| return err | ||
| } | ||
| if !relabeledDropinDir { | ||
| s.relabel(filepath.Dir(relabelPath)) | ||
| relabeledDropinDir = true | ||
|
There was a problem hiding this comment. This assumes Overall I'm wondering if it'd be better to have a separate preparatory PR that teaches the relabeling infrastructure to avoid redundant relabeling, so the rest of the codebase doesn't need to think about it anymore. These individual checks are annoying to maintain. There was a problem hiding this comment. I agree, that's why I did it on a previous commit : #1303 (comment) There was a problem hiding this comment. Yep, you did. 🙂 Since it's a cleanup that isn't directly related to this PR, and it's not a tiny change (since it'll allow some existing code to be simplified), it'd be better to move that change to a separate PR that can land first. |
||
| } | ||
| } | ||
| } | ||
|
|
||
| if cutil.NilOrEmpty(unit.Contents) { | ||
| return nil | ||
| } | ||
|
|
||
| fetchops, err := s.FilesFromSystemdUnit(unit) | ||
| if err != nil { | ||
| s.Logger.Crit("error converting unit: %v", err) | ||
| return err | ||
| } | ||
|
|
||
| for _, f := range fetchops { | ||
| // trim off prefix since this needs to be relative to the sysroot | ||
| if !strings.HasPrefix(f.Node.Path, s.DestDir) { | ||
| panic(fmt.Sprintf("Unit path %s isn't under prefix %s", f.Node.Path, s.DestDir)) | ||
| } | ||
| relabelPath := f.Node.Path[len(s.DestDir):] | ||
| if err := s.Logger.LogOp( | ||
| func() error { return s.PerformFetch(f) }, | ||
| "writing unit %q at %q", unit.Name, f.Node.Path, | ||
| ); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| s.relabel(relabelPath) | ||
| } | ||
|
|
||
| return nil | ||
| }, "processing unit %q for scope %q", unit.Name, string(util.GetUnitScope(unit))< 4586 /span>) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.