Browse Source

archiso 70

master
arcolinuxz 2 years ago
parent
commit
4000495da9
  1. 22
      archiso/airootfs/etc/mkinitcpio.conf
  2. 6
      archiso/airootfs/etc/ssh/sshd_config
  3. 1
      archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service
  4. 27
      archiso/grub/grub.cfg
  5. 2
      archiso/syslinux/archiso_head.cfg
  6. 6
      archiso/syslinux/archiso_tail.cfg
  7. 2
      installation-scripts/30-build-the-iso-the-first-time.sh
  8. 2
      installation-scripts/40-build-the-iso-local-again.sh

22
archiso/airootfs/etc/mkinitcpio.conf

@ -3,7 +3,7 @@
# The following modules are loaded before any boot hooks are # The following modules are loaded before any boot hooks are
# run. Advanced users may wish to specify all system modules # run. Advanced users may wish to specify all system modules
# in this array. For instance: # in this array. For instance:
# MODULES=(usbhid xhci_hcd) # MODULES=(piix ide_disk reiserfs)
MODULES=() MODULES=()
# BINARIES # BINARIES
@ -29,30 +29,30 @@ FILES=()
# 'filesystems' is _required_ unless you specify your fs modules in MODULES # 'filesystems' is _required_ unless you specify your fs modules in MODULES
# Examples: # Examples:
## This setup specifies all modules in the MODULES setting above. ## This setup specifies all modules in the MODULES setting above.
## No RAID, lvm2, or encrypted root is needed. ## No raid, lvm2, or encrypted root is needed.
# HOOKS=(base) # HOOKS=(base)
# #
## This setup will autodetect all modules for your system and should ## This setup will autodetect all modules for your system and should
## work as a sane default ## work as a sane default
# HOOKS=(base udev autodetect modconf block filesystems fsck) # HOOKS=(base udev autodetect block filesystems)
# #
## This setup will generate a 'full' image which supports most systems. ## This setup will generate a 'full' image which supports most systems.
## No autodetection is done. ## No autodetection is done.
# HOOKS=(base udev modconf block filesystems fsck) # HOOKS=(base udev block filesystems)
# #
## This setup assembles a mdadm array with an encrypted root file system. ## This setup assembles a pata mdadm array with an encrypted root FS.
## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices. ## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck) # HOOKS=(base udev block mdadm encrypt filesystems)
# #
## This setup loads an lvm2 volume group. ## This setup loads an lvm2 volume group on a usb device.
# HOOKS=(base udev modconf block lvm2 filesystems fsck) # HOOKS=(base udev block lvm2 filesystems)
# #
## NOTE: If you have /usr on a separate partition, you MUST include the ## NOTE: If you have /usr on a separate partition, you MUST include the
# usr and fsck hooks. # usr, fsck and shutdown hooks.
HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard) HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, zstd compression # Use this to compress the initramfs image. By default, gzip compression
# is used. Use 'cat' to create an uncompressed image. # is used. Use 'cat' to create an uncompressed image.
#COMPRESSION="gzip" #COMPRESSION="gzip"
#COMPRESSION="bzip2" #COMPRESSION="bzip2"

6
archiso/airootfs/etc/ssh/sshd_config

@ -58,7 +58,7 @@ AuthorizedKeysFile .ssh/authorized_keys
#PermitEmptyPasswords no #PermitEmptyPasswords no
# Change to no to disable s/key passwords # Change to no to disable s/key passwords
#KbdInteractiveAuthentication yes KbdInteractiveAuthentication no
# Kerberos options # Kerberos options
#KerberosAuthentication no #KerberosAuthentication no
@ -75,7 +75,7 @@ AuthorizedKeysFile .ssh/authorized_keys
# be allowed through the KbdInteractiveAuthentication and # be allowed through the KbdInteractiveAuthentication and
# PasswordAuthentication. Depending on your PAM configuration, # PasswordAuthentication. Depending on your PAM configuration,
# PAM authentication via KbdInteractiveAuthentication may bypass # PAM authentication via KbdInteractiveAuthentication may bypass
# the setting of "PermitRootLogin without-password". # the setting of "PermitRootLogin prohibit-password".
# If you just want the PAM account and session checks to run without # If you just want the PAM account and session checks to run without
# PAM authentication, then enable this but set PasswordAuthentication # PAM authentication, then enable this but set PasswordAuthentication
# and KbdInteractiveAuthentication to 'no'. # and KbdInteractiveAuthentication to 'no'.
@ -88,7 +88,7 @@ UsePAM yes
#X11DisplayOffset 10 #X11DisplayOffset 10
#X11UseLocalhost yes #X11UseLocalhost yes
#PermitTTY yes #PermitTTY yes
PrintMotd no # pam does that PrintMotd no
#PrintLastLog yes #PrintLastLog yes
#TCPKeepAlive yes #TCPKeepAlive yes
#PermitUserEnvironment no #PermitUserEnvironment no

1
archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service

@ -1 +0,0 @@
/usr/lib/systemd/system/qemu-guest-agent.service

27
archiso/grub/grub.cfg

@ -3,15 +3,18 @@ insmod part_gpt
insmod part_msdos insmod part_msdos
insmod fat insmod fat
insmod iso9660 insmod iso9660
insmod ntfs
insmod ntfscomp
insmod exfat
insmod udf
# Use graphics-mode output # Use graphics-mode output
insmod all_video insmod all_video
insmod font insmod font
if loadfont "${prefix}/fonts/unicode.pf2" ; then if loadfont "${prefix}/fonts/unicode.pf2" ; then
insmod gfxterm
set gfxmode="auto" set gfxmode="auto"
terminal_input console terminal_input console
terminal_output gfxterm terminal_output console
fi fi
# Enable serial console # Enable serial console
@ -20,6 +23,15 @@ if serial --unit=0 --speed=115200; then
terminal_output --append serial terminal_output --append serial
fi fi
# Search for the ISO volume
if [ -z "${ARCHISO_UUID}" ]; then
if [ -z "${ARCHISO_HINT}" ]; then
regexp --set=1:ARCHISO_HINT '^\(([^)]+)\)' "${cmdpath}"
fi
search --no-floppy --set=root --file '%ARCHISO_SEARCH_FILENAME%' --hint "${ARCHISO_HINT}"
probe --set ARCHISO_UUID --fs-uuid "${root}"
fi
# Set default menu entry # Set default menu entry
default=alci default=alci
timeout=15 timeout=15
@ -32,15 +44,13 @@ play 600 988 1 1319 4
menuentry "Alci install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'alci' { menuentry "Alci install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'alci' {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --label %ARCHISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} cow_spacesize=4G copytoram=n
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n
initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
} }
menuentry "Alci install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'alci-accessibility' { menuentry "Alci install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'alci-accessibility' {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --label %ARCHISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on cow_spacesize=4G copytoram=n
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n accessibility=on
initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
} }
@ -48,18 +58,15 @@ if [ "${grub_platform}" == "efi" ]; then
if [ "${grub_cpu}" == "x86_64" ]; then if [ "${grub_cpu}" == "x86_64" ]; then
menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool { menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
set gfxpayload=800x600,1024x768 set gfxpayload=800x600,1024x768
search --fs-uuid --no-floppy --set=root --label %ARCHISO_LABEL% linux /boot/memtest86+/memtest.efi
linux /%INSTALL_DIR%/boot/memtest.efi
} }
menuentry "UEFI Shell" { menuentry "UEFI Shell" {
insmod chain insmod chain
search --no-floppy --set=root --label %ARCHISO_LABEL%
chainloader /shellx64.efi chainloader /shellx64.efi
} }
elif [ "${grub_cpu}" == "i386" ]; then elif [ "${grub_cpu}" == "i386" ]; then
menuentry "UEFI Shell" { menuentry "UEFI Shell" {
insmod chain insmod chain
search --no-floppy --set=root --label %ARCHISO_LABEL%
chainloader /shellia32.efi chainloader /shellia32.efi
} }
fi fi

2
archiso/syslinux/archiso_head.cfg

@ -12,7 +12,7 @@ MENU CMDLINEROW 14
MENU HELPMSGROW 16 MENU HELPMSGROW 16
MENU HELPMSGENDROW 29 MENU HELPMSGENDROW 29
# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu # Refer to https://wiki.syslinux.org/wiki/index.php/Comboot/menu.c32
MENU COLOR border 30;44 #40ffffff #a0000000 std MENU COLOR border 30;44 #40ffffff #a0000000 std
MENU COLOR title 1;36;44 #9033ccff #a0000000 std MENU COLOR title 1;36;44 #9033ccff #a0000000 std

6
archiso/syslinux/archiso_tail.cfg

@ -7,12 +7,12 @@ MENU LABEL Boot existing OS
COM32 chain.c32 COM32 chain.c32
APPEND hd0 0 APPEND hd0 0
# http://www.memtest.org/ # https://www.memtest.org/
LABEL memtest LABEL memtest
MENU LABEL Run Memtest86+ (RAM test) MENU LABEL Run Memtest86+ (RAM test)
LINUX /%INSTALL_DIR%/boot/memtest LINUX /boot/memtest86+/memtest
# http://hdt-project.org/ # https://wiki.syslinux.org/wiki/index.php/Hdt_(Hardware_Detection_Tool)
LABEL hdt LABEL hdt
MENU LABEL Hardware Information (HDT) MENU LABEL Hardware Information (HDT)
COM32 hdt.c32 COM32 hdt.c32

2
installation-scripts/30-build-the-iso-the-first-time.sh

@ -35,7 +35,7 @@ echo
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
# setting of the general parameters # setting of the general parameters
archisoRequiredVersion="archiso 69-1" archisoRequiredVersion="archiso 70-1"
buildFolder=$HOME"/alci-build" buildFolder=$HOME"/alci-build"
outFolder=$HOME"/Alci-Iso-Out" outFolder=$HOME"/Alci-Iso-Out"
archisoVersion=$(sudo pacman -Q archiso) archisoVersion=$(sudo pacman -Q archiso)

2
installation-scripts/40-build-the-iso-local-again.sh

@ -35,7 +35,7 @@ echo
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso' #isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
# setting of the general parameters # setting of the general parameters
archisoRequiredVersion="archiso 69-1" archisoRequiredVersion="archiso 70-1"
buildFolder=$HOME"/alci-build" buildFolder=$HOME"/alci-build"
outFolder=$HOME"/Alci-Iso-Out" outFolder=$HOME"/Alci-Iso-Out"
archisoVersion=$(sudo pacman -Q archiso) archisoVersion=$(sudo pacman -Q archiso)

Loading…
Cancel
Save