github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-23 19:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3417 from hyperized/patch-1

Browse Source 
Fix label argument mkfs.btrfs
This commit is contained in:
Rolf Neugebauer 2019-09-30 12:54:07 +02:00 committed by GitHub
commit 648d0729d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cadvisor.yml
View File

@ -15,7 +15,7 @@ onboot:
- name: sysfs
image: linuxkit/sysfs:v0.7
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib/docker"]

2
examples/dm-crypt-loop.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.7
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "/dev/sda"]
- name: mount
image: linuxkit/mount:v0.7

2
examples/dm-crypt.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.7
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "/dev/sda"]
- name: dm-crypt
image: linuxkit/dm-crypt:v0.7

2
examples/docker-for-mac.yml
View File

@ -20,7 +20,7 @@ onboot:
image: linuxkit/binfmt:v0.7
# Format and mount the disk image in /var/lib/docker
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib"]

2
examples/docker.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs
image: linuxkit/sysfs:v0.7
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib/docker"]

2
examples/swap.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/dhcpcd:v0.7
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/external"]

2
pkg/format/format.go
View File

@ -197,7 +197,7 @@ func format(d, label, fsType string, forced bool) error {
case "btrfs":
btrfsArgs := []string{"-f"}
if label != "" {
btrfsArgs = append(btrfsArgs, []string{"-l", label}...)
btrfsArgs = append(btrfsArgs, []string{"-L", label}...)
}
mkfsArgs = append(mkfsArgs, btrfsArgs...)
case "xfs":

2
projects/compose/compose-dynamic.yml
View File

@ -15,7 +15,7 @@ onboot:
image: linuxkit/dhcpcd:v0.7
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib/docker"]

2
projects/compose/compose-static.yml
View File

@ -15,7 +15,7 @@ onboot:
image: linuxkit/dhcpcd:v0.7
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib/docker"]

2
test/cases/030_security/000_docker-bench/test.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs
image: linuxkit/sysfs:v0.7
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib/docker"]

2
test/cases/040_packages/003_containerd/test.yml
View File

@ -13,7 +13,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.7
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib"]

2
test/cases/040_packages/005_extend/000_ext4/test-create.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
- name: mount
image: linuxkit/mount:v0.7
command: ["/usr/bin/mountie", "/var/lib/docker"]

2
test/cases/040_packages/005_extend/001_btrfs/test-create.yml
View File

@ -9,7 +9,7 @@ onboot:
image: linuxkit/modprobe:v0.7
command: ["modprobe", "btrfs"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-type", "btrfs" ]
- name: mount
image: linuxkit/mount:v0.7

2
test/cases/040_packages/005_extend/002_xfs/test-create.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-type", "xfs"]
- name: mount
image: linuxkit/mount:v0.7

2
test/cases/040_packages/006_format_mount/000_auto/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format"]
- name: mount
image: linuxkit/mount:v0.7

2
test/cases/040_packages/006_format_mount/001_by_label/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-label", "docker"]
- name: mount
image: linuxkit/mount:v0.7

2
test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "@DEVICE@"]
- name: mount
image: linuxkit/mount:v0.7

2
test/cases/040_packages/006_format_mount/003_btrfs/test.yml
View File

@ -9,7 +9,7 @@ onboot:
image: linuxkit/modprobe:v0.7
command: ["modprobe", "btrfs"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-type", "btrfs" ]
- name: mount
image: linuxkit/mount:v0.7

2
test/cases/040_packages/006_format_mount/004_xfs/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-type", "xfs" ]
- name: mount
image: linuxkit/mount:v0.7

10
test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
View File

@ -6,19 +6,19 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sda"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-verbose", "-type", "ext4", "/dev/sdb"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-verbose", "-type", "xfs", "/dev/sda"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-verbose", "-force", "-type", "xfs", "/dev/sdb"]
- name: test
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
binds:
- /check.sh:/check.sh
command: ["sh", "./check.sh"]

4
test/cases/040_packages/006_format_mount/010_multiple/test.yml
View File

@ -6,10 +6,10 @@ init:
- linuxkit/runc:c1f0db27e71d948f3134b31ce76276f843849b0a
onboot:
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-label", "docker"]
- name: format
image: linuxkit/format:v0.7
image: linuxkit/format:65b9e0a76d0b9fb8ac5c5f3bc8d3131109290f56
command: ["/usr/bin/format", "-label", "foo"]
- name: mount
image: linuxkit/mount:v0.7