mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove weechat and links from environment
This commit is contained in:
parent
507c33735c
commit
74bc5b38d6
5 changed files with 17 additions and 43 deletions
|
@ -14,11 +14,11 @@ HOOKS=(archboot_kms udev archboot_base archboot_installer archboot_bootmessage_x
|
|||
archboot_acpi archboot_motd archboot_memtest archboot_intel_wireless \
|
||||
archboot_hwdetect block memdisk archboot_pcspkr archboot_net \
|
||||
keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \
|
||||
encrypt archboot_cryptoloop btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_links archboot_kexec archboot_ppp archboot_xl2tpd \
|
||||
encrypt archboot_cryptoloop btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
|
||||
archboot_pppoe archboot_grub archboot_refind archboot_efibootmgr archboot_syslinux archboot_iptables archboot_pciutils archboot_usbutils \
|
||||
archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
||||
archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
|
||||
archboot_chntpw archboot_weechat archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
|
||||
archboot_chntpw archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
|
||||
archboot_hypervisor archboot_dmidecode archboot_amd_ucode archboot_intel_ucode archboot_wvdial \
|
||||
archboot_usb_modeswitch archboot_lockdown-ms archboot_prebootloader archboot_efivar net)
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ systemd-nspawn -D $1 pacman-key --init
|
|||
systemd-nspawn -D $1 pacman-key --populate archlinux
|
||||
# add genneral mirror
|
||||
systemd-nspawn -D $1 /bin/bash -c "echo 'Server = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch' >> /etc/pacman.d/mirrorlist"
|
||||
# reinstall kernel to get files in /boot
|
||||
systemd-nspawn -D $1 pacman -Sy linux --noconfirm
|
||||
# disable checkspace option in pacman.conf, to allow to install packages in environment
|
||||
systemd-nspawn -D $1 /bin/bash -c "sed -i -e 's:^CheckSpace:#CheckSpace:g' /etc/pacman.conf"
|
||||
# reinstall kernel to get files in /boot
|
||||
systemd-nspawn -D $1 pacman -Sy linux --noconfirm
|
||||
|
|
|
@ -5,7 +5,7 @@ _BASENAME="$(basename "${0}")"
|
|||
D_SCRIPTS=""
|
||||
L_COMPLETE=""
|
||||
G_RELEASE=""
|
||||
PRESET="/etc/archboot/presets/x86_64"
|
||||
CONFIG="/etc/archboot/x86_64.conf"
|
||||
|
||||
usage () {
|
||||
echo "${_BASENAME}: usage"
|
||||
|
@ -15,9 +15,9 @@ usage () {
|
|||
echo "PARAMETERS:"
|
||||
echo " -u Update scripts: setup, quickinst, tz and km."
|
||||
echo " -c Update and launch complete updated archboot environment (using kexec)."
|
||||
echo " This operation needs at least 3072 MB RAM."
|
||||
echo " This operation needs at least 6144 MB RAM."
|
||||
echo " -i Generate new release image files in /archboot-release directory"
|
||||
echo " This operation needs at least 4096 MB RAM."
|
||||
echo " This operation needs at least 6144 MB RAM."
|
||||
echo " -h This message."
|
||||
exit 0
|
||||
}
|
||||
|
@ -48,10 +48,13 @@ fi
|
|||
# Generate new environment and launch it with kexec
|
||||
if [[ "${L_COMPLETE}" == "1" ]]; then
|
||||
# create container
|
||||
archboot-create-container.sh archboot
|
||||
archboot-create-container.sh archboot || exit 1
|
||||
# clean cache to safe memory
|
||||
pacman -Scc --noconfirm
|
||||
systemd-nspawn -D archboot pacman -Scc --noconfirm
|
||||
# generate tarball in container
|
||||
systemd-nspawn -D archboot mkinitcpio -c ${PRESET} -k ${ALL_kver} -g /initrd.img
|
||||
kexec -l archboot/boot/vmlinuz-linux --initrd=archboot/boot/intel-ucode.img --initrd=archboot/boot/amd-ucode.img --initrd=archboot/initd.img --append="group_disable=memory rootdelay=10 rootfstype=ramfs"
|
||||
systemd-nspawn -D archboot /bin/bash -c "mkinitcpio -c ${CONFIG} -g /tmp/initrd.img; mv /tmp/initrd.img /" || exit 1
|
||||
kexec -l archboot/boot/vmlinuz-linux --initrd=archboot/boot/intel-ucode.img --initrd=archboot/boot/amd-ucode.img --initrd=archboot/initrd.img --reuse-cmdline
|
||||
systemctl kexec
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
build ()
|
||||
{
|
||||
add_binary "links"
|
||||
}
|
||||
|
||||
help ()
|
||||
{
|
||||
cat<<HELPEOF
|
||||
This hook includes the links browser on an arch boot image.
|
||||
HELPEOF
|
||||
}
|
|
@ -1,15 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
build ()
|
||||
{
|
||||
add_binary "weechat-curses"
|
||||
add_full_dir "/usr/lib/weechat"
|
||||
}
|
||||
|
||||
help ()
|
||||
{
|
||||
cat<<HELPEOF
|
||||
This hook includes weechat on an arch boot image.
|
||||
HELPEOF
|
||||
}
|
Loading…
Reference in a new issue