[pve-devel] [PATCH v2 container 2/2] fix spelling: 'mountpoint' 'mount point'

Fabian Grünbichler f.gruenbichler at proxmox.com
Fri Oct 14 12:51:04 CEST 2016


---
just rebased

 src/PVE/API2/LXC.pm    | 14 +++++++-------
 src/PVE/CLI/pct.pm     |  2 +-
 src/PVE/LXC.pm         |  2 +-
 src/PVE/LXC/Config.pm  | 14 +++++++-------
 src/PVE/LXC/Migrate.pm |  4 ++--
 src/PVE/VZDump/LXC.pm  |  6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index d0e558a..38b1feb 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -276,7 +276,7 @@ __PACKAGE__->register_method({
 	    }
 	}
 
-	die "mountpoints configured, but 'rootfs' not set - aborting\n"
+	die "mount points configured, but 'rootfs' not set - aborting\n"
 	    if !$storage_only_mode && !defined($mp_param->{rootfs});
 
 	# check storage access, activate storage
@@ -358,8 +358,8 @@ __PACKAGE__->register_method({
 
 				if ($mountpoint->{backup}) {
 				    warn "WARNING - unsupported configuration!\n";
-				    warn "backup was enabled for $type mountpoint $ms ('$mountpoint->{mp}')\n";
-				    warn "mountpoint configuration will be restored after archive extraction!\n";
+				    warn "backup was enabled for $type mount point $ms ('$mountpoint->{mp}')\n";
+				    warn "mount point configuration will be restored after archive extraction!\n";
 				    warn "contained files will be restored to wrong directory!\n";
 				}
 				delete $mp_param->{$ms}; # actually delay bind/dev mps
@@ -1254,7 +1254,7 @@ __PACKAGE__->register_method({
 			if ($fullclone->{$opt}) {
 			    die "fixme: full clone not implemented\n";
 			} else {
-			    print "create linked clone of mountpoint $opt ($volid)\n";
+			    print "create linked clone of mount point $opt ($volid)\n";
 			    my $newvolid = PVE::Storage::vdisk_clone($storecfg, $volid, $newid, $snapname);
 			    push @$newvollist, $newvolid;
 			    $mp->{volume} = $newvolid;
@@ -1300,7 +1300,7 @@ __PACKAGE__->register_method({
     method => 'PUT',
     protected => 1,
     proxyto => 'node',
-    description => "Resize a container mountpoint.",
+    description => "Resize a container mount point.",
     permissions => {
 	check => ['perm', '/vms/{vmid}', ['VM.Config.Disk'], any => 1],
     },
@@ -1373,7 +1373,7 @@ __PACKAGE__->register_method({
 	    my (undef, undef, $owner, undef, undef, undef, $format) =
 		PVE::Storage::parse_volname($storage_cfg, $volid);
 
-	    die "can't resize mountpoint owned by another container ($owner)"
+	    die "can't resize mount point owned by another container ($owner)"
 		if $vmid != $owner;
 
 	    die "can't resize volume: $disk if snapshot exists\n"
@@ -1411,7 +1411,7 @@ __PACKAGE__->register_method({
 			$mp->{mp} = '/';
 			my $use_loopdev = (PVE::LXC::mountpoint_mount_path($mp, $storage_cfg))[1];
 			$path = PVE::LXC::query_loopdev($path) if $use_loopdev;
-			die "internal error: CT running but mountpoint not attached to a loop device"
+			die "internal error: CT running but mount point not attached to a loop device"
 			    if !$path;
 			PVE::Tools::run_command(['losetup', '--set-capacity', $path]) if $use_loopdev;
 
diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm
index cf4a014..53a4ec2 100755
--- a/src/PVE/CLI/pct.pm
+++ b/src/PVE/CLI/pct.pm
@@ -227,7 +227,7 @@ __PACKAGE__->register_method ({
 	    my $conf = PVE::LXC::Config->load_config($vmid);
 	    my $storage_cfg = PVE::Storage::config();
 
-	    defined($conf->{$device}) || die "cannot run command on unexisting mountpoint $device\n";
+	    defined($conf->{$device}) || die "cannot run command on non-existing mount point $device\n";
 
 	    my $mount_point = $device eq 'rootfs' ? PVE::LXC::Config->parse_ct_rootfs($conf->{$device}) :
 		PVE::LXC::Config->parse_ct_mountpoint($conf->{$device});
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 35ce796..bf16f8a 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -869,7 +869,7 @@ sub check_ct_modify_config_perm {
 	    return if $delete;
 	    my $data = $opt eq 'rootfs' ? PVE::LXC::Config->parse_ct_rootfs($newconf->{$opt})
 					: PVE::LXC::Config->parse_ct_mountpoint($newconf->{$opt});
-	    raise_perm_exc("mountpoint type $data->{type}") if $data->{type} ne 'volume';
+	    raise_perm_exc("mount point type $data->{type}") if $data->{type} ne 'volume';
 	} elsif ($opt eq 'memory' || $opt eq 'swap') {
 	    $rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Memory']);
 	} elsif ($opt =~ m/^net\d+$/ || $opt eq 'nameserver' ||
diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index e1b159c..dc26ee8 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -237,7 +237,7 @@ my $rootfs_desc = {
     },
     ro => {
 	type => 'boolean',
-	description => 'Read-only mountpoint',
+	description => 'Read-only mount point',
 	optional => 1,
     },
     quota => {
@@ -432,7 +432,7 @@ my $valid_lxc_conf_keys = {
     'lxc.rootfs' => 'lxc.rootfs is auto generated from rootfs',
     'lxc.rootfs.mount' => 1,
     'lxc.rootfs.options' => 'lxc.rootfs.options is not supported' .
-                            ', please use mountpoint options in the "rootfs" key',
+                            ', please use mount point options in the "rootfs" key',
     # lxc.cgroup.*
     'lxc.cap.drop' => 1,
     'lxc.cap.keep' => 1,
@@ -578,18 +578,18 @@ my $mp_desc = {
     %$rootfs_desc,
     backup => {
 	type => 'boolean',
-	description => 'Whether to include the mountpoint in backups.',
-	verbose_description => 'Whether to include the mountpoint in backups '.
-			       '(only used for volume mountpoints).',
+	description => 'Whether to include the mount point in backups.',
+	verbose_description => 'Whether to include the mount point in backups '.
+			       '(only used for volume mount points).',
 	optional => 1,
     },
     mp => {
 	type => 'string',
 	format => 'pve-lxc-mp-string',
 	format_description => 'Path',
-	description => 'Path to the mountpoint as seen from inside the container '.
+	description => 'Path to the mount point as seen from inside the container '.
 		       '(must not contain symlinks).',
-	verbose_description => "Path to the mountpoint as seen from inside the container.\n\n".
+	verbose_description => "Path to the mount point as seen from inside the container.\n\n".
 			       "NOTE: Must not contain any symlinks for security reasons."
     },
 };
diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index 10b2b69..73af6d4 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -62,7 +62,7 @@ sub prepare {
 	}
 
 	my ($storage, $volname) = PVE::Storage::parse_volume_id($volid, 1) if $volid;
-	die "can't determine assigned storage for mountpoint '$ms'\n" if !$storage;
+	die "can't determine assigned storage for mount point '$ms'\n" if !$storage;
 
 	# check if storage is available on both nodes
 	my $scfg = PVE::Storage::storage_check_node($self->{storecfg}, $storage);
@@ -78,7 +78,7 @@ sub prepare {
 	    # only activate if not shared
 	    push @$need_activate, $volid;
 
-	    die "unable to migrate local mountpoint '$volid' while CT is running"
+	    die "unable to migrate local mount point '$volid' while CT is running"
 		if $running;
 	}
 
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 7062bf3..81f2588 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -87,12 +87,12 @@ sub vm_status {
 my $check_mountpoint_empty = sub {
     my ($mountpoint) = @_;
 
-    die "mountpoint '$mountpoint' is not a directory\n" if ! -d $mountpoint;
+    die "mount point '$mountpoint' is not a directory\n" if ! -d $mountpoint;
 
     PVE::Tools::dir_glob_foreach($mountpoint, qr/.*/, sub {
 	my $entry = shift;
 	return if $entry eq '.' || $entry eq '..';
-	die "mountpoint '$mountpoint' not empty\n";
+	die "mount point '$mountpoint' not empty\n";
     });
 };
 
@@ -126,7 +126,7 @@ sub prepare {
 
 	if (!PVE::LXC::Config->mountpoint_backup_enabled($name, $data)) {
 	    push @$exclude_dirs, $mount;
-	    $self->loginfo("excluding $type mountpoint $name ('$mount') from backup");
+	    $self->loginfo("excluding $type mount point $name ('$mount') from backup");
 	    return;
 	}
 
-- 
2.1.4





More information about the pve-devel mailing list