Merge pull request lxc-webpanel#75 from mohlerm/master

Fixed directories containing a dot not getting accepted as rootfs directory
lovemussell · Sep 17, 2014 · 38fbddf · 38fbddf
2 parents e60bc9e + 73a51ca
commit 38fbddf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lwp.py b/lwp.py
@@ -279,7 +279,7 @@ def edit(container=None):
                 flash(u'CPU shares updated for %s!' % container, 'success')
 
             if form['rootfs'] != cfg['rootfs'] and \
-                    re.match('^[a-zA-Z0-9_/\-]+', form['rootfs']):
+                    re.match('^[a-zA-Z0-9_/\-\.]+', form['rootfs']):
                 lwp.push_config_value('lxc.rootfs', form['rootfs'],
                                       container=container)
                 flash(u'Rootfs updated!' % container, 'success')

diff --git a/templates/edit.html b/templates/edit.html
@@ -112,7 +112,7 @@ <h3 class="head">{{ container|capitalize }}</small>
 			<div class="control-group">
 				<label class="control-label" for="inputRootfs">Root FS</label>
 				<div class="controls">
-					<input pattern="[a-zA-Z0-9_/\-]+" type="text" id="inputRootfs" name="rootfs" value="{{ settings.rootfs }}">
+					<input pattern="[a-zA-Z0-9_/\-\.]+" type="text" id="inputRootfs" name="rootfs" value="{{ settings.rootfs }}">
 					<span class="help-inline"><small>(e.g /var/lib/lxc/{{container}}/rootfs)</small></span>
 				</div>
 			</div>
@@ -193,4 +193,4 @@ <h3 class="head">{{ container|capitalize }}</small>
 			$('#' + elem).val(value);
 		};
 	</script>
-{% endblock %}
+{% endblock %}