Skip to content

Commit

Permalink
internal/packer: use new UpdateOpts.NoPassword
Browse files Browse the repository at this point in the history
Updates gokrazy/gokrazy#265
Updates tailscale/tailscale#1866

Signed-off-by: Brad Fitzpatrick <[email protected]>
  • Loading branch information
bradfitz committed Jun 2, 2024
1 parent 34b02e2 commit 9336405
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions internal/packer/packer.go
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,7 @@ func (pack *Pack) logic(programName string) error {
update.Hostname = updateHostname
}

if update.HTTPPassword == "" {
if update.HTTPPassword == "" && !update.NoPassword {

Check failure on line 1245 in internal/packer/packer.go

View workflow job for this annotation

GitHub Actions / build-and-test

update.NoPassword undefined (type *config.UpdateStruct has no field or method NoPassword)
pw, err := ensurePasswordFileExists(updateHostname, defaultPassword)
if err != nil {
return err
Expand Down Expand Up @@ -1374,11 +1374,13 @@ func (pack *Pack) logic(programName string) error {

etc.Dirents = append(etc.Dirents, ssl)

etc.Dirents = append(etc.Dirents, &FileInfo{
Filename: "gokr-pw.txt",
Mode: 0400,
FromLiteral: update.HTTPPassword,
})
if !update.NoPassword {

Check failure on line 1377 in internal/packer/packer.go

View workflow job for this annotation

GitHub Actions / build-and-test

update.NoPassword undefined (type *config.UpdateStruct has no field or method NoPassword)
etc.Dirents = append(etc.Dirents, &FileInfo{
Filename: "gokr-pw.txt",
Mode: 0400,
FromLiteral: update.HTTPPassword,
})
}

etc.Dirents = append(etc.Dirents, &FileInfo{
Filename: "http-port.txt",
Expand Down

0 comments on commit 9336405

Please sign in to comment.