From ac8c5d214551f898b3448a578070f45c13e29b15 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 6 Feb 2016 20:04:02 +0100 Subject: tons of bugfixes force output via serial --- archauto.sh | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'archauto.sh') diff --git a/archauto.sh b/archauto.sh index 6a247af..6d1c2ff 100755 --- a/archauto.sh +++ b/archauto.sh @@ -1,4 +1,6 @@ -#!/bin/sh +#!/bin/sh -x + +{ INSTALL_DRIVE=/dev/sda PARTITION_BOOT=1 @@ -35,6 +37,8 @@ mkfs.ext4 ${INSTALL_DRIVE}${PARTITION_ROOT} mkdir -p ${MOUNT_PATH} mount ${INSTALL_DRIVE}${PARTITION_ROOT} ${MOUNT_PATH} +mkdir ${MOUNT_PATH}/boot +mount ${INSTALL_DRIVE}${PARTITION_BOOT} ${MOUNT_PATH}/boot #export http_proxy=http://192.168.1.12:3128 export no_proxy=localhost,10.0.2.2 @@ -47,7 +51,7 @@ sed -i '/\[community\]/aServer = http://10.0.2.2:8080/$repo/os/$arch' /etc/pacma # switch off signature for now sed -i 's/^SigLevel.*/SigLevel = Never/g' /etc/pacman.conf -pacstrap ${MOUNT_PATH} filesystem grep findutils coreutils glibc bash pacman mkinitcpio kernel26 dhcpcd +pacstrap ${MOUNT_PATH} filesystem grep findutils coreutils glibc bash pacman mkinitcpio linux dhcpcd systemd # use our local cache in installed pacman sed -i '/\[core\]/aServer = http://10.0.2.2:8080/$repo/os/$arch' ${MOUNT_PATH}/etc/pacman.conf @@ -63,17 +67,19 @@ arch-chroot ${MOUNT_PATH} pacman -Sy # switch off signature for now in installed pacman sed -i 's/^SigLevel.*/SigLevel = Never/g' ${MOUNT_PATH}/etc/pacman.conf -arch-chroot ${MOUNT_PATH} pacman --noconfirm -S grub-bios -arch-chroot ${MOUNT_PATH} grub-install --target=i386-pc --recheck ${INSTALL_DRIVE} +arch-chroot ${MOUNT_PATH} pacman --noconfirm -S grub-bios sed +mkdir ${MOUNT_PATH}/boot/grub/locale/ cp ${MOUNT_PATH}/usr/share/locale/en@quot/LC_MESSAGES/grub.mo ${MOUNT_PATH}/boot/grub/locale/en.mo # disable quiet mode, set text mode instead of graphical mode # also ban cirrus KVM # set correct path of systemd binary (symlink /sbin/init has gone) -sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="modprobe.blacklist=cirrus init=\/usr\/lib\/systemd\/systemd"/g' ${MOUNT_PATH}/etc/default/grub +sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="modprobe.blacklist=cirrus init=\/usr\/lib\/systemd\/systemd" console=ttyS0,9600n8/g' ${MOUNT_PATH}/etc/default/grub sed -i 's/GRUB_GFXMODE=auto/GRUB_GFXMODE=text/g' ${MOUNT_PATH}/etc/default/grub -sed -i 's/#GRUB_TERMINAL_OUTPUT=console/GRUB_TERMINAL_OUTPUT=console/g' ${MOUNT_PATH}/etc/default/grub - +sed -i 's/GRUB_TERMINAL_INPUT=console/GRUB_TERMINAL_INPUT=serial/g' ${MOUNT_PATH}/etc/default/grub +sed -i 's/GRUB_TERMINAL_OUTPUT=console/GRUB_TERMINAL_OUTPUT=serial/g' ${MOUNT_PATH}/etc/default/grub +echo 'GRUB_SERIAL_COMMAND="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1"' >> ${MOUNT_PATH}/etc/default/grub arch-chroot ${MOUNT_PATH} grub-mkconfig -o /boot/grub/grub.cfg +arch-chroot ${MOUNT_PATH} grub-install --target=i386-pc --recheck ${INSTALL_DRIVE} genfstab -p ${MOUNT_PATH} >> ${MOUNT_PATH}/etc/fstab @@ -120,7 +126,14 @@ arch-chroot ${MOUNT_PATH} systemctl enable cf-serverd.service #echo "Installation.. press any key to reboot." #read +echo "Unmounting installation mount points.." +umount ${MOUNT_PATH}/boot +umount ${MOUNT_PATH} + echo "Done.. Rebooting system.." sleep 3 systemctl reboot + +} 2>&1 | tee -a /dev/ttyS0 + -- cgit v1.2.3-54-g00ecf