huerta-init.sh

@@ -26,9 +26,9 @@ if ! test -f /etc/modprobe.d/disable-algif.conf; then
 fi
 
 ok "No permitir suspensión"
-sed -re "s/^#(HandleLidSwitch=).*/\1ignore/"
-     -e "s/^#(HandleLidSwitchDocked=).*/\1ignore/"
-     -e "s/^#(LidSwitchIgnoreInhibited=).*/\1no/"
+sed -re "s/^#(HandleLidSwitch=).*/\1ignore/" \
+     -e "s/^#(HandleLidSwitchDocked=).*/\1ignore/" \
+     -e "s/^#(LidSwitchIgnoreInhibited=).*/\1no/" \
      -i /etc/systemd/logind.conf
 
 if ! test -d /root/rap; then
@@ -48,20 +48,22 @@ if ! test -d $node_dir ; then
 fi
 
 ok "Reparando la RAP"
-sed -re "s/^..(:.*)$/02\1/" -i $node_dir/mac
-rm -f $node_dir/hosts/abyayala*
+if test -d $node_dir/mac ; then
+  sed -re "s/^..(:.*)$/02\1/" -i $node_dir/mac
+  rm -f $node_dir/hosts/abyayala*
+fi
 
 NETWORK=comun ./rap add-host $HOSTNAME abyayala
 NETWORK=comun ./rap install $HOSTNAME
 
 if ! test -b /dev/mapper/dm_crypt-1 ; then
   ok "Cifrando el disco, usa la misma contraseña de cifrado que usaste durante la instalación"
-  cryptsetup luksFormat /dev/sdb
+  cryptsetup luksFormat /dev/sda
 fi
 
 if ! test -b /dev/mapper/dm_crypt-1 ; then
   ok "Abriendo el disco cifrado"
-  cryptsetup open /dev/sdb dm_crypt-1
+  cryptsetup open /dev/sda dm_crypt-1
 fi
 
 key_file=/etc/dm_crypt-1.key
@@ -71,11 +73,11 @@ if ! test -f "$key_file" ; then
   dd bs=512 count=4 if=/dev/random iflag=fullblock | install -m 0600 /dev/stdin "$key_file"
 
   ok "Asignando archivo de contraseña"
-  cryptsetup luksAddKey /dev/sdb /etc/dm_crypt-1.key
+  cryptsetup luksAddKey /dev/sda /etc/dm_crypt-1.key
 fi
 
 if ! grep -q dm_crypt-1 /etc/crypttab ; then
-  uuid="`blkid /dev/sdb -o value -p | head -n2 | tail -n 1`"
+  uuid="`blkid /dev/sda -o value -p | head -n2 | tail -n 1`"
 
   ok "Agregando $uuid a /etc/crypttab"
   echo "dm_crypt-1 UUID=$uuid /etc/dm_crypt-1.key luks" >> /etc/crypttab