From 75b0b905bd16003e8418949e6caa0b86675d03fd Mon Sep 17 00:00:00 2001 From: timoxa0 Date: Sun, 11 Aug 2024 15:56:33 +0500 Subject: [PATCH] Move sudoers to drop/00_image_builder --- buildArchBase.sh | 7 +++++-- buildArchGnome.sh | 7 +++++-- buildArchPlasma.sh | 7 +++++-- buildFedoraWorkstation.sh | 3 ++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/buildArchBase.sh b/buildArchBase.sh index 226b404..5bf1a2b 100755 --- a/buildArchBase.sh +++ b/buildArchBase.sh @@ -54,8 +54,11 @@ chroot "$rootdir" pacman -R linux-aarch64 linux-firmware --noconfirm log "Populating pacman key store" chroot "$rootdir" pacman-key --init chroot "$rootdir" pacman-key --populate archlinuxarm -log "Updating system and installing needed packages" +log "Enable pacman parallel downloads" chroot "$rootdir" sed -i "s/#ParallelDownloads/ParallelDownloads/g" /etc/pacman.conf +log "Update key store" +chroot "$rootdir" pacman -Sy archlinux-keyring archlinuxarm-keyring --noconfirm +log "Updating system and installing needed packages" chroot "$rootdir" pacman -Syu sudo bluez bluez-utils vulkan-freedreno networkmanager --noconfirm # Install nabu specific packages @@ -77,7 +80,7 @@ gen_fstab "$rootdir" # Add %wheel to sudoers log "Adding %wheel to sudoers" -echo "%wheel ALL=(ALL:ALL) ALL" > "$rootdir/etc/sudoers.d/00_image_builder" +cp ./drop/00_image_builder "$rootdir/etc/sudoers.d/00_image_builder" # Set default timezone log "Setting default timezone" diff --git a/buildArchGnome.sh b/buildArchGnome.sh index d480c48..9cdea2d 100755 --- a/buildArchGnome.sh +++ b/buildArchGnome.sh @@ -48,8 +48,11 @@ chroot "$rootdir" pacman -R linux-aarch64 linux-firmware --noconfirm log "Populating pacman key store" chroot "$rootdir" pacman-key --init chroot "$rootdir" pacman-key --populate archlinuxarm -log "Updating system and installing needed packages" +log "Enable pacman parallel downloads" chroot "$rootdir" sed -i "s/#ParallelDownloads/ParallelDownloads/g" /etc/pacman.conf +log "Update key store" +chroot "$rootdir" pacman -Sy archlinux-keyring archlinuxarm-keyring --noconfirm +log "Updating system and installing needed packages" chroot "$rootdir" pacman -Syu sudo gdm gnome-menus gnome-backgrounds gnome-control-center gnome-keyring xdg-user-dirs-gtk nautilus xdg-desktop-portal-gnome gnome-console bluez bluez-utils vulkan-freedreno networkmanager --noconfirm # Install nabu specific packages @@ -71,7 +74,7 @@ gen_fstab "$rootdir" # Add %wheel to sudoers log "Adding %wheel to sudoers" -echo "%wheel ALL=(ALL:ALL) ALL" > "$rootdir/etc/sudoers.d/00_image_builder" +cp ./drop/00_image_builder "$rootdir/etc/sudoers.d/00_image_builder" # Set default timezone log "Setting default timezone" diff --git a/buildArchPlasma.sh b/buildArchPlasma.sh index 1347cc4..98153dc 100755 --- a/buildArchPlasma.sh +++ b/buildArchPlasma.sh @@ -48,8 +48,11 @@ chroot "$rootdir" pacman -R linux-aarch64 linux-firmware --noconfirm log "Populating pacman key store" chroot "$rootdir" pacman-key --init chroot "$rootdir" pacman-key --populate archlinuxarm -log "Updating system and installing needed packages" +log "Enable pacman parallel downloads" chroot "$rootdir" sed -i "s/#ParallelDownloads/ParallelDownloads/g" /etc/pacman.conf +log "Update key store" +chroot "$rootdir" pacman -Sy archlinux-keyring archlinuxarm-keyring --noconfirm +log "Updating system and installing needed packages" chroot "$rootdir" pacman -Syu sudo plasma grub konsole dolphin ark bluez bluez-utils xorg-xrandr xorg-xinput qt5-virtualkeyboard vulkan-freedreno networkmanager --noconfirm # Install nabu specific packages @@ -71,7 +74,7 @@ gen_fstab "$rootdir" # Add %wheel to sudoers log "Adding %wheel to sudoers" -echo "%wheel ALL=(ALL:ALL) ALL" > "$rootdir/etc/sudoers.d/00_image_builder" +cp ./drop/00_image_builder "$rootdir/etc/sudoers.d/00_image_builder" # Set default timezone log "Setting default timezone" diff --git a/buildFedoraWorkstation.sh b/buildFedoraWorkstation.sh index 6331aa7..d81fa70 100755 --- a/buildFedoraWorkstation.sh +++ b/buildFedoraWorkstation.sh @@ -85,7 +85,8 @@ gen_fstab "$rootdir" # Add %wheel to sudoers log "Adding %wheel to sudoers" -echo "%wheel ALL=(ALL:ALL) ALL" > "$rootdir/etc/sudoers.d/00_image_builder" +cp ./drop/00_image_builder "$rootdir/etc/sudoers.d/00_image_builder" + # +++ Rotate gdm log "Configuring gdm and gnome"