root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add package check in installers

Browse source
This commit is contained in:
Tobias Powalowski 2012-06-04 15:37:13 +02:00
parent 77cd01f7d3
commit 56dc3c8ce2
2 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
usr/share/archboot/installer/quickinst
View file

@ -10,6 +10,8 @@ KERNELPKG="linux"
[[ "$(cat /proc/cmdline | grep -w BOOT_IMAGE=.*lts)" ]] && KERNELPKG="linux-lts"
# name of the kernel image
VMLINUZ="vmlinuz-${KERNELPKG}"
# detect systemd running
[[ "$(cat /proc/cmdline | grep -w init=/bin/systemd)" ]] && SYSTEMD="1"
usage() {
echo "quickinst <install_mode> <destdir> <package_directory|server_url>"
@ -58,7 +60,7 @@ pacman_conf() {
cat << EOF > /tmp/pacman.conf
[options]
Architecture = auto
SigLevel = Never
SigLevel = PackageRequired
CacheDir = ${DESTDIR}/var/cache/pacman/pkg
CacheDir = /packages/core-$(uname -m)/pkg
CacheDir = /packages/core-any/pkg
@ -78,6 +80,20 @@ pacman_conf_extra() {
echo "Server = ${serverurl}" >> /tmp/pacman.conf
}
# pacman needs a masterkey before checking signed packages
prepare_pacman_keychain() {
# Generate initial keychain, use haveged then no user interaction is required
if [[ -f /var/run/haveged.pid ]]; then
kill $(cat /var/run/$prog.pid)
rm /var/run/haveged.pid
fi
haveged
pacman-key --init
yes "" | pacman-key --populate archlinux
kill $(cat /var/run/$prog.pid)
rm /var/run/haveged.pid
}
# configures pacman and syncs db on destination system
# params: none
# returns: 1 on error
@ -85,6 +101,11 @@ prepare_pacman() {
# Set up the necessary directories for pacman use
[[ ! -d "${DESTDIR}/var/cache/pacman/pkg" ]] && mkdir -m 755 -p "${DESTDIR}/var/cache/pacman/pkg"
[[ ! -d "${DESTDIR}/var/lib/pacman" ]] && mkdir -m 755 -p "${DESTDIR}/var/lib/pacman"
### Ugly hack to fix /var/run /var/lock /run symlinks for systemd
[[ ! -d "${DESTDIR}/run" ]] && mkdir -m 755 -p "${DESTDIR}/run"
[[ ! -h "${DESTDIR}/var/run" ]] && ln -sf /run "${DESTDIR}/var/run"
[[ ! -h "${DESTDIR}/var/lock" ]] && ln -sf /run/lock "${DESTDIR}/var/lock"
prepare_pacman_keychain
${PACMAN} -Sy
}
@ -168,6 +189,13 @@ install_packages() {
# Only install the booted kernel image!
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ linux\ # #g" -e "s#\ linux-lts\ # #g")"
PACKAGES="${KERNELPKG} ${PACKAGES}"
# remove not needed initscripts and sysvinit package with systemd and add compat package
if [[ "${SYSTEMD}" = "1" ]]; then
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ initscripts\ # #g" -e "s#\ sysvinit\ # #g" -e "s#\ systemd\ # #g")"
PACKAGES="${PACKAGES} systemd systemd-sysvcompat"
else
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ systemd-sysvcompat\ # #g")"
fi
${PACMAN} -S ${PACKAGES}
}

23
usr/share/archboot/installer/setup
View file

@ -2802,7 +2802,7 @@ pacman_conf() {
cat << EOF > /tmp/pacman.conf
[options]
Architecture = auto
SigLevel = Never
SigLevel = PackageRequired
CacheDir = ${DESTDIR}/var/cache/pacman/pkg
CacheDir = /packages/core-$(uname -m)/pkg
CacheDir = /packages/core-any/pkg
@ -2815,6 +2815,21 @@ Server = ${serverurl}
EOF
}
# pacman needs a masterkey before checking signed packages
prepare_pacman_keychain() {
# Generate initial keychain, use haveged then no user interaction is required
if [[ -f /var/run/haveged.pid ]]; then
kill $(cat /var/run/$prog.pid)
rm /var/run/haveged.pid
fi
haveged
DIALOG --infobox "Running pacman-key ..." 6 45
pacman-key --init
yes "" | pacman-key --populate archlinux
kill $(cat /var/run/$prog.pid)
rm /var/run/haveged.pid
}
# configures pacman and syncs db on destination system
# params: none
# returns: 1 on error
@ -2822,9 +2837,11 @@ prepare_pacman() {
# Set up the necessary directories for pacman use
[[ ! -d "${DESTDIR}/var/cache/pacman/pkg" ]] && mkdir -m 755 -p "${DESTDIR}/var/cache/pacman/pkg"
[[ ! -d "${DESTDIR}/var/lib/pacman" ]] && mkdir -m 755 -p "${DESTDIR}/var/lib/pacman"
### Ugly hack to fix /var/run /run symlinks for systemd
### Ugly hack to fix /var/run /var/lock /run symlinks for systemd
[[ ! -d "${DESTDIR}/run" ]] && mkdir -m 755 -p "${DESTDIR}/run"
[[ ! -h "${DESTDIR}/var/run" ]] && ln -sf /run "${DESTDIR}/var/run"
[[ ! -h "${DESTDIR}/var/lock" ]] && ln -sf /run/lock "${DESTDIR}/var/lock"
prepare_pacman_keychain
DIALOG --infobox "Refreshing package database..." 6 45
${PACMAN} -Sy >${LOG} 2>&1 || return 1
if [[ $? -ne 0 ]]; then
@ -3037,6 +3054,8 @@ select_packages() {
if [[ "${SYSTEMD}" = "1" ]]; then
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ initscripts\ # #g" -e "s#\ sysvinit\ # #g" -e "s#\ systemd\ # #g")"
PACKAGES="${PACKAGES} systemd systemd-sysvcompat"
else
PACKAGES="$(echo ${PACKAGES} | sed -e "s#\ systemd-sysvcompat\ # #g")"
fi
NEXTITEM="5"
S_SELECT=1