Fixes

7f0e82cd · picodotdev · cc19145d · 7f0e82cd · 7f0e82cd · 7f0e82cd
Commit 7f0e82cd authored Feb 09, 2018 by picodotdev
Hide whitespace changes
Inline Side-by-side

Showing with 46 additions and 47 deletions

README.md README.md +1 -0

alis-recovery.sh alis-recovery.sh +7 -5

alis.conf alis.conf +4 -1

alis.sh alis.sh +34 -41

No files found.
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ https://www.archlinux.org/download/
 * https://wiki.archlinux.org/index.php/LVM
 * https://wiki.archlinux.org/index.php/Dm-crypt
 * https://wiki.archlinux.org/index.php/Dm-crypt/Device_encryption
+* https://wiki.archlinux.org/index.php/Dm-crypt/Encrypting_an_entire_system
 * https://wiki.archlinux.org/index.php/Pacman
 * https://wiki.archlinux.org/index.php/Mirrors
 * https://wiki.archlinux.org/index.php/VirtualBox

--- a/alis-recovery.sh
+++ b/alis-recovery.sh
@@ -49,7 +49,9 @@ PARTITION_BIOS=""
 PARTITION_BOOT=""
 PARTITION_ROOT=""
 DEVICE_ROOT=""
-DEVICE_ROOT_MAPPER=""
+LVM_PHISICAL_VOLUME="lvm"
+LVM_VOLUME_GROUP="vg"
+LVM_VOLUME_LOGICAL="root"
 BOOT_DIRECTORY=""
 ESP_DIRECTORY=""
 PARTITION_BOOT_NUMBER=0
@@ -184,14 +186,14 @@ function prepare_partition() {
        umount /mnt/boot
        umount /mnt
    fi
-    if [ -e /dev/mapper/root ]; then
+    if [ -e "/dev/mapper/$LVM_VOLUME_LOGICAL" ]; then
        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-            cryptsetup close root
+            cryptsetup close $LVM_VOLUME_LOGICAL
        fi
    fi
-    if [ -e /dev/mapper/lvm ]; then
+    if [ -e "/dev/mapper/$LVM_PHISICAL_VOLUME" ]; then
        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-            cryptsetup close lvm
+            cryptsetup close $LVM_PHISICAL_VOLUME
        fi
    fi
 }

--- a/alis.conf
+++ b/alis.conf
@@ -24,7 +24,10 @@ KERNELS_COMPRESSION="" # gzip bzip2 lzma xz (also known as lzma2) lzop lz4
 TIMEZONE="/usr/share/zoneinfo/Europe/Madrid"
 LOCALE="es_ES.UTF-8 UTF-8"
 LANG="LANG=es_ES.UTF-8"
+LANGUAGE="LANGUAGE=es_ES:es:en_GB:en"
 KEYMAP="KEYMAP=es"
+FONT=""
+FONT_MAP=""
 HOSTNAME="archlinux"
 ROOT_PASSWORD="archlinux" # Warning: change it!

@@ -43,7 +46,7 @@ DISPLAY_DRIVER="" # xf86-video-intel xf86-video-amdgpu xf86-video-ati nvidia nvi

 # packages (precede package name with ! for not install)
 PACKAGES_PACMAN_INTERNET="!firefox !chromium !apache !nginx !curl !wget !filezilla !sshfs !openssh !transmission-gtk !transmission-qt !amule !geary !thunderbird !empathy !kopete !polari !konversation !liferea !hugo !gnome-boxes"
-PACKAGES_PACMAN_MULTIMEDIA="!gthumb gimp !imagemagick !krita !inkscape !blender !cmus !vlc !easytag !ardour !audacity !ffmpeg !gnome-phone-manager !kdeconnect !gstreamer !gst-plugins-good !gst-plugins-bad !gst-plugins-ugly !bluez !bluez-utils"
+PACKAGES_PACMAN_MULTIMEDIA="!gthumb !gimp !imagemagick !krita !inkscape !blender !cmus !vlc !easytag !ardour !audacity !ffmpeg !gnome-phone-manager !kdeconnect !gstreamer !gst-plugins-good !gst-plugins-bad !gst-plugins-ugly !bluez !bluez-utils"
 PACKAGES_PACMAN_UTILITIES="!eclipse-java !intellij-idea-community-edition !gradle !maven lz4 !meld !dosfstools !ntfs-3g !exfat-utils"
 PACKAGES_PACMAN_DOCUMENTS_AND_TEXT="!libreoffice-fresh !calligra !discount !lyx !vim !calibre"
 PACKAGES_PACMAN_SECURITY="!rsync !gnupg !keepassx2"

--- a/alis.sh
+++ b/alis.sh
@@ -45,10 +45,12 @@ PARTITION_BIOS=""
 PARTITION_BOOT=""
 PARTITION_ROOT=""
 DEVICE_ROOT=""
-DEVICE_ROOT_MAPPER=""
+LVM_VOLUME_PHISICAL="lvm"
+LVM_VOLUME_GROUP="vg"
+LVM_VOLUME_LOGICAL="root"
 BOOT_DIRECTORY=""
 ESP_DIRECTORY=""
-PARTITION_BOOT_NUMBER=0
+#PARTITION_BOOT_NUMBER=0
 UUID_BOOT=""
 UUID_ROOT=""
 PARTUUID_BOOT=""
@@ -213,20 +215,20 @@ function prepare_partition() {
        umount /mnt/boot
        umount /mnt
    fi
-    if [ -e /dev/mapper/root ]; then
+    if [ -e "/dev/mapper/$LVM_VOLUME_LOGICAL" ]; then
        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-            cryptsetup close root
+            cryptsetup close $LVM_VOLUME_LOGICAL
        fi
    fi
-    if [ -e /dev/mapper/lvm ]; then
-        lvremove --force lvm/lvroot
-        vgremove --force /dev/mapper/lvm
-        pvremove /dev/mapper/lvm
+    if [ -e "/dev/mapper/$LVM_VOLUME_PHISICAL" ]; then
+        lvremove --force "$LVM_VOLUME_GROUP-$LVM_VOLUME_LOGICAL"
+        vgremove --force "/dev/mapper/$LVM_VOLUME_GROUP"
+        pvremove "/dev/mapper/$LVM_VOLUME_PHISICAL"
        if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-            cryptsetup close lvm
+            cryptsetup close $LVM_VOLUME_PHISICAL
        fi
    fi
-    partprobe /dev/sda
+    partprobe $DEVICE
 }

 function configure_network() {
@@ -256,47 +258,38 @@ function partition() {
    wipefs -a $DEVICE

    if [ "$BIOS_TYPE" == "uefi" ]; then
-        PARTITION_BOOT="/dev/sda1"
-        PARTITION_ROOT="/dev/sda2"
-        PARTITION_BOOT_NUMBER=1
-        DEVICE_ROOT="/dev/sda2"
-        DEVICE_ROOT_MAPPER="root"
+        PARTITION_BOOT="${DEVICE}1"
+        PARTITION_ROOT="${DEVICE}2"
+        #PARTITION_BOOT_NUMBER=1
+        DEVICE_ROOT="${DEVICE}2"

        parted -s $DEVICE mklabel gpt mkpart primary fat32 1MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on
        sgdisk -t=1:ef00 $DEVICE
    fi

    if [ "$BIOS_TYPE" == "bios" ]; then
-        PARTITION_BIOS="/dev/sda1"
-        PARTITION_BOOT="/dev/sda2"
-        PARTITION_ROOT="/dev/sda3"
-        PARTITION_BOOT_NUMBER=2
-        DEVICE_ROOT="/dev/sda3"
-        DEVICE_ROOT_MAPPER="root"
+        PARTITION_BIOS="${DEVICE}1"
+        PARTITION_BOOT="${DEVICE}2"
+        PARTITION_ROOT="${DEVICE}3"
+        #PARTITION_BOOT_NUMBER=2
+        DEVICE_ROOT="${DEVICE}3"

        parted -s $DEVICE mklabel gpt mkpart primary fat32 1MiB 128MiB mkpart primary $FILE_SYSTEM_TYPE 128MiB 512MiB mkpart primary $FILE_SYSTEM_TYPE 512MiB 100% set 1 boot on
        sgdisk -t=1:ef02 $DEVICE
    fi

-    if [ "$LVM" == "true" ]; then
-        DEVICE_ROOT_MAPPER="lvm"
-    fi
-
    if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
        echo -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" | cryptsetup --key-size=512 --key-file=- luksFormat $PARTITION_ROOT
-        echo -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" | cryptsetup --key-file=- open $PARTITION_ROOT $DEVICE_ROOT_MAPPER
+        echo -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" | cryptsetup --key-file=- open $PARTITION_ROOT $LVM_VOLUME_PHISICAL
        sleep 5
-
-        DEVICE_ROOT="/dev/mapper/$DEVICE_ROOT_MAPPER"
    fi

    if [ "$LVM" == "true" ]; then
-        pvcreate /dev/mapper/$DEVICE_ROOT_MAPPER
-        vgcreate lvm /dev/mapper/$DEVICE_ROOT_MAPPER
-        lvcreate -l 100%FREE -n lvroot $DEVICE_ROOT_MAPPER
+        pvcreate /dev/mapper/$LVM_VOLUME_PHISICAL
+        vgcreate $LVM_VOLUME_GROUP /dev/mapper/$LVM_VOLUME_PHISICAL
+        lvcreate -l 100%FREE -n $LVM_VOLUME_LOGICAL $LVM_VOLUME_GROUP

-        DEVICE_ROOT_MAPPER="lvm-lvroot"
-        DEVICE_ROOT="/dev/mapper/$DEVICE_ROOT_MAPPER"
+        DEVICE_ROOT="/dev/mapper/$LVM_VOLUME_GROUP-$LVM_VOLUME_LOGICAL"
    fi

    if [ "$BIOS_TYPE" == "uefi" ]; then
@@ -390,8 +383,8 @@ function configuration() {
    arch-chroot /mnt hwclock --systohc
    sed -i "s/#$LOCALE/$LOCALE/" /mnt/etc/locale.gen
    arch-chroot /mnt locale-gen
-    echo $LANG > /mnt/etc/locale.conf
-    echo $KEYMAP > /mnt/etc/vconsole.conf
+    echo -e "$LANG\n$LANGUAGE" > /mnt/etc/locale.conf
+    echo -e "$KEYMAP\n$FONT\n$FONT_MAP" > /mnt/etc/vconsole.conf
    echo $HOSTNAME > /mnt/etc/hostname

    if [ -n "$SWAP_SIZE" ]; then
@@ -432,11 +425,13 @@ function mkinitcpio() {
    arch-chroot /mnt sed -i "s/MODULES=()/MODULES=($MODULES)/" /etc/mkinitcpio.conf

    if [ "$LVM" == "true" -a -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-        arch-chroot /mnt sed -i 's/ filesystems / lvm2 encrypt keymap filesystems /' /etc/mkinitcpio.conf
+        arch-chroot /mnt sed -i 's/ block / keyboard keymap block /' /etc/mkinitcpio.conf
+        arch-chroot /mnt sed -i 's/ filesystems keyboard / encrypt lvm2 filesystems /' /etc/mkinitcpio.conf
    elif [ "$LVM" == "true" ]; then
        arch-chroot /mnt sed -i 's/ filesystems / lvm2 filesystems /' /etc/mkinitcpio.conf
    elif [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-        arch-chroot /mnt sed -i 's/ filesystems / encrypt keymap filesystems /' /etc/mkinitcpio.conf
+        arch-chroot /mnt sed -i 's/ block / keyboard keymap block /' /etc/mkinitcpio.conf
+        arch-chroot /mnt sed -i 's/ filesystems keyboard / encrypt filesystems /' /etc/mkinitcpio.conf
    fi

    if [ "$KERNELS_COMPRESSION" != "" ]; then
@@ -447,7 +442,6 @@ function mkinitcpio() {
 }

 function bootloader() {
-    BOOTLOADER_DEVICE_ROOT_MAPPER=""
    BOOTLOADER_ALLOW_DISCARDS=""

    if [ "$CPU_INTEL" == "true" -a "$VIRTUALBOX" != "true" ]; then
@@ -460,11 +454,10 @@ function bootloader() {
        CMDLINE_LINUX_ROOT="root=PARTUUID=$PARTUUID_ROOT"
    fi
    if [ -n "$PARTITION_ROOT_ENCRYPTION_PASSWORD" ]; then
-        BOOTLOADER_DEVICE_ROOT_MAPPER=":$DEVICE_ROOT_MAPPER"
        if [ "$DEVICE_TRIM" == "true" ]; then
            BOOTLOADER_ALLOW_DISCARDS=":allow-discards"
        fi
-        CMDLINE_LINUX="cryptdevice=PARTUUID=$PARTUUID_ROOT$BOOTLOADER_DEVICE_ROOT_MAPPER$BOOTLOADER_ALLOW_DISCARDS"
+        CMDLINE_LINUX="cryptdevice=PARTUUID=$PARTUUID_ROOT:$LVM_VOLUME_PHISICAL$BOOTLOADER_ALLOW_DISCARDS"
    fi

    case "$BOOTLOADER" in
@@ -873,7 +866,7 @@ function yaourt_install() {
    PACKAGES=$1
    for VARIABLE in {1..5}
    do
-        arch-chroot /mnt bash -c "echo -e \"$USER_PASSWORD\n$USER_PASSWORD\n$USER_PASSWORD\n$USER_PASSWORD\n\" | su $USER_NAME yaourt -Sy --noconfirm --needed $PACKAGES"
+        arch-chroot /mnt bash -c "echo -e \"$USER_PASSWORD\n$USER_PASSWORD\n$USER_PASSWORD\n$USER_PASSWORD\n\" | su $USER_NAME -c \"yaourt -Sy --noconfirm --needed $PACKAGES\""
        if [ $? == 0 ]; then
            break
        else