OSDN Git Service

manjaro fixes
authorpaperbenni <paperbenni@gmail.com>
Tue, 26 May 2020 14:10:04 +0000 (16:10 +0200)
committerpaperbenni <paperbenni@gmail.com>
Tue, 26 May 2020 14:10:04 +0000 (16:10 +0200)
instantos/install.sh
systeminstall.sh

index 26ec873..ed65236 100755 (executable)
@@ -33,3 +33,8 @@ cat /usr/share/instantdotfiles/lightdm-gtk-greeter.conf >/etc/lightdm/lightdm-gt
 # custom grub theme
 sed -i 's~^#GRUB_THEME.*~GRUB_THEME=/usr/share/grub/themes/instantos/theme.txt~g' /etc/default/grub
 update-grub
+
+# fix grub on manjaro
+if grep -iq 'manjaro' /etc/os-release; then
+    mkinitcpio -P
+fi
index c1e0a10..fd4a4cb 100755 (executable)
@@ -75,6 +75,10 @@ chrootscript "lang/locale" "setting locale"
 if ! [ -e /root/instantARCH/config/onlyarch ] &&
     ! [ -e /opt/onlyarch ]; then
     chrootscript "instantos/install" "configuring instantOS, this will take a while"
+    if grep -iq 'manjaro' /etc/os-release; then
+        echo "manjaro extra steps"
+        chrootscript "chroot/chroot" "extra steps for manjaro"
+    fi
 fi
 
 # mark installation as susccessful