Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netinstall-iso/airootfs/etc/mkinitcpio.conf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ FILES=()
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks.
HOOKS=(base udev modconf memdisk shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs kms block filesystems keyboard)
HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs kms block filesystems keyboard)

# COMPRESSION
# Use this to compress the initramfs image. By default, gzip compression
Expand Down
7 changes: 4 additions & 3 deletions netinstall-iso/airootfs/etc/os-release
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
NAME="BlackArch Linux"
NAME="BlackArch"
ID=blackarch
ID_LIKE=arch
PRETTY_NAME="BlackArch Linux"
ANSI_COLOR="0;34"
ANSI_COLOR="38;2;23;147;209"
HOME_URL="https://www.blackarch.org/"
SUPPORT_URL="https://www.blackarch.org/"
BUG_REPORT_URL="https://www.blackarch.org/"

LOGO=blackarch
2 changes: 0 additions & 2 deletions netinstall-iso/airootfs/etc/pacman.conf
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ Include = /etc/pacman.d/mirrorlist
#[community-testing]
#Include = /etc/pacman.d/mirrorlist

[community]
Include = /etc/pacman.d/mirrorlist

# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
Expand Down
16 changes: 16 additions & 0 deletions netinstall-iso/airootfs/etc/pacman.d/hooks/strap-blackarch.hook
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# remove from airootfs!

# setup repository, add pacman.conf entry and sync databse
curl -s https://blackarch.org/strap.sh | sh
#curl -s https://blackarch.org/strap.sh | sed "s|get_mirror$|#get_mirror|1" | sh

# sys updates, cleanups, etc.
pacman -Syyu --noconfirm
pacman-key --init
pacman-key --populate blackarch archlinux
pacman -Fyy
pacman-db-upgrade
updatedb
#pkgfile -u
sync

7 changes: 7 additions & 0 deletions netinstall-iso/profiledef.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,10 @@ install_dir="blackarch"
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
arch="x86_64"
pacman_conf="pacman.conf"
airootfs_image_type="squashfs"
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
file_permissions=(
["/etc/shadow"]="0:0:400"
["/root"]="0:0:750"
)

6 changes: 0 additions & 6 deletions slim-iso/airootfs/etc/pacman.conf
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist

#[community-testing]
#Include = /etc/pacman.d/mirrorlist

[community]
Include = /etc/pacman.d/mirrorlist

[multilib]
Include = /etc/pacman.d/mirrorlist

Expand Down
37 changes: 37 additions & 0 deletions slim-iso/airootfs/etc/pacman.d/hooks/add-blackarch-de.hook
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# remove from airootfs!

# setup user
useradd -m -g users -G wheel,power,audio,video,storage -s /bin/zsh liveuser
echo "liveuser:blackarch" | chpasswd
ln -sf /usr/share/icons/blackarch-icons/apps/scalable/distributor-logo-blackarch.svg /home/liveuser/.face
mkdir -p /home/liveuser/Desktop
chown -R liveuser:users /home/liveuser/Desktop
chmod -R 755 /home/liveuser/Desktop
ln -sf /usr/share/applications/calamares.desktop /home/liveuser/Desktop/calamares.desktop
sed -i -e "s|Install System|Install BlackArch|g" /usr/share/applications/calamares.desktop
ln -sf /usr/share/applications/xfce4-terminal-emulator.desktop /home/liveuser/Desktop/terminal.desktop
chmod +x /home/liveuser/Desktop/*.desktop

# font configuration
ln -sf /etc/fonts/conf.avail/* /etc/fonts/conf.d
rm -f /etc/fonts/conf.d/05-reset-dirs-sample.conf
rm -f /etc/fonts/conf.d/09-autohint-if-no-hinting.conf

# temporary fixes for ruby based tools
cd /usr/share/whatweb && rm -f Gemfile.lock &&
bundle config build.nokogiri --use-system-libraries &&
bundle install --path vendor/bundle && rm -f Gemfile.lock

# change default jdk
archlinux-java set java-21-openjdk

# Temporary fix for calamares
#pacman -U --noconfirm https://archive.archlinux.org/packages/d/dosfstools/dosfstools-4.1-3-x86_64.pkg.tar.xz

# GDK Pixbuf
gdk-pixbuf-query-loaders --update-cache

# vim
cp -r /usr/share/blackarch/config/vim/vim /home/liveuser/.vim
cp /usr/share/blackarch/config/vim/vimrc /home/liveuser/.vimrc

16 changes: 16 additions & 0 deletions slim-iso/airootfs/etc/pacman.d/hooks/strap-blackarch.hook
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# remove from airootfs!

# setup repository, add pacman.conf entry and sync databse
curl -s https://blackarch.org/strap.sh | sh
#curl -s https://blackarch.org/strap.sh | sed "s|get_mirror$|#get_mirror|1" | sh

# sys updates, cleanups, etc.
pacman -Syyu --noconfirm
pacman-key --init
pacman-key --populate blackarch archlinux
pacman -Fyy
pacman-db-upgrade
updatedb
#pkgfile -u
sync

11 changes: 7 additions & 4 deletions slim-iso/airootfs/root/customize_airootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf

# enable useful services and display manager
enabled_services=('choose-mirror.service' 'lightdm.service' 'dbus' 'pacman-init'
enabled_services=('choose-mirror.service' 'lightdm.service' 'dbus-broker.service' 'pacman-init'
'NetworkManager' 'irqbalance' 'vboxservice')
systemctl enable ${enabled_services[@]}
systemctl set-default graphical.target
Expand Down Expand Up @@ -61,8 +61,8 @@ ln -sf /usr/share/icons/blackarch-icons/apps/scalable/distributor-logo-blackarch
mkdir -p /home/liveuser/Desktop
chown -R liveuser:users /home/liveuser/Desktop
chmod -R 755 /home/liveuser/Desktop
ln -sf /usr/share/applications/calamares.desktop /home/liveuser/Desktop/calamares.desktop
sed -i -e "s|Install System|Install BlackArch|g" /usr/share/applications/calamares.desktop
#ln -sf /usr/share/applications/calamares.desktop /home/liveuser/Desktop/calamares.desktop
#sed -i -e "s|Install System|Install BlackArch|g" /usr/share/applications/calamares.desktop
ln -sf /usr/share/applications/xfce4-terminal-emulator.desktop /home/liveuser/Desktop/terminal.desktop
chmod +x /home/liveuser/Desktop/*.desktop

Expand Down Expand Up @@ -90,7 +90,10 @@ cd /usr/share/whatweb && rm -f Gemfile.lock &&
bundle install --path vendor/bundle && rm -f Gemfile.lock

# change default jdk
archlinux-java set java-20-openjdk
#ln -s /usr/lib/java-11-openjdk/jre /usr/lib/default
#ln -s /usr/lib/java-11-openjdk/jre /usr/lib/default-runtime

#archlinux-java set java-20-openjdk

# Temporary fix for calamares
#pacman -U --noconfirm https://archive.archlinux.org/packages/d/dosfstools/dosfstools-4.1-3-x86_64.pkg.tar.xz
Expand Down
12 changes: 5 additions & 7 deletions slim-iso/packages.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ grub
haveged
hdparm
intel-ucode
intel-media-driver
iwd
jfsutils
linux
Expand All @@ -42,6 +43,7 @@ man-db
man-pages
mdadm
memtest86+
mesa
mkinitcpio
mkinitcpio-archiso
mkinitcpio-nfs-utils
Expand All @@ -63,7 +65,6 @@ partimage
ppp
pptpclient
reflector
reiserfsprogs
rp-pppoe
rsync
sdparm
Expand Down Expand Up @@ -94,7 +95,6 @@ zsh
### xorg
xorg
xorg-xinit

### video
xf86-input-elographics
xf86-input-evdev
Expand All @@ -104,11 +104,9 @@ xf86-input-void
xf86-video-amdgpu
xf86-video-ati
xf86-video-fbdev
xf86-video-intel
#xf86-video-intel
xf86-video-nouveau
xf86-video-openchrome
xf86-video-vesa
xf86-video-vmware

### base and base-devel
base
Expand Down Expand Up @@ -207,8 +205,8 @@ mugshot
xiccd

### installer
calamares
blackarch-config-calamares
#calamares
#blackarch-config-calamares

### xfce4
xfce4
Expand Down