Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

op_mode: T6956: Fix for "generate tech-support archive" if /config contains directories #4268

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

natali-rs1985
Copy link
Contributor

Change Summary

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes)
  • Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
  • Other (please describe):

Related Task(s)

Related PR(s)

Component(s) name

op mode

Proposed changes

How to test

vyos@vyos:~$ ls -la /config/scripts/
total 20
drwxrwsr-x 3 root vyattacfg 4096 Dec 27 03:05 .
drwxrwsr-x 1 root vyattacfg 4096 Dec 23 20:35 ..
drwxrwsr-x 2 root vyattacfg 4096 Dec 27 01:52 accel-ppp
-rwxrwxr-x 1 root vyattacfg  230 Dec 20 15:57 vyos-postconfig-bootup.script
-rwxrwxr-x 1 root vyattacfg  225 Dec 20 15:57 vyos-preconfig-bootup.script


vyos@vyos:~$ generate tech-support archive
...
 "config": {
            "scripts": [
                {
                    "path": "/config/scripts/vyos-postconfig-bootup.script",
                    "data": "#!/bin/sh\n# This script is executed at boot time after VyOS configuration is fully applied.\n# Any modifications required to work around unfixed bugs\n# or use services not available through the VyOS CLI system can be placed here."
                },
                {
                    "path": "/config/scripts/vyos-preconfig-bootup.script",
                    "data": "#!/bin/sh\n# This script is executed at boot time before VyOS configuration is applied.\n# Any modifications required to work around unfixed bugs or use\n# services not available through the VyOS CLI system can be placed here."
                },
                {
                    "path": "/config/scripts/accel-ppp/ipoe.lua",
                    "data": "#!lua\n  function username_func(pkt)\n    local username=pkt:hwaddr()\n    return username\nend"
                }
         ]
    }
...

Smoketest result

Checklist:

  • I have read the CONTRIBUTING document
  • I have linked this PR to one or more Phabricator Task(s)
  • I have run the components SMOKETESTS if applicable
  • My commit headlines contain a valid Task id
  • My change requires a change to the documentation
  • I have updated the documentation accordingly

Copy link

👍
No issues in PR Title / Commit Title

Copy link

CI integration ❌ failed!

Details

CI logs

  • CLI Smoketests (no interfaces) ❌ failed
  • CLI Smoketests (interfaces only) ❌ failed
  • Config tests 👍 passed
  • RAID1 tests 👍 passed
  • TPM tests 👍 passed

@dmbaturin dmbaturin merged commit 7447a23 into vyos:current Dec 30, 2024
13 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

3 participants