Archives
/
manjaro-architect
mirror of https://gitlab.manjaro.org/applications/manjaro-architect
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

some maintaining stuff

Browse Source
merge-requests/261/merge
168912916 859421311 3 years ago committed by Bernhard Landauer
parent 08c5614b18
commit f63af1a21f
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
PKGBUILD
Unescape Escape View File

@ -3,11 +3,11 @@
pkgbase=manjaro-architect pkgbase=manjaro-architect
pkgname=('manjaro-architect' 'manjaro-architect-launcher') pkgname=('manjaro-architect' 'manjaro-architect-launcher')
pkgver=0.7.4.r78.g86f8c83 pkgver=0.9.34.r2.g08c5614
pkgrel=1 pkgrel=1
pkgdesc="Manjaro CLI net-installer, forked from the Archlinux Architect" pkgdesc="Manjaro CLI net-installer, forked from the Archlinux Architect"
arch=(any) arch=(any)
url="https://github.com/Chrysostomus/$pkgbase" url="https://gitlab.manjaro.org/applications/$pkgbase"
license=(GPL2) license=(GPL2)
depends=('bash' depends=('bash'
'dialog') 'dialog')

2
data/package-lists/base-systemd-manjaro
Unescape Escape View File

@ -78,7 +78,7 @@ wpa_supplicant
tar tar
texinfo texinfo
usbutils usbutils
util-linux util-linux-libs
which which
xfsprogs xfsprogs
zd1211-firmware zd1211-firmware

6
lib/util-base.sh
Unescape Escape View File

@ -212,8 +212,6 @@ install_base() {
# Choose kernel and possibly base-devel # Choose kernel and possibly base-devel
DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 15 \ DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 15 \
"yay + base-devel" "-" off \ "yay + base-devel" "-" off \
"linux-lts" "-" off \
"linux-latest" "-" off \
$(cat /tmp/.available_kernels | awk '$0=$0" - off"') 2>${PACKAGES} || { loopmenu=0; return 0; } $(cat /tmp/.available_kernels | awk '$0=$0" - off"') 2>${PACKAGES} || { loopmenu=0; return 0; }
if [[ ! $(grep "linux" ${PACKAGES}) ]]; then if [[ ! $(grep "linux" ${PACKAGES}) ]]; then
# Check if a kernel is already installed # Check if a kernel is already installed
@ -789,8 +787,6 @@ pacman -S --noconfirm grub-theme-manjaro" > ${MOUNTPOINT}/usr/bin/grub_installer
# First the "main" entries # First the "main" entries
[[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux\n\tLINUX \ [[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux\n\tLINUX \
../vmlinuz-linux\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg ../vmlinuz-linux\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-lts.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux realtime LTS\n\tLINUX \
../vmlinuz-linux-lts\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-lts.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux realtime\n\tLINUX \ [[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux realtime\n\tLINUX \
../vmlinuz-linux-grsec\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-grsec.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg ../vmlinuz-linux-grsec\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-grsec.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-zen.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux release candidate\n\tLINUX \ [[ -e ${MOUNTPOINT}/boot/initramfs-linux-zen.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux release candidate\n\tLINUX \
@ -799,8 +795,6 @@ pacman -S --noconfirm grub-theme-manjaro" > ${MOUNTPOINT}/usr/bin/grub_installer
# Second the "fallback" entries # Second the "fallback" entries
[[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux Fallback\n\tLINUX \ [[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux Fallback\n\tLINUX \
../vmlinuz-linux\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-fallback.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg ../vmlinuz-linux\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-fallback.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-lts.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux Fallback realtime LTS\n\tLINUX \
../vmlinuz-linux-lts\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-lts-fallback.img" >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux Fallback realtime\n\tLINUX \ [[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] && echo -e "\n\nLABEL arch\n\tMENU LABEL Manjaro Linux Fallback realtime\n\tLINUX \
../vmlinuz-linux-grsec\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-grsec-fallback.img" \ ../vmlinuz-linux-grsec\n\tAPPEND root=${ROOT_PART} rw\n\tINITRD ../initramfs-linux-grsec-fallback.img" \
>> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg >> ${MOUNTPOINT}/boot/syslinux/syslinux.cfg

2
lib/util-desktop.sh
Unescape Escape View File

@ -258,8 +258,6 @@ install_desktop() {
# Choose kernel and possibly base-devel # Choose kernel and possibly base-devel
DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 15 \ DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 15 \
"yay + base-devel" "-" off \ "yay + base-devel" "-" off \
"linux-lts" "-" off \
"linux-latest" "-" off \
$(cat /tmp/.available_kernels | awk '$0=$0" - off"') 2>${PACKAGES} || { loopmenu=0; return 0; } $(cat /tmp/.available_kernels | awk '$0=$0" - off"') 2>${PACKAGES} || { loopmenu=0; return 0; }
if [[ ! $(grep "linux" ${PACKAGES}) ]]; then if [[ ! $(grep "linux" ${PACKAGES}) ]]; then
# Check if a kernel is already installed # Check if a kernel is already installed

Write Preview
Loading…
Cancel
Save