kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 18:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change location of expand-root script and drop .sh extension

Browse source
This commit is contained in:
Marcin Engelmann 2018-01-20 17:46:40 +01:00
parent fe4782bbea
commit 44c5c17bf8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
bootstrapvz/plugins/expand_root/assets/expand-root.sh → bootstrapvz/plugins/expand_root/assets/expand-root
View file

2
bootstrapvz/plugins/expand_root/assets/expand-root.service
View file

@ -8,7 +8,7 @@ After=local-fs.target
Wants=local-fs.target Wants=local-fs.target
[Service] [Service]
ExecStart=/usr/bin/expand-root.sh DEVICE PARTITION FILESYSTEM ExecStart=/usr/local/sbin/expand-root DEVICE PARTITION FILESYSTEM
Type=oneshot Type=oneshot
[Install] [Install]

10
bootstrapvz/plugins/expand_root/tasks.py
View file

@ -34,10 +34,10 @@ class InstallExpandRootScripts(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
expand_root_script = os.path.join(ASSETS_DIR, 'expand-root.sh') expand_root_script = os.path.join(ASSETS_DIR, 'expand-root')
expand_root_service = os.path.join(ASSETS_DIR, 'expand-root.service') expand_root_service = os.path.join(ASSETS_DIR, 'expand-root.service')
expand_root_script_dest = os.path.join(info.root, 'usr/bin/expand-root.sh') expand_root_script_dest = os.path.join(info.root, 'usr/local/sbin/expand-root')
expand_root_service_dest = os.path.join(info.root, 'etc/systemd/system/expand-root.service') expand_root_service_dest = os.path.join(info.root, 'etc/systemd/system/expand-root.service')
filesystem_type = info.manifest.plugins['expand_root'].get('filesystem_type') filesystem_type = info.manifest.plugins['expand_root'].get('filesystem_type')
@ -49,10 +49,10 @@ class InstallExpandRootScripts(Task):
os.chmod(expand_root_script_dest, 0750) os.chmod(expand_root_script_dest, 0750)
shutil.copy(expand_root_service, expand_root_service_dest) shutil.copy(expand_root_service, expand_root_service_dest)
# Expand out options into expand-root.sh script. # Expand out options into expand-root script.
opts = '%s %s %s' % (root_device, root_partition, filesystem_type) opts = '%s %s %s' % (root_device, root_partition, filesystem_type)
sed_i(expand_root_service_dest, r'^ExecStart=/usr/bin/expand-root.sh.*$', sed_i(expand_root_service_dest, r'^ExecStart=/usr/local/sbin/expand-root.*$',
'ExecStart=/usr/bin/expand-root.sh %s' % opts) 'ExecStart=/usr/local/sbin/expand-root %s' % opts)
# Enable systemd service # Enable systemd service
log_check_call(['chroot', info.root, 'systemctl', 'enable', 'expand-root.service']) log_check_call(['chroot', info.root, 'systemctl', 'enable', 'expand-root.service'])