diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2017-12-18 14:58:15 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2017-12-18 15:24:35 +0100 |
| commit | 28f9451daeac73f91b031470060c883008b4a363 (patch) | |
| tree | db62aad440178f78fada3dba53322e450ae0090f /bin | |
| parent | ef18bb0b9facc2d85db138dd65720c14a33953c5 (diff) | |
| download | Puppet-28f9451daeac73f91b031470060c883008b4a363.tar.gz Puppet-28f9451daeac73f91b031470060c883008b4a363.tar.zst Puppet-28f9451daeac73f91b031470060c883008b4a363.zip | |
Fix install script to take vd type discs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/install_script.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/install_script.sh b/bin/install_script.sh index 15c770c..d9d3808 100755 --- a/bin/install_script.sh +++ b/bin/install_script.sh | |||
| @@ -116,7 +116,7 @@ tar -xzf "\$NAME" | |||
| 116 | 116 | ||
| 117 | echo 'Server = http://archlinux.mirrors.ovh.net/archlinux/\$repo/os/\$arch' > /tmp/root.x86_64/etc/pacman.d/mirrorlist | 117 | echo 'Server = http://archlinux.mirrors.ovh.net/archlinux/\$repo/os/\$arch' > /tmp/root.x86_64/etc/pacman.d/mirrorlist |
| 118 | 118 | ||
| 119 | DEVICE_STR=\$(cat /proc/mounts | grep "/dev/sd.. /mnt/") | 119 | DEVICE_STR=\$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/") |
| 120 | DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1) | 120 | DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1) |
| 121 | MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2) | 121 | MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2) |
| 122 | 122 | ||
| @@ -201,7 +201,7 @@ puppet apply --test \$CODE_PATH/manifests/site.pp | |||
| 201 | EOF | 201 | EOF |
| 202 | 202 | ||
| 203 | cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF | 203 | cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF |
| 204 | DEVICE_STR=\$(cat /proc/mounts | grep "/dev/sd.. /mnt/") | 204 | DEVICE_STR=\$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/") |
| 205 | DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1) | 205 | DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1) |
| 206 | MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2) | 206 | MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2) |
| 207 | 207 | ||