adjust to new basepackage

config/common/mimalloc.sh

@@ -1,3 +1,3 @@
-if [ ! -z "`pacman -Qeq | grep ^mimalloc$`" ]; then
+if [ ! -z "`pacman -Qq | grep ^mimalloc$`" ]; then
   echo "LD_PRELOAD=/usr/lib/libmimalloc.so" >> /etc/environment
 fi

config/common/set_keyring.sh

@@ -1,5 +1,5 @@
 # eweos-keyring
-if [ ! -z "`pacman -Qeq | grep ^eweos-keyring$`" ]; then
+if [ ! -z "`pacman -Qq | grep ^eweos-keyring$`" ]; then
   echo "Found eweos-keyring"
   pacman-key --init
   pacman-key --populate eweos

config/liveimage/gen_boot.sh

@@ -9,10 +9,8 @@ ram=1
 live_ram_opts="size=50%,mode=0755"
 EOF
 
-_bootloader_set=0
-
 # plymouth
-if [ ! -z "`pacman -Qeq | grep ^plymouth$`" ]; then
+if [ ! -z "`pacman -Qq | grep ^plymouth$`" ]; then
   echo "Found plymouth"
   # FIXME: use text mode since early KMS is not ready and unable to detect FB
   cat <<EOF>/etc/plymouth/plymouthd.conf
@@ -21,17 +19,11 @@ Theme=tribar
 EOF
 fi
 
-# limine bootloader
-if [ ! -z "`pacman -Qeq | grep ^limine$`" ] && [ "$_bootloader_set"=="0" ]; then
-  echo "Found limine"
-  mkdir -p /boot/EFI/BOOT
-  cp /usr/share/limine/*.EFI /boot/EFI/BOOT/
-  limine-mkconfig -b "rolling (LiveCD)" -o /boot/limine.cfg
-  # for hybrid iso
-  if [ -f /usr/share/limine/limine-bios-cd.bin ]; then
-    cp /usr/share/limine/{limine-bios-cd.bin,limine-bios.sys} /boot/
-  fi
-  cp /usr/share/limine/limine-uefi-cd.bin /boot/
-  _bootloader_set=1
+mkdir -p /boot/EFI/BOOT
+cp /usr/share/limine/*.EFI /boot/EFI/BOOT/
+limine-mkconfig -b "rolling (LiveCD)" -o /boot/limine.cfg
+# for hybrid iso
+if [ -f /usr/share/limine/limine-bios-cd.bin ]; then
+  cp /usr/share/limine/{limine-bios-cd.bin,limine-bios.sys} /boot/
 fi
-
+cp /usr/share/limine/limine-uefi-cd.bin /boot/

profiles/liveimage-desktop/packages.txt

@@ -1,13 +1,9 @@
-base
 greetd
 greetd-tui
-tinyramfs
 linux
-limine
 fastfetch
 vim
 sudo
-dinit
 linux-firmware
 linux-firmware-amdgpu
 linux-firmware-iwlwifi

profiles/liveimage-standard/packages.txt

@@ -1,13 +1,9 @@
-base
 greetd
 seatd
-tinyramfs
 linux
-limine
 fastfetch
 vim
 sudo
-dinit
 linux-firmware
 linux-firmware-amdgpu
 linux-firmware-iwlwifi

profiles/liveimage-test/packages.txt

@@ -1,10 +1,6 @@
-base
-tinyramfs
 linux
-limine
 fastfetch
 sudo
-dinit
 nginx
 cronie
 fcgiwrap

profiles/tarball/packages.txt

@@ -1,4 +1,3 @@
 base
 vim
 sudo
-dinit

utils/install.sh

@@ -6,7 +6,7 @@ _logtxt "#### bootstrapping base system"
 
 mount_overlay base
 
-$RUNAS pacstrap -G -M -c -C ./pacman.ewe.conf ./tmpdir/rootfs base
+$RUNAS pacstrap -G -M -c -C ./pacman.ewe.conf ./tmpdir/rootfs base-baremetal
 
 umount_overlay