Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
cdist
cdist
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 41
    • Issues 41
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • ungleich-public
  • cdistcdist
  • Merge Requests
  • !852

Merged
Opened Feb 25, 2020 by ssrq@ssrqContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://code.ungleich.ch/ssrq/cdist.git" "fix/explorer/disks"
git checkout -b "ssrq/cdist-fix/explorer/disks" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "ssrq/cdist-fix/explorer/disks"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

explorer/disks: Fix on NetBSD and support Linux w/o lsblk

  • Overview 0
  • Commits 4
  • Pipelines 1
  • Changes 1

I reworked the disks explorer to

  • work on NetBSD where sysctl is at /sbin/sysctl but when you connect by ssh host /bin/sh the PATH does not contain sbin directories.
  • Added code to make it work on Linux installations without lsblk

Another remark:
It is unclear to me in the type which devices should be returned and which not. By the exclusion list in the Linux section CD-ROMs, floppies and RAM disks should be filtered, but what about loopback, nbd, MMC boot "partitions" (possibly more)?
I'm also not sure if the patterns for the BSDs aren't too restrictive.

Edited Feb 25, 2020 by ssrq
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: ungleich-public/cdist!852
Source branch: fix/explorer/disks

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.