From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 18 Dec 2017 13:58:15 +0000 (+0100)
Subject: Fix install script to take vd type discs
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=28f9451daeac73f91b031470060c883008b4a363;hp=ef18bb0b9facc2d85db138dd65720c14a33953c5;p=perso%2FImmae%2FProjets%2FPuppet.git

Fix install script to take vd type discs
---

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"
 
 echo 'Server = http://archlinux.mirrors.ovh.net/archlinux/\$repo/os/\$arch' > /tmp/root.x86_64/etc/pacman.d/mirrorlist
 
-DEVICE_STR=\$(cat /proc/mounts | grep "/dev/sd.. /mnt/")
+DEVICE_STR=\$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/")
 DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1)
 MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2)
 
@@ -201,7 +201,7 @@ puppet apply --test \$CODE_PATH/manifests/site.pp
 EOF
 
 cat > $ARCH_HOST_PUPPET_CONFIGURATION_SCRIPT <<EOF
-DEVICE_STR=\$(cat /proc/mounts | grep "/dev/sd.. /mnt/")
+DEVICE_STR=\$(cat /proc/mounts | grep "/dev/[sv]d.. /mnt/")
 DEVICE=\$(echo "\$DEVICE_STR" | cut -d' ' -f1)
 MOUNTPOINT=\$(echo "\$DEVICE_STR" | cut -d' ' -f2)