From ae0613f3a180701f03f57127fea07b7fdd996f85 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Wed, 18 Jan 2017 20:16:56 +0100 Subject: [PATCH] Only nomodeset start, less problems in install --- ISOCreateScripts/data/isolinux/isolinux.cfg | 8 ++------ .../data/loader/entries/jkarch-default-nomodeset.conf | 5 ----- ISOCreateScripts/data/loader/entries/jkarch-default.conf | 2 +- archinstall/archinstall-dev.sh | 1 + 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 ISOCreateScripts/data/loader/entries/jkarch-default-nomodeset.conf diff --git a/ISOCreateScripts/data/isolinux/isolinux.cfg b/ISOCreateScripts/data/isolinux/isolinux.cfg index d726fef..0da9465 100644 --- a/ISOCreateScripts/data/isolinux/isolinux.cfg +++ b/ISOCreateScripts/data/isolinux/isolinux.cfg @@ -2,12 +2,8 @@ default start implicit 1 prompt 1 display isolinux.msg -timeout 75 +timeout 30 label start kernel /arch/vmlinuz - append initrd=/arch/intel_ucode.img,/arch/archiso.img archisobasedir=arch archisolabel=JKARCH-ISO earlymodules=loop modules-load=loop rd.modules-load=loop udev.log-priority=crit rd.udev.log-priority=crit - -label nomodeset - kernel /arch/vmlinuz - append initrd=/arch/intel_ucode.img,/arch/archiso.img archisobasedir=arch archisolabel=JKARCH-ISO earlymodules=loop modules-load=loop rd.modules-load=loop udev.log-priority=crit rd.udev.log-priority=crit nomodeset + append initrd=/arch/intel_ucode.img,/arch/archiso.img archisobasedir=arch archisolabel=JKARCH-ISO earlymodules=loop modules-load=loop rd.modules-load=loop udev.log-priority=crit rd.udev.log-priority=crit nomodeset \ No newline at end of file diff --git a/ISOCreateScripts/data/loader/entries/jkarch-default-nomodeset.conf b/ISOCreateScripts/data/loader/entries/jkarch-default-nomodeset.conf deleted file mode 100644 index f601602..0000000 --- a/ISOCreateScripts/data/loader/entries/jkarch-default-nomodeset.conf +++ /dev/null @@ -1,5 +0,0 @@ -title JKArch UEFI (nomodeset) -linux /arch/vmlinuz -initrd /arch/intel_ucode.img -initrd /arch/archiso.img -options archisobasedir=arch archisolabel=JKARCH-ISO modules-load=loop rd.modules-load=loop udev.log-priority=crit rd.udev.log-priority=crit nomodeset \ No newline at end of file diff --git a/ISOCreateScripts/data/loader/entries/jkarch-default.conf b/ISOCreateScripts/data/loader/entries/jkarch-default.conf index 17a5f23..a166085 100644 --- a/ISOCreateScripts/data/loader/entries/jkarch-default.conf +++ b/ISOCreateScripts/data/loader/entries/jkarch-default.conf @@ -2,4 +2,4 @@ title JKArch UEFI linux /arch/vmlinuz initrd /arch/intel_ucode.img initrd /arch/archiso.img -options archisobasedir=arch archisolabel=JKARCH-ISO modules-load=loop rd.modules-load=loop udev.log-priority=crit rd.udev.log-priority=crit \ No newline at end of file +options archisobasedir=arch archisolabel=JKARCH-ISO modules-load=loop rd.modules-load=loop udev.log-priority=crit rd.udev.log-priority=crit nomodeset \ No newline at end of file diff --git a/archinstall/archinstall-dev.sh b/archinstall/archinstall-dev.sh index 359b088..3bf601e 100755 --- a/archinstall/archinstall-dev.sh +++ b/archinstall/archinstall-dev.sh @@ -795,6 +795,7 @@ function installconf { # Clean pacman echo "$(T "Cleaning")" + execl chroot rm -rf $sfslocate/var/cache/pacman/pkg/* execl chroot pacman -Sc --noconfirm } # Fin installconf